diff --git a/packages/redux-devtools-app/eslint.config.mjs b/packages/redux-devtools-app/eslint.config.mjs index d8e59710..73b9d0e9 100644 --- a/packages/redux-devtools-app/eslint.config.mjs +++ b/packages/redux-devtools-app/eslint.config.mjs @@ -1,3 +1,4 @@ +import globals from 'globals'; 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'; @@ -26,7 +27,7 @@ export default [ files: ['buildUmd.mjs'], languageOptions: { globals: { - process: true, + ...globals.nodeBuiltin, }, }, }, diff --git a/packages/redux-devtools-app/package.json b/packages/redux-devtools-app/package.json index 638d20cc..18c298cf 100644 --- a/packages/redux-devtools-app/package.json +++ b/packages/redux-devtools-app/package.json @@ -74,6 +74,7 @@ "css-loader": "^7.1.2", "esbuild": "^0.23.0", "fork-ts-checker-webpack-plugin": "^9.0.2", + "globals": "^15.9.0", "html-loader": "^5.1.0", "html-webpack-plugin": "^5.6.0", "react": "^18.3.1", diff --git a/packages/redux-devtools-chart-monitor/.eslintignore b/packages/redux-devtools-chart-monitor/.eslintignore deleted file mode 100644 index a65b4177..00000000 --- a/packages/redux-devtools-chart-monitor/.eslintignore +++ /dev/null @@ -1 +0,0 @@ -lib diff --git a/packages/redux-devtools-chart-monitor/.eslintrc.js b/packages/redux-devtools-chart-monitor/.eslintrc.js deleted file mode 100644 index d94e24bd..00000000 --- a/packages/redux-devtools-chart-monitor/.eslintrc.js +++ /dev/null @@ -1,13 +0,0 @@ -module.exports = { - extends: '../../eslintrc.js.base.json', - overrides: [ - { - files: ['*.ts', '*.tsx'], - extends: '../../eslintrc.ts.react.base.json', - parserOptions: { - tsconfigRootDir: __dirname, - project: true, - }, - }, - ], -}; diff --git a/packages/redux-devtools-chart-monitor/eslint.config.mjs b/packages/redux-devtools-chart-monitor/eslint.config.mjs new file mode 100644 index 00000000..1fa4d2aa --- /dev/null +++ b/packages/redux-devtools-chart-monitor/eslint.config.mjs @@ -0,0 +1,10 @@ +import eslintJs from '../../eslint.js.config.base.mjs'; +import eslintTsReact from '../../eslint.ts.react.config.base.mjs'; + +export default [ + ...eslintJs, + ...eslintTsReact(import.meta.dirname), + { + ignores: ['lib'], + }, +]; diff --git a/packages/redux-devtools-chart-monitor/package.json b/packages/redux-devtools-chart-monitor/package.json index 9dce98bf..e3ef07f7 100644 --- a/packages/redux-devtools-chart-monitor/package.json +++ b/packages/redux-devtools-chart-monitor/package.json @@ -33,7 +33,7 @@ "build:esm": "babel src --config-file ./babel.config.esm.json --extensions \".ts,.tsx\" --out-dir lib/esm", "build:types": "tsc --emitDeclarationOnly", "clean": "rimraf lib", - "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" @@ -54,12 +54,6 @@ "@babel/preset-typescript": "^7.24.7", "@redux-devtools/core": "^4.0.0", "@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-react": "^7.35.0", - "eslint-plugin-react-hooks": "^4.6.2", "react": "^18.3.1", "redux": "^5.0.1", "rimraf": "^6.0.1", diff --git a/packages/redux-devtools-cli/.eslintignore b/packages/redux-devtools-cli/.eslintignore deleted file mode 100644 index d827b1ac..00000000 --- a/packages/redux-devtools-cli/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -dist -umd diff --git a/packages/redux-devtools-cli/.eslintrc.cjs b/packages/redux-devtools-cli/.eslintrc.cjs deleted file mode 100644 index dcb61ae7..00000000 --- a/packages/redux-devtools-cli/.eslintrc.cjs +++ /dev/null @@ -1,20 +0,0 @@ -module.exports = { - overrides: [ - { - files: ['*.ts'], - extends: '../../eslintrc.ts.base.json', - parserOptions: { - tsconfigRootDir: __dirname, - project: true, - }, - }, - { - files: ['test/**/*.ts'], - extends: '../../eslintrc.ts.jest.base.json', - parserOptions: { - tsconfigRootDir: __dirname, - project: ['./tsconfig.test.json'], - }, - }, - ], -}; diff --git a/packages/redux-devtools-cli/app/electron.js b/packages/redux-devtools-cli/app/electron.cjs similarity index 100% rename from packages/redux-devtools-cli/app/electron.js rename to packages/redux-devtools-cli/app/electron.cjs diff --git a/packages/redux-devtools-cli/app/package.json b/packages/redux-devtools-cli/app/package.json index b67c0b81..66c146df 100644 --- a/packages/redux-devtools-cli/app/package.json +++ b/packages/redux-devtools-cli/app/package.json @@ -2,7 +2,7 @@ "private": true, "name": "@redux-devtools/cli", "version": "0.0.1", - "main": "electron.js", + "main": "electron.cjs", "description": "Remote Redux DevTools", "authors": "Mihail Diordiev" } diff --git a/packages/redux-devtools-cli/eslint.config.mjs b/packages/redux-devtools-cli/eslint.config.mjs new file mode 100644 index 00000000..3bf8bed1 --- /dev/null +++ b/packages/redux-devtools-cli/eslint.config.mjs @@ -0,0 +1,22 @@ +import globals from 'globals'; +import eslintJs from '../../eslint.js.config.base.mjs'; +import eslintTs from '../../eslint.ts.config.base.mjs'; +import eslintTsJest from '../../eslint.ts.jest.config.base.mjs'; + +export default [ + ...eslintJs, + ...eslintTs(import.meta.dirname), + ...eslintTsJest(['test/**/*.ts', 'test/**/*.tsx'], import.meta.dirname, [ + './tsconfig.test.json', + ]), + { + ignores: ['dist', 'umd'], + }, + { + languageOptions: { + globals: { + ...globals.nodeBuiltin, + }, + }, + }, +]; diff --git a/packages/redux-devtools-cli/package.json b/packages/redux-devtools-cli/package.json index 7a49de0e..ca0868df 100644 --- a/packages/redux-devtools-cli/package.json +++ b/packages/redux-devtools-cli/package.json @@ -32,7 +32,7 @@ "start:electron": "node ./bin/redux-devtools.js --open", "clean": "rimraf dist", "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" @@ -84,11 +84,7 @@ "@types/styled-components": "^5.1.34", "@types/supertest": "^6.0.2", "@types/uuid": "^10.0.0", - "@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", + "globals": "^15.9.0", "jest": "^29.7.0", "ncp": "^2.0.0", "rimraf": "^6.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8b9d2e52..e942d019 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -778,6 +778,9 @@ importers: fork-ts-checker-webpack-plugin: specifier: ^9.0.2 version: 9.0.2(typescript@5.5.4)(webpack@5.93.0) + globals: + specifier: ^15.9.0 + version: 15.9.0 html-loader: specifier: ^5.1.0 version: 5.1.0(webpack@5.93.0) @@ -929,33 +932,12 @@ 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) cross-env: specifier: ^7.0.3 version: 7.0.3 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-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) @@ -1035,24 +1017,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-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) react: specifier: ^18.3.1 version: 18.3.1 @@ -1192,21 +1156,9 @@ importers: '@types/uuid': specifier: ^10.0.0 version: 10.0.0 - '@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) + globals: + specifier: ^15.9.0 + version: 15.9.0 jest: specifier: ^29.7.0 version: 29.7.0(@types/node@20.14.14)(ts-node@10.9.2) @@ -13626,6 +13578,11 @@ packages: type-fest: 0.20.2 dev: true + /globals@15.9.0: + resolution: {integrity: sha512-SmSKyLLKFbSr6rptvP8izbyxJL4ILwqO9Jg23UA0sDlGlu58V59D1//I3vlc0KJphVdUR7vMjHIplYnzBxorQA==} + engines: {node: '>=18'} + dev: true + /globalthis@1.0.4: resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==} engines: {node: '>= 0.4'}