diff --git a/.vscode/settings.json b/.vscode/settings.json index 33c504072..a7b960705 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,8 @@ { "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"], - "eslint.useESLintClass": false, + "eslint.useESLintClass": true, "eslint.experimental.useFlatConfig": true, + "eslint.workingDirectories": [{ "mode": "auto" }], "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.formatOnSave": true, "editor.codeActionsOnSave": { diff --git a/eslint.config.js b/eslint.config.js index 1e95a6fd5..d0f12ceb5 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -1,5 +1,3 @@ -import { dirname } from 'node:path'; -import { fileURLToPath } from 'node:url'; import unocss from '@unocss/eslint-plugin'; import common from 'eslint-config-neon/flat/common.js'; import edge from 'eslint-config-neon/flat/edge.js'; @@ -10,9 +8,6 @@ import react from 'eslint-config-neon/flat/react.js'; import typescript from 'eslint-config-neon/flat/typescript.js'; import merge from 'lodash.merge'; -const __filename = fileURLToPath(import.meta.url); -const __dirname = dirname(__filename); - const commonFiles = '{js,mjs,cjs,ts,mts,cts,jsx,tsx}'; const commonRuleset = merge(...common, { files: [`**/*${commonFiles}`] }); @@ -99,9 +94,9 @@ export default [ 'no-restricted-globals': 0, }, }, + reactRuleset, nextRuleset, edgeRuleset, - reactRuleset, { files: ['**/*{js,mjs,cjs,jsx}'], rules: { 'tsdoc/syntax': 0 },