diff --git a/eslint.config.mjs b/eslint.config.mjs index a49b2ade..c19867f5 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,21 +1,3 @@ -import { FlatCompat } from '@eslint/eslintrc' import config from '@will-stone/eslint-config' -const compat = new FlatCompat() - -export default [ - { - ignores: ['.webpack/'], - }, - ...config, - ...compat.extends('plugin:tailwindcss/recommended'), - { - files: ['**/*.tsx'], - rules: { - 'tailwindcss/no-custom-classname': [ - 'warn', - { whitelist: ['draggable', 'no-drag'] }, - ], - }, - }, -] +export default [...config] diff --git a/package-lock.json b/package-lock.json index 50e7bbfe..678ea791 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,6 @@ "@electron-forge/plugin-base": "^6.3.0", "@electron-forge/plugin-webpack": "^6.3.0", "@electron-forge/shared-types": "^6.3.0", - "@eslint/eslintrc": "^2.1.2", "@reduxjs/toolkit": "^1.9.5", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^14.0.0", @@ -34,7 +33,7 @@ "@types/react-dom": "^18.2.7", "@types/react-redux": "^7.1.25", "@vercel/webpack-asset-relocator-loader": "^1.7.3", - "@will-stone/eslint-config": "^0.0.7", + "@will-stone/eslint-config": "^0.1.0", "@will-stone/prettier-config": "^7.0.1", "app-exists": "^2.1.1", "axios": "^1.4.0", @@ -47,7 +46,6 @@ "electron": "^25.5.0", "electron-log": "^4.4.8", "eslint": "^8.49.0", - "eslint-plugin-tailwindcss": "^3.13.0", "fast-deep-equal": "^3.1.3", "fork-ts-checker-webpack-plugin": "^8.0.0", "husky": "^8.0.3", @@ -3467,9 +3465,9 @@ } }, "node_modules/@will-stone/eslint-config": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/@will-stone/eslint-config/-/eslint-config-0.0.7.tgz", - "integrity": "sha512-LLIaDIvnCLCQ8f08wpGPJC4rGgi2746Y17jI4ef8BbrA1YXxQT0qJuVB/A8tKOGeaRAJHEVGCbnGTUIlMcxfDg==", + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@will-stone/eslint-config/-/eslint-config-0.1.0.tgz", + "integrity": "sha512-+aaUSe0mK+NsHLpck756kxj6LmoxgnWNODN4xQcsixrv1Eg+KWdJcq3rKaDQnG/xfQwMU3jG+FgsR7UopvsRhA==", "dev": true, "dependencies": { "@typescript-eslint/eslint-plugin": "^6.7.0", @@ -3484,6 +3482,7 @@ "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-simple-import-sort": "^10.0.0", "eslint-plugin-switch-case": "^1.1.2", + "eslint-plugin-tailwindcss": "^3.13.0", "eslint-plugin-unicorn": "^48.0.1", "globals": "^13.21.0", "globby": "^13.2.2", diff --git a/package.json b/package.json index 96ddd5bc..2f39dcc0 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,6 @@ "@electron-forge/plugin-base": "^6.3.0", "@electron-forge/plugin-webpack": "^6.3.0", "@electron-forge/shared-types": "^6.3.0", - "@eslint/eslintrc": "^2.1.2", "@reduxjs/toolkit": "^1.9.5", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^14.0.0", @@ -61,7 +60,7 @@ "@types/react-dom": "^18.2.7", "@types/react-redux": "^7.1.25", "@vercel/webpack-asset-relocator-loader": "^1.7.3", - "@will-stone/eslint-config": "^0.0.7", + "@will-stone/eslint-config": "^0.1.0", "@will-stone/prettier-config": "^7.0.1", "app-exists": "^2.1.1", "axios": "^1.4.0", @@ -74,7 +73,6 @@ "electron": "^25.5.0", "electron-log": "^4.4.8", "eslint": "^8.49.0", - "eslint-plugin-tailwindcss": "^3.13.0", "fast-deep-equal": "^3.1.3", "fork-ts-checker-webpack-plugin": "^8.0.0", "husky": "^8.0.3",