Skip to content

Commit 206aecb

Browse files
authored
Merge branch 'main' into ts7
2 parents f5b6211 + dac4ffc commit 206aecb

3 files changed

Lines changed: 3 additions & 53 deletions

File tree

.npmrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

eslint.config.js

Lines changed: 2 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import eslintReact from '@eslint-react/eslint-plugin';
22
import markdown from '@eslint/markdown';
33
import vitest from '@vitest/eslint-plugin';
4-
import jestDom from 'eslint-plugin-jest-dom';
54
import reactHooks from 'eslint-plugin-react-hooks';
65
import sonarjs from 'eslint-plugin-sonarjs';
7-
import testingLibrary from 'eslint-plugin-testing-library';
86
import { defineConfig, globalIgnores } from 'eslint/config';
97
import tseslint from 'typescript-eslint';
108

@@ -896,9 +894,7 @@ copy(
896894
files: ['test/**/*'],
897895

898896
plugins: {
899-
vitest,
900-
'jest-dom': jestDom,
901-
'testing-library': testingLibrary
897+
vitest
902898
},
903899

904900
rules: {
@@ -1018,51 +1014,7 @@ copy(
10181014
'vitest/valid-expect': [1, { alwaysAwait: true }],
10191015
'vitest/valid-expect-in-promise': 1,
10201016
'vitest/valid-title': 1,
1021-
'vitest/warn-todo': 1,
1022-
1023-
// https://github.com/testing-library/eslint-plugin-jest-dom#supported-rules
1024-
'jest-dom/prefer-checked': 1,
1025-
'jest-dom/prefer-empty': 1,
1026-
'jest-dom/prefer-enabled-disabled': 1,
1027-
'jest-dom/prefer-focus': 1,
1028-
'jest-dom/prefer-in-document': 1,
1029-
'jest-dom/prefer-required': 1,
1030-
'jest-dom/prefer-to-have-attribute': 1,
1031-
'jest-dom/prefer-to-have-class': 1,
1032-
'jest-dom/prefer-to-have-style': 1,
1033-
'jest-dom/prefer-to-have-text-content': 1,
1034-
'jest-dom/prefer-to-have-value': 1,
1035-
1036-
// eslint-plugin-testing-library Rules
1037-
// https://github.com/testing-library/eslint-plugin-testing-library#supported-rules
1038-
'testing-library/await-async-events': 0,
1039-
'testing-library/await-async-queries': 0,
1040-
'testing-library/await-async-utils': 0,
1041-
'testing-library/consistent-data-testid': 0,
1042-
'testing-library/no-await-sync-events': 0,
1043-
'testing-library/no-await-sync-queries': 0,
1044-
'testing-library/no-container': 1,
1045-
'testing-library/no-debugging-utils': 1,
1046-
'testing-library/no-dom-import': 1,
1047-
'testing-library/no-global-regexp-flag-in-query': 1,
1048-
'testing-library/no-manual-cleanup': 0,
1049-
'testing-library/no-node-access': 0,
1050-
'testing-library/no-promise-in-fire-event': 0,
1051-
'testing-library/no-render-in-lifecycle': 0,
1052-
'testing-library/no-test-id-queries': 0,
1053-
'testing-library/no-unnecessary-act': 1,
1054-
'testing-library/no-wait-for-multiple-assertions': 1,
1055-
'testing-library/no-wait-for-side-effects': 1,
1056-
'testing-library/no-wait-for-snapshot': 0,
1057-
'testing-library/prefer-explicit-assert': 1,
1058-
'testing-library/prefer-find-by': 1,
1059-
'testing-library/prefer-implicit-assert': 0,
1060-
'testing-library/prefer-presence-queries': 0,
1061-
'testing-library/prefer-query-by-disappearance': 1,
1062-
'testing-library/prefer-query-matchers': 0,
1063-
'testing-library/prefer-screen-queries': 0,
1064-
'testing-library/prefer-user-event': 1,
1065-
'testing-library/render-result-naming-convention': 0
1017+
'vitest/warn-todo': 1
10661018
}
10671019
},
10681020

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,8 @@
6464
"clsx": "^2.1.1",
6565
"ecij": "^0.4.1",
6666
"eslint": "^10.0.3",
67-
"eslint-plugin-jest-dom": "^5.5.0",
6867
"eslint-plugin-react-hooks": "^7.0.1",
6968
"eslint-plugin-sonarjs": "^4.0.2",
70-
"eslint-plugin-testing-library": "^7.16.0",
7169
"jspdf": "^4.2.0",
7270
"jspdf-autotable": "^5.0.7",
7371
"oxfmt": "0.43.0",
@@ -87,6 +85,7 @@
8785
"react-dom": "^19.2"
8886
},
8987
"overrides": {
88+
"eslint": "$eslint",
9089
"typescript": "$typescript"
9190
}
9291
}

0 commit comments

Comments
 (0)