diff --git a/packages/redux-devtools-rtk-query-monitor/.eslintignore b/packages/redux-devtools-rtk-query-monitor/.eslintignore deleted file mode 100644 index de820eed..00000000 --- a/packages/redux-devtools-rtk-query-monitor/.eslintignore +++ /dev/null @@ -1,3 +0,0 @@ -demo -lib -dist diff --git a/packages/redux-devtools-rtk-query-monitor/.eslintrc.js b/packages/redux-devtools-rtk-query-monitor/.eslintrc.js deleted file mode 100644 index 96aefbef..00000000 --- a/packages/redux-devtools-rtk-query-monitor/.eslintrc.js +++ /dev/null @@ -1,24 +0,0 @@ -module.exports = { - extends: '../../eslintrc.js.base.json', - overrides: [ - { - files: ['*.ts', '*.tsx'], - extends: '../../eslintrc.ts.react.base.json', - parserOptions: { - tsconfigRootDir: __dirname, - project: true, - }, - rules: { - 'react/no-unknown-property': ['error', { ignore: ['css'] }], - }, - }, - { - files: ['test/**/*.ts', 'test/**/*.tsx'], - extends: '../../eslintrc.ts.react.jest.base.json', - parserOptions: { - tsconfigRootDir: __dirname, - project: ['./tsconfig.test.json'], - }, - }, - ], -}; diff --git a/packages/redux-devtools-rtk-query-monitor/demo/.eslintignore b/packages/redux-devtools-rtk-query-monitor/demo/.eslintignore deleted file mode 100644 index 1521c8b7..00000000 --- a/packages/redux-devtools-rtk-query-monitor/demo/.eslintignore +++ /dev/null @@ -1 +0,0 @@ -dist diff --git a/packages/redux-devtools-rtk-query-monitor/demo/.eslintrc.js b/packages/redux-devtools-rtk-query-monitor/demo/.eslintrc.js deleted file mode 100644 index 6a8196ce..00000000 --- a/packages/redux-devtools-rtk-query-monitor/demo/.eslintrc.js +++ /dev/null @@ -1,17 +0,0 @@ -module.exports = { - extends: '../../../eslintrc.ts.react.base.json', - parserOptions: { - tsconfigRootDir: __dirname, - project: true, - }, - overrides: [ - { - files: ['webpack.config.ts'], - extends: '../../../eslintrc.ts.base.json', - parserOptions: { - tsconfigRootDir: __dirname, - project: ['./tsconfig.webpack.json'], - }, - }, - ], -}; diff --git a/packages/redux-devtools-rtk-query-monitor/demo/eslint.config.mjs b/packages/redux-devtools-rtk-query-monitor/demo/eslint.config.mjs new file mode 100644 index 00000000..fb96ee3e --- /dev/null +++ b/packages/redux-devtools-rtk-query-monitor/demo/eslint.config.mjs @@ -0,0 +1,15 @@ +import eslintJs from '../../../eslint.js.config.base.mjs'; +import eslintTs from '../../../eslint.ts.react.config.base.mjs'; + +export default [ + ...eslintJs, + ...eslintTs(import.meta.dirname), + ...eslintTs( + import.meta.dirname, + ['webpack.config.ts'], + ['./tsconfig.webpack.json'], + ), + { + ignores: ['dist'], + }, +]; diff --git a/packages/redux-devtools-rtk-query-monitor/demo/package.json b/packages/redux-devtools-rtk-query-monitor/demo/package.json index 5e4e2d04..a3ec3b8a 100644 --- a/packages/redux-devtools-rtk-query-monitor/demo/package.json +++ b/packages/redux-devtools-rtk-query-monitor/demo/package.json @@ -6,7 +6,7 @@ "scripts": { "start": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack serve --open", "build": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack", - "lint": "eslint . --ext .ts,.tsx", + "lint": "eslint .", "type-check": "tsc --noEmit" }, "dependencies": { @@ -39,16 +39,10 @@ "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", "@types/styled-components": "^5.1.34", - "@typescript-eslint/eslint-plugin": "^8.0.1", - "@typescript-eslint/parser": "^8.0.1", "babel-loader": "^9.1.3", "copy-webpack-plugin": "^12.0.2", "cross-env": "^7.0.3", "css-loader": "^7.1.2", - "eslint": "^8.57.0", - "eslint-config-prettier": "^9.1.0", - "eslint-plugin-react": "^7.35.0", - "eslint-plugin-react-hooks": "^4.6.2", "fork-ts-checker-webpack-plugin": "^9.0.2", "html-webpack-plugin": "^5.6.0", "style-loader": "^4.0.0", diff --git a/packages/redux-devtools-rtk-query-monitor/eslint.config.mjs b/packages/redux-devtools-rtk-query-monitor/eslint.config.mjs new file mode 100644 index 00000000..2972f840 --- /dev/null +++ b/packages/redux-devtools-rtk-query-monitor/eslint.config.mjs @@ -0,0 +1,18 @@ +import eslintJs from '../../eslint.js.config.base.mjs'; +import eslintTsReact from '../../eslint.ts.react.config.base.mjs'; +import eslintTsReactJest from '../../eslint.ts.react.jest.config.base.mjs'; + +export default [ + ...eslintJs, + ...eslintTsReact(import.meta.dirname), + ...eslintTsReactJest(import.meta.dirname), + { + ignores: ['demo', 'lib'], + }, + { + files: ['**/*.ts', '**/*.tsx'], + rules: { + 'react/no-unknown-property': ['error', { ignore: ['css'] }], + } + } +]; diff --git a/packages/redux-devtools-rtk-query-monitor/jest.config.js b/packages/redux-devtools-rtk-query-monitor/jest.config.cjs similarity index 100% rename from packages/redux-devtools-rtk-query-monitor/jest.config.js rename to packages/redux-devtools-rtk-query-monitor/jest.config.cjs diff --git a/packages/redux-devtools-rtk-query-monitor/package.json b/packages/redux-devtools-rtk-query-monitor/package.json index f43ee837..8ec139ff 100644 --- a/packages/redux-devtools-rtk-query-monitor/package.json +++ b/packages/redux-devtools-rtk-query-monitor/package.json @@ -38,7 +38,7 @@ "build:types": "tsc --emitDeclarationOnly", "clean": "rimraf lib", "test": "jest", - "lint": "eslint . --ext .ts,.tsx", + "lint": "eslint .", "type-check": "tsc --noEmit", "prepack": "pnpm run clean && pnpm run build", "prepublish": "pnpm run type-check && pnpm run lint && pnpm run test" @@ -72,13 +72,6 @@ "@types/hex-rgba": "^1.0.3", "@types/lodash.debounce": "^4.0.9", "@types/react": "^18.3.3", - "@typescript-eslint/eslint-plugin": "^8.0.1", - "@typescript-eslint/parser": "^8.0.1", - "eslint": "^8.57.0", - "eslint-config-prettier": "^9.1.0", - "eslint-plugin-jest": "^28.7.0", - "eslint-plugin-react": "^7.35.0", - "eslint-plugin-react-hooks": "^4.6.2", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", "react": "^18.3.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 32d3c9ae..d5fbcad1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2091,27 +2091,6 @@ importers: '@types/react': specifier: ^18.3.3 version: 18.3.3 - '@typescript-eslint/eslint-plugin': - specifier: ^8.0.1 - version: 8.0.1(@typescript-eslint/parser@8.0.1)(eslint@8.57.0)(typescript@5.5.4) - '@typescript-eslint/parser': - specifier: ^8.0.1 - version: 8.0.1(eslint@8.57.0)(typescript@5.5.4) - eslint: - specifier: ^8.57.0 - version: 8.57.0 - eslint-config-prettier: - specifier: ^9.1.0 - version: 9.1.0(eslint@8.57.0) - eslint-plugin-jest: - specifier: ^28.7.0 - version: 28.7.0(@typescript-eslint/eslint-plugin@8.0.1)(eslint@8.57.0)(jest@29.7.0)(typescript@5.5.4) - eslint-plugin-react: - specifier: ^7.35.0 - version: 7.35.0(eslint@8.57.0) - eslint-plugin-react-hooks: - specifier: ^4.6.2 - version: 4.6.2(eslint@8.57.0) jest: specifier: ^29.7.0 version: 29.7.0(@types/node@20.14.14)(ts-node@10.9.2) @@ -2224,12 +2203,6 @@ importers: '@types/styled-components': specifier: ^5.1.34 version: 5.1.34 - '@typescript-eslint/eslint-plugin': - specifier: ^8.0.1 - version: 8.0.1(@typescript-eslint/parser@8.0.1)(eslint@8.57.0)(typescript@5.5.4) - '@typescript-eslint/parser': - specifier: ^8.0.1 - version: 8.0.1(eslint@8.57.0)(typescript@5.5.4) babel-loader: specifier: ^9.1.3 version: 9.1.3(@babel/core@7.25.2)(webpack@5.93.0) @@ -2242,18 +2215,6 @@ importers: css-loader: specifier: ^7.1.2 version: 7.1.2(webpack@5.93.0) - eslint: - specifier: ^8.57.0 - version: 8.57.0 - eslint-config-prettier: - specifier: ^9.1.0 - version: 9.1.0(eslint@8.57.0) - eslint-plugin-react: - specifier: ^7.35.0 - version: 7.35.0(eslint@8.57.0) - eslint-plugin-react-hooks: - specifier: ^4.6.2 - version: 4.6.2(eslint@8.57.0) fork-ts-checker-webpack-plugin: specifier: ^9.0.2 version: 9.0.2(typescript@5.5.4)(webpack@5.93.0)