diff --git a/packages/react-json-tree/.eslintignore b/packages/react-json-tree/.eslintignore deleted file mode 100644 index be897dba..00000000 --- a/packages/react-json-tree/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -examples -lib diff --git a/packages/react-json-tree/.eslintrc.cjs b/packages/react-json-tree/.eslintrc.cjs deleted file mode 100644 index da9d7dfc..00000000 --- a/packages/react-json-tree/.eslintrc.cjs +++ /dev/null @@ -1,29 +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: ['test/**/*.ts', 'test/**/*.tsx'], - extends: '../../eslintrc.ts.react.jest.base.json', - parserOptions: { - tsconfigRootDir: __dirname, - project: ['./tsconfig.test.json'], - }, - }, - { - files: ['webpack.config.umd.ts'], - extends: '../../eslintrc.ts.base.json', - parserOptions: { - tsconfigRootDir: __dirname, - project: ['./tsconfig.webpack.json'], - }, - }, - ], -}; diff --git a/packages/react-json-tree/eslint.config.js b/packages/react-json-tree/eslint.config.js new file mode 100644 index 00000000..6fd60d24 --- /dev/null +++ b/packages/react-json-tree/eslint.config.js @@ -0,0 +1,14 @@ +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(['test/**/*.ts', 'test/**/*.tsx'], import.meta.dirname, [ + './tsconfig.test.json', + ]), + { + ignores: ['examples', 'lib'], + }, +]; diff --git a/packages/react-json-tree/examples/.eslintignore b/packages/react-json-tree/examples/.eslintignore deleted file mode 100644 index 1521c8b7..00000000 --- a/packages/react-json-tree/examples/.eslintignore +++ /dev/null @@ -1 +0,0 @@ -dist diff --git a/packages/react-json-tree/examples/.eslintrc.js b/packages/react-json-tree/examples/.eslintrc.js deleted file mode 100644 index 6a8196ce..00000000 --- a/packages/react-json-tree/examples/.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/react-json-tree/examples/eslint.config.mjs b/packages/react-json-tree/examples/eslint.config.mjs new file mode 100644 index 00000000..fb96ee3e --- /dev/null +++ b/packages/react-json-tree/examples/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/react-json-tree/examples/package.json b/packages/react-json-tree/examples/package.json index bc1e85dc..9a5ff1ee 100644 --- a/packages/react-json-tree/examples/package.json +++ b/packages/react-json-tree/examples/package.json @@ -15,7 +15,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": { @@ -33,15 +33,8 @@ "@types/node": "^20.14.14", "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", - "@typescript-eslint/eslint-plugin": "^8.0.1", - "@typescript-eslint/parser": "^8.0.1", "babel-loader": "^9.1.3", "cross-env": "^7.0.3", - "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", "ts-node": "^10.9.2", "typescript": "~5.5.4", diff --git a/packages/react-json-tree/package.json b/packages/react-json-tree/package.json index 00a67135..61796f9b 100644 --- a/packages/react-json-tree/package.json +++ b/packages/react-json-tree/package.json @@ -34,7 +34,7 @@ "build": "tsc", "clean": "rimraf lib", "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js", - "lint": "eslint . --ext .ts,.tsx", + "lint": "eslint .", "type-check": "tsc --noEmit", "prepack": "pnpm run clean && pnpm run build", "prepublish": "pnpm run lint && pnpm run test" @@ -47,13 +47,6 @@ "@types/jest": "^29.5.12", "@types/react": "^18.3.3", "@types/react-test-renderer": "^18.3.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", - "eslint-plugin-react": "^7.35.0", - "eslint-plugin-react-hooks": "^4.6.2", "jest": "^29.7.0", "react": "^18.3.1", "react-test-renderer": "^18.3.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4b2c9149..db23a4b3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -523,27 +523,6 @@ importers: '@types/react-test-renderer': specifier: ^18.3.0 version: 18.3.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) - 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) @@ -602,33 +581,12 @@ importers: '@types/react-dom': specifier: ^18.3.0 version: 18.3.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) babel-loader: specifier: ^9.1.3 version: 9.1.3(@babel/core@7.25.2)(webpack@5.93.0) cross-env: specifier: ^7.0.3 version: 7.0.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-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) html-webpack-plugin: specifier: ^5.6.0 version: 5.6.0(webpack@5.93.0)