diff --git a/index.js b/index.js index 71b2ddf..c678149 100644 --- a/index.js +++ b/index.js @@ -16,13 +16,7 @@ module.exports = { '@typescript-eslint', 'react-hooks' ], - 'extends': ['./lib/standard-eslint-ts'], - 'settings': { - 'import/resolver': { - 'typescript': true, - 'node': true - } - }, + 'extends': ['plugin:import-x/typescript', './lib/standard-eslint-ts'], 'overrides': [ { 'files': ['*.ts', '*.tsx'], @@ -68,7 +62,7 @@ module.exports = { 'error', { 'prefer': 'type-imports', 'disallowTypeAnnotations': true } ], - 'import/order': [ + 'import-x/order': [ 'warn', { 'groups': ['builtin', 'external', ['internal', 'parent', 'sibling', 'index'], 'type'], diff --git a/lib/standard-eslint-ts.js b/lib/standard-eslint-ts.js index 92abff2..2507175 100644 --- a/lib/standard-eslint-ts.js +++ b/lib/standard-eslint-ts.js @@ -2,8 +2,8 @@ // which makes use of all extended rules https://typescript-eslint.io/rules/#extension-rules // Similar to https://github.com/typescript-eslint/typescript-eslint/blob/f4016c24f9023e8a42def9501b68c4a908cbfede/packages/eslint-plugin/src/configs/recommended.ts +const standard = require('@eslinter/eslint-config-standard/legacy') const { rules } = require('@typescript-eslint/eslint-plugin') -const standard = require('eslint-config-standard') const deepCopy = typeof structuredClone === 'function' ? structuredClone : x => JSON.parse(JSON.stringify(x)) @@ -23,7 +23,7 @@ for (const ruleId in rules) { } const config = deepCopy({ - extends: ['standard', 'standard-jsx'], + extends: ['@eslinter/standard/legacy', 'standard-jsx'], rules: { ...neededChanges, ...newChanges diff --git a/package.json b/package.json index 85947e7..5b61b9d 100644 --- a/package.json +++ b/package.json @@ -24,17 +24,17 @@ "tsconfig-less.js" ], "scripts": { - "test": "installed-check -i eslint-plugin-jsdoc -i eslint-config-standard && eslint .", + "test": "installed-check -i eslint-plugin-jsdoc -i @eslinter/eslint-config-standard && eslint .", "prepare": "husky" }, "devDependencies": { + "@eslinter/eslint-config-standard": "^0.1.1", "@typescript-eslint/eslint-plugin": "^7.10.0", "@typescript-eslint/parser": "7.10.0", - "eslint": "^8.56.0", - "eslint-config-standard": "^17.1.0", + "eslint": "^8.57.0", "eslint-config-standard-jsx": "^11.0.0", - "eslint-import-resolver-typescript": "^3.6.1", - "eslint-plugin-import": "^2.28.1", + "eslint-import-resolver-typescript": "^4.3.2", + "eslint-plugin-import-x": "^4.10.2", "eslint-plugin-jsdoc": "^48.2.5", "eslint-plugin-n": "^16.6.2", "eslint-plugin-promise": "^6.1.1", @@ -47,11 +47,10 @@ "peerDependencies": { "@typescript-eslint/eslint-plugin": "^7.10.0", "@typescript-eslint/parser": "7.10.0", - "eslint": "^8.56.0", - "eslint-config-standard": "^17.0.0", + "eslint": "^8.57.0", "eslint-config-standard-jsx": "^11.0.0", - "eslint-import-resolver-typescript": "^3.5.1", - "eslint-plugin-import": "^2.26.0", + "eslint-import-resolver-typescript": "^4.3.2", + "eslint-plugin-import-x": "^4.10.2", "eslint-plugin-jsdoc": "^48.2.5", "eslint-plugin-n": "^16.6.2", "eslint-plugin-promise": "^6.1.1",