fix: Resolve conflicts

cloudscape-design · Feb 19, 2025 · 0bf590d · 0bf590d
2 parents b1c43a6 + d6733f7
commit 0bf590d
Show file tree

Hide file tree

Showing 44 changed files with 789 additions and 818 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -24,7 +24,7 @@ module.exports = {
     'no-unsanitized',
     'header',
     'simple-import-sort',
-    'no-only-tests',
+    'jest',
   ],
   rules: {
     '@typescript-eslint/no-empty-function': 'off',
@@ -90,7 +90,16 @@ module.exports = {
     ],
     'no-warning-comments': 'warn',
     'simple-import-sort/imports': 'error',
-    'no-only-tests/no-only-tests': 'error',
+    'jest/no-alias-methods': 'error',
+    'jest/no-deprecated-functions': 'error',
+    'jest/no-focused-tests': 'error',
+    'jest/no-identical-title': 'error',
+    'jest/no-interpolation-in-snapshots': 'error',
+    'jest/no-jasmine-globals': 'error',
+    'jest/no-test-prefixes': 'error',
+    'jest/valid-describe-callback': 'error',
+    'jest/valid-expect': 'error',
+    'jest/valid-expect-in-promise': 'error',
   },
   settings: {
     react: {