diff --git a/packages/redux-devtools-app/.eslintignore b/packages/redux-devtools-app/.eslintignore deleted file mode 100644 index fba1d4c6..00000000 --- a/packages/redux-devtools-app/.eslintignore +++ /dev/null @@ -1,3 +0,0 @@ -build -lib -umd diff --git a/packages/redux-devtools-app/.eslintrc.js b/packages/redux-devtools-app/.eslintrc.js deleted file mode 100644 index 02b8bb24..00000000 --- a/packages/redux-devtools-app/.eslintrc.js +++ /dev/null @@ -1,37 +0,0 @@ -module.exports = { - extends: '../../eslintrc.js.base.json', - overrides: [ - { - files: ['*.ts', '*.tsx'], - extends: '../../eslintrc.ts.react.base.json', - parserOptions: { - tsconfigRootDir: __dirname, - project: true, - }, - }, - { - files: ['demo/**/*.ts', 'demo/**/*.tsx'], - extends: '../../eslintrc.ts.react.base.json', - parserOptions: { - tsconfigRootDir: __dirname, - project: ['./tsconfig.demo.json'], - }, - }, - { - files: ['test/**/*.ts', 'test/**/*.tsx'], - extends: '../../eslintrc.ts.react.jest.base.json', - parserOptions: { - tsconfigRootDir: __dirname, - project: ['./tsconfig.test.json'], - }, - }, - { - files: ['webpack.config.ts', 'webpack.config.umd.ts'], - extends: '../../eslintrc.ts.base.json', - parserOptions: { - tsconfigRootDir: __dirname, - project: ['./tsconfig.webpack.json'], - }, - }, - ], -}; diff --git a/packages/redux-devtools-app/buildUmd.mjs b/packages/redux-devtools-app/buildUmd.mjs index 8c3db4a7..84d949d3 100644 --- a/packages/redux-devtools-app/buildUmd.mjs +++ b/packages/redux-devtools-app/buildUmd.mjs @@ -29,7 +29,7 @@ await esbuild.build({ // https://github.com/evanw/esbuild/issues/337#issuecomment-954633403 function importAsGlobals(mapping) { // https://stackoverflow.com/a/3561711/153718 - const escRe = (s) => s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); + const escRe = (s) => s.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&'); const filter = new RegExp( Object.keys(mapping) .map((mod) => `^${escRe(mod)}$`) diff --git a/packages/redux-devtools-app/eslint.config.mjs b/packages/redux-devtools-app/eslint.config.mjs new file mode 100644 index 00000000..d8e59710 --- /dev/null +++ b/packages/redux-devtools-app/eslint.config.mjs @@ -0,0 +1,33 @@ +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'; +import eslintTs from '../../eslint.ts.react.config.base.mjs'; + +export default [ + ...eslintJs, + ...eslintTsReact(import.meta.dirname), + ...eslintTsReact( + import.meta.dirname, + ['demo/**/*.ts', 'demo/**/*.tsx'], + ['./tsconfig.demo.json'], + ), + ...eslintTsReactJest(['test/**/*.ts', 'test/**/*.tsx'], import.meta.dirname, [ + './tsconfig.test.json', + ]), + ...eslintTs( + import.meta.dirname, + ['webpack.config.ts', 'webpack.config.umd.ts'], + ['./tsconfig.webpack.json'], + ), + { + ignores: ['build', 'lib', 'umd'], + }, + { + files: ['buildUmd.mjs'], + languageOptions: { + globals: { + process: true, + }, + }, + }, +]; diff --git a/packages/redux-devtools-app/package.json b/packages/redux-devtools-app/package.json index 59479c5f..638d20cc 100644 --- a/packages/redux-devtools-app/package.json +++ b/packages/redux-devtools-app/package.json @@ -33,7 +33,7 @@ "build:umd": "node buildUmd.mjs --dev", "build:umd:min": "node buildUmd.mjs", "clean": "rimraf build lib umd", - "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" @@ -69,16 +69,10 @@ "@types/socketcluster-client": "^19.1.0", "@types/styled-components": "^5.1.34", "@types/webpack-env": "^1.18.5", - "@typescript-eslint/eslint-plugin": "^8.0.1", - "@typescript-eslint/parser": "^8.0.1", "babel-loader": "^9.1.3", "cross-env": "^7.0.3", "css-loader": "^7.1.2", "esbuild": "^0.23.0", - "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-loader": "^5.1.0", "html-webpack-plugin": "^5.6.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d2ad4c26..8b9d2e52 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -763,12 +763,6 @@ importers: '@types/webpack-env': specifier: ^1.18.5 version: 1.18.5 - '@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) @@ -781,18 +775,6 @@ importers: esbuild: specifier: ^0.23.0 version: 0.23.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)