From 66a1d19dd46aaaecbe3c3918bf64683b32f580c6 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 17 Oct 2024 15:56:31 +0000 Subject: [PATCH] Fix eslint config and use modern flat style https://eslint.org/docs/latest/use/configure/configuration-files#configuration-file --- .../Bts.DataStreamWebApp.Client/.eslintrc.cjs | 20 ----------- .../eslint.config.js | 36 +++++++++++++++++++ .../package-lock.json | 18 ++++++++++ .../Bts.DataStreamWebApp.Client/package.json | 2 ++ 4 files changed, 56 insertions(+), 20 deletions(-) delete mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Client/.eslintrc.cjs create mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Client/eslint.config.js diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/.eslintrc.cjs b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/.eslintrc.cjs deleted file mode 100644 index e857087ea..000000000 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/.eslintrc.cjs +++ /dev/null @@ -1,20 +0,0 @@ -module.exports = { - root: true, - env: { browser: true, es2020: true }, - extends: [ - 'eslint:recommended', - 'plugin:react/recommended', - 'plugin:react/jsx-runtime', - 'plugin:react-hooks/recommended', - ], - ignorePatterns: ['dist', '.eslintrc.cjs'], - parserOptions: { ecmaVersion: 'latest', sourceType: 'module' }, - settings: { react: { version: '18.3.1' } }, - plugins: ['react-refresh'], - rules: { - 'react-refresh/only-export-components': [ - 'warn', - { allowConstantExport: true }, - ], - }, -} diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/eslint.config.js b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/eslint.config.js new file mode 100644 index 000000000..ff73a1b92 --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/eslint.config.js @@ -0,0 +1,36 @@ +import importPlugin from "eslint-plugin-import"; +import reactPkg from "eslint-plugin-react"; +const { configs: reactConfigs } = reactPkg; +import js from "@eslint/js"; +import defineConfig from "./vite.config.js"; + +export default [ + js.configs.recommended, + importPlugin.flatConfigs.recommended, + reactConfigs.flat.recommended, + reactConfigs.flat["jsx-runtime"], + { + files: ["**/*.{js,jsx}"], + languageOptions: { + ecmaVersion: "latest", + sourceType: "module", + globals: { + console: "readonly" + } + }, + settings: { + "import/resolver": { + vite: { + viteConfig: defineConfig({ mode: "development" }) + } + } + }, + rules: { + semi: "error", + "prefer-const": "error", + "no-unused-vars": "warn", + "import/no-dynamic-require": "warn", + "import/no-nodejs-modules": "warn", + } + } +]; diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package-lock.json b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package-lock.json index a5bc6cfff..072b8cc5a 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package-lock.json +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package-lock.json @@ -28,10 +28,12 @@ "rpc-websockets": "^9.0.4" }, "devDependencies": { + "@eslint/js": "^9.12.0", "@types/react": "^18.3.11", "@types/react-dom": "^18.3.1", "@vitejs/plugin-react": "^4.3.2", "eslint": "^9.12.0", + "eslint-import-resolver-vite": "^2.0.1", "eslint-plugin-import": "^2.31.0", "eslint-plugin-react": "^7.37.1", "eslint-plugin-react-hooks": "^5.0.0", @@ -3834,6 +3836,22 @@ "ms": "^2.1.1" } }, + "node_modules/eslint-import-resolver-vite": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-vite/-/eslint-import-resolver-vite-2.0.1.tgz", + "integrity": "sha512-QUMjPC5D++uP3AA4eK68XOD3S42BocS3cAEcwIAqrpbIqDcwI05XYw7chIMbzH7QLM0Ehh6F+u954tFXz00BJQ==", + "dev": true, + "dependencies": { + "debug": "^4.3.4", + "resolve": "^1.22.8" + }, + "engines": { + "node": ">=16" + }, + "peerDependencies": { + "eslint-plugin-import": "^2" + } + }, "node_modules/eslint-module-utils": { "version": "2.12.0", "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz", diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package.json b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package.json index 43735265d..8c068fb5a 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package.json +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package.json @@ -34,10 +34,12 @@ "@types/react-dom": "^18.3.1", "@vitejs/plugin-react": "^4.3.2", "eslint": "^9.12.0", + "@eslint/js": "^9.12.0", "eslint-plugin-import": "^2.31.0", "eslint-plugin-react": "^7.37.1", "eslint-plugin-react-hooks": "^5.0.0", "eslint-plugin-react-refresh": "^0.4.12", + "eslint-import-resolver-vite": "^2.0.1", "react-mui-sidebar": "^1.3.8", "vite": "^5.4.9" }