From 2956cf05f5de7e5e5714724c1a5460371beefe85 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Thu, 8 Aug 2024 23:30:25 -0400 Subject: [PATCH] redux-devtools-utils --- .../eslint.config.mjs | 2 - packages/redux-devtools-ui/.eslintignore | 2 - packages/redux-devtools-ui/.eslintrc.js | 29 ---- packages/redux-devtools-ui/eslint.config.mjs | 12 ++ .../{jest.config.js => jest.config.cjs} | 0 packages/redux-devtools-ui/package.json | 10 +- packages/redux-devtools-utils/.eslintignore | 1 - packages/redux-devtools-utils/.eslintrc.js | 13 -- .../redux-devtools-utils/eslint.config.mjs | 12 ++ packages/redux-devtools-utils/package.json | 6 +- pnpm-lock.yaml | 140 +----------------- 11 files changed, 28 insertions(+), 199 deletions(-) delete mode 100644 packages/redux-devtools-ui/.eslintignore delete mode 100644 packages/redux-devtools-ui/.eslintrc.js create mode 100644 packages/redux-devtools-ui/eslint.config.mjs rename packages/redux-devtools-ui/{jest.config.js => jest.config.cjs} (100%) delete mode 100644 packages/redux-devtools-utils/.eslintignore delete mode 100644 packages/redux-devtools-utils/.eslintrc.js create mode 100644 packages/redux-devtools-utils/eslint.config.mjs diff --git a/packages/redux-devtools-slider-monitor/eslint.config.mjs b/packages/redux-devtools-slider-monitor/eslint.config.mjs index c2ad02a3..857483e2 100644 --- a/packages/redux-devtools-slider-monitor/eslint.config.mjs +++ b/packages/redux-devtools-slider-monitor/eslint.config.mjs @@ -1,11 +1,9 @@ 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: ['examples', 'lib'], }, diff --git a/packages/redux-devtools-ui/.eslintignore b/packages/redux-devtools-ui/.eslintignore deleted file mode 100644 index 232c27de..00000000 --- a/packages/redux-devtools-ui/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -lib -storybook-static diff --git a/packages/redux-devtools-ui/.eslintrc.js b/packages/redux-devtools-ui/.eslintrc.js deleted file mode 100644 index 05a1d787..00000000 --- a/packages/redux-devtools-ui/.eslintrc.js +++ /dev/null @@ -1,29 +0,0 @@ -module.exports = { - extends: ['../../eslintrc.js.base.json', 'plugin:storybook/recommended'], - overrides: [ - { - files: ['*.ts', '*.tsx'], - extends: '../../eslintrc.ts.react.base.json', - parserOptions: { - tsconfigRootDir: __dirname, - project: true, - }, - }, - { - files: ['test/**/*.ts', 'test/**/*.tsx'], - extends: '../../eslintrc.ts.react.jest.base.json', - parserOptions: { - tsconfigRootDir: __dirname, - project: ['./tsconfig.test.json'], - }, - }, - { - files: ['.storybook/**/*.ts', '.storybook/**/*.tsx'], - extends: '../../eslintrc.ts.react.jest.base.json', - parserOptions: { - tsconfigRootDir: __dirname, - project: ['./.storybook/tsconfig.json'], - }, - }, - ], -}; diff --git a/packages/redux-devtools-ui/eslint.config.mjs b/packages/redux-devtools-ui/eslint.config.mjs new file mode 100644 index 00000000..aec0b837 --- /dev/null +++ b/packages/redux-devtools-ui/eslint.config.mjs @@ -0,0 +1,12 @@ +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: ['.storybook', 'lib', 'storybook-static'], + }, +]; diff --git a/packages/redux-devtools-ui/jest.config.js b/packages/redux-devtools-ui/jest.config.cjs similarity index 100% rename from packages/redux-devtools-ui/jest.config.js rename to packages/redux-devtools-ui/jest.config.cjs diff --git a/packages/redux-devtools-ui/package.json b/packages/redux-devtools-ui/package.json index 466a7552..b840d282 100644 --- a/packages/redux-devtools-ui/package.json +++ b/packages/redux-devtools-ui/package.json @@ -35,7 +35,7 @@ "build:css": "ncp fonts lib/fonts", "clean": "rimraf lib storybook-static", "test": "jest", - "lint": "eslint . --ext .ts,.tsx", + "lint": "eslint .", "lint:css": "stylelint \"./src/**/*.js\"", "type-check": "tsc --noEmit", "prepack": "pnpm run clean && pnpm run build", @@ -79,16 +79,8 @@ "@types/jest": "^29.5.12", "@types/react": "^18.3.3", "@types/styled-components": "^5.1.34", - "@typescript-eslint/eslint-plugin": "^8.0.1", - "@typescript-eslint/parser": "^8.0.1", "babel-loader": "^9.1.3", "csstype": "^3.1.3", - "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", - "eslint-plugin-storybook": "^0.8.0", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", "ncp": "^2.0.0", diff --git a/packages/redux-devtools-utils/.eslintignore b/packages/redux-devtools-utils/.eslintignore deleted file mode 100644 index a65b4177..00000000 --- a/packages/redux-devtools-utils/.eslintignore +++ /dev/null @@ -1 +0,0 @@ -lib diff --git a/packages/redux-devtools-utils/.eslintrc.js b/packages/redux-devtools-utils/.eslintrc.js deleted file mode 100644 index 6435f877..00000000 --- a/packages/redux-devtools-utils/.eslintrc.js +++ /dev/null @@ -1,13 +0,0 @@ -module.exports = { - extends: '../../eslintrc.js.base.json', - overrides: [ - { - files: ['*.ts'], - extends: '../../eslintrc.ts.base.json', - parserOptions: { - tsconfigRootDir: __dirname, - project: true, - }, - }, - ], -}; diff --git a/packages/redux-devtools-utils/eslint.config.mjs b/packages/redux-devtools-utils/eslint.config.mjs new file mode 100644 index 00000000..624b7096 --- /dev/null +++ b/packages/redux-devtools-utils/eslint.config.mjs @@ -0,0 +1,12 @@ +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(import.meta.dirname), + { + ignores: ['lib'], + }, +]; diff --git a/packages/redux-devtools-utils/package.json b/packages/redux-devtools-utils/package.json index 316ccb58..d8b0257a 100644 --- a/packages/redux-devtools-utils/package.json +++ b/packages/redux-devtools-utils/package.json @@ -26,7 +26,7 @@ "build:esm": "babel src --config-file ./babel.config.esm.json --extensions \".ts\" --out-dir lib/esm", "build:types": "tsc --emitDeclarationOnly", "clean": "rimraf lib", - "lint": "eslint . --ext .ts", + "lint": "eslint .", "type-check": "tsc --noEmit", "prepack": "pnpm run clean && pnpm run build", "prepublish": "pnpm run type-check && pnpm run lint" @@ -53,10 +53,6 @@ "@types/jsan": "^3.1.5", "@types/lodash": "^4.17.7", "@types/node": "^20.14.14", - "@typescript-eslint/eslint-plugin": "^8.0.1", - "@typescript-eslint/parser": "^8.0.1", - "eslint": "^8.57.0", - "eslint-config-prettier": "^9.1.0", "rimraf": "^6.0.1", "typescript": "~5.5.4" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6d60eeed..0bb3d14c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -31,7 +31,7 @@ importers: 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) + version: 28.7.0(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) @@ -2555,36 +2555,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) babel-loader: specifier: ^9.1.3 version: 9.1.3(@babel/core@7.25.2)(webpack@5.93.0) csstype: specifier: ^3.1.3 version: 3.1.3 - 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) - eslint-plugin-storybook: - specifier: ^0.8.0 - version: 0.8.0(eslint@8.57.0)(typescript@5.5.4) jest: specifier: ^29.7.0 version: 29.7.0(@types/node@20.14.14)(ts-node@10.9.2) @@ -2694,18 +2670,6 @@ importers: '@types/node': specifier: ^20.14.14 version: 20.14.14 - '@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) rimraf: specifier: ^6.0.1 version: 6.0.1 @@ -7797,12 +7761,6 @@ packages: unplugin: 1.12.0 dev: true - /@storybook/csf@0.0.1: - resolution: {integrity: sha512-USTLkZze5gkel8MYCujSRBVIrUQ3YPBrLOx7GNk/0wttvVtlzWXAq9eLbQ4p/NicGxP+3T7KPEMVV//g+yubpw==} - dependencies: - lodash: 4.17.21 - dev: true - /@storybook/csf@0.1.11: resolution: {integrity: sha512-dHYFQH3mA+EtnCkHXzicbLgsvzYjcDJ1JWsogbItZogkPHgSJM/Wr71uMkcvw8v9mmCyP4NpXJuu6bPoVsOnzg==} dependencies: @@ -9186,14 +9144,6 @@ packages: - supports-color dev: true - /@typescript-eslint/scope-manager@5.62.0: - resolution: {integrity: sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - dependencies: - '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/visitor-keys': 5.62.0 - dev: true - /@typescript-eslint/scope-manager@8.0.1: resolution: {integrity: sha512-NpixInP5dm7uukMiRyiHjRKkom5RIFA4dfiHvalanD2cF0CLUuQqxfg8PtEUo9yqJI2bBhF+pcSafqnG3UBnRQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -9221,37 +9171,11 @@ packages: - supports-color dev: true - /@typescript-eslint/types@5.62.0: - resolution: {integrity: sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - dev: true - /@typescript-eslint/types@8.0.1: resolution: {integrity: sha512-PpqTVT3yCA/bIgJ12czBuE3iBlM3g4inRSC5J0QOdQFAn07TYrYEQBBKgXH1lQpglup+Zy6c1fxuwTk4MTNKIw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} dev: true - /@typescript-eslint/typescript-estree@5.62.0(typescript@5.5.4): - resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - peerDependencies: - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/visitor-keys': 5.62.0 - debug: 4.3.6(supports-color@5.5.0) - globby: 11.1.0 - is-glob: 4.0.3 - semver: 7.6.3 - tsutils: 3.21.0(typescript@5.5.4) - typescript: 5.5.4 - transitivePeerDependencies: - - supports-color - dev: true - /@typescript-eslint/typescript-estree@8.0.1(typescript@5.5.4): resolution: {integrity: sha512-8V9hriRvZQXPWU3bbiUV4Epo7EvgM6RTs+sUmxp5G//dBGy402S7Fx0W0QkB2fb4obCF8SInoUzvTYtc3bkb5w==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -9274,26 +9198,6 @@ packages: - supports-color dev: true - /@typescript-eslint/utils@5.62.0(eslint@8.57.0)(typescript@5.5.4): - resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) - '@types/json-schema': 7.0.15 - '@types/semver': 7.5.8 - '@typescript-eslint/scope-manager': 5.62.0 - '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.5.4) - eslint: 8.57.0 - eslint-scope: 5.1.1 - semver: 7.6.3 - transitivePeerDependencies: - - supports-color - - typescript - dev: true - /@typescript-eslint/utils@8.0.1(eslint@8.57.0)(typescript@5.5.4): resolution: {integrity: sha512-CBFR0G0sCt0+fzfnKaciu9IBsKvEKYwN9UZ+eeogK1fYHg4Qxk1yf/wLQkLXlq8wbU2dFlgAesxt8Gi76E8RTA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -9310,14 +9214,6 @@ packages: - typescript dev: true - /@typescript-eslint/visitor-keys@5.62.0: - resolution: {integrity: sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - dependencies: - '@typescript-eslint/types': 5.62.0 - eslint-visitor-keys: 3.4.3 - dev: true - /@typescript-eslint/visitor-keys@8.0.1: resolution: {integrity: sha512-W5E+o0UfUcK5EgchLZsyVWqARmsM7v54/qEq6PY3YI5arkgmCzHiuk0zKSJJbm71V0xdRna4BGomkCTXz2/LkQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -12316,7 +12212,7 @@ packages: - supports-color dev: true - /eslint-plugin-jest@28.7.0(@typescript-eslint/eslint-plugin@8.0.1)(eslint@8.57.0)(jest@29.7.0)(typescript@5.5.4): + /eslint-plugin-jest@28.7.0(eslint@8.57.0)(jest@29.7.0)(typescript@5.5.4): resolution: {integrity: sha512-fzPGN7awL2ftVRQh/bsCi+16ArUZWujZnD1b8EGJqy8nr4//7tZ3BIdc/9edcJBtB3hpci3GtdMNFVDwHU0Eag==} engines: {node: ^16.10.0 || ^18.12.0 || >=20.0.0} peerDependencies: @@ -12329,7 +12225,6 @@ packages: jest: optional: true dependencies: - '@typescript-eslint/eslint-plugin': 8.0.1(@typescript-eslint/parser@8.0.1)(eslint@8.57.0)(typescript@5.5.4) '@typescript-eslint/utils': 8.0.1(eslint@8.57.0)(typescript@5.5.4) eslint: 8.57.0 jest: 29.7.0(@types/node@20.14.14)(ts-node@10.9.2) @@ -12399,22 +12294,6 @@ packages: string.prototype.repeat: 1.0.0 dev: true - /eslint-plugin-storybook@0.8.0(eslint@8.57.0)(typescript@5.5.4): - resolution: {integrity: sha512-CZeVO5EzmPY7qghO2t64oaFM+8FTaD4uzOEjHKp516exyTKo+skKAL9GI3QALS2BXhyALJjNtwbmr1XinGE8bA==} - engines: {node: '>= 18'} - peerDependencies: - eslint: '>=6' - dependencies: - '@storybook/csf': 0.0.1 - '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.5.4) - eslint: 8.57.0 - requireindex: 1.2.0 - ts-dedent: 2.2.0 - transitivePeerDependencies: - - supports-color - - typescript - dev: true - /eslint-scope@5.1.1: resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==} engines: {node: '>=8.0.0'} @@ -17460,11 +17339,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - /requireindex@1.2.0: - resolution: {integrity: sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==} - engines: {node: '>=0.10.5'} - dev: true - /requires-port@1.0.0: resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==} @@ -19036,16 +18910,6 @@ packages: /tslib@2.6.3: resolution: {integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==} - /tsutils@3.21.0(typescript@5.5.4): - resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} - engines: {node: '>= 6'} - peerDependencies: - typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' - dependencies: - tslib: 1.14.1 - typescript: 5.5.4 - dev: true - /tunnel-agent@0.6.0: resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} dependencies: