fix conflicting types with cypress and jest

chingu-x · Sep 18, 2023 · 5b03bb3 · 5b03bb3
1 parent 664c42e
commit 5b03bb3
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 6 deletions.
diff --git a/cypress/fixtures/profile.json b/cypress/fixtures/profile.json
@@ -2,4 +2,4 @@
   "id": 8739,
   "name": "Jane",
   "email": "[email protected]"
-}
+}
diff --git a/cypress/fixtures/users.json b/cypress/fixtures/users.json
@@ -229,4 +229,4 @@
       "bs": "target end-to-end models"
     }
   }
-]
+]
diff --git a/cypress/screenshots/2-advanced-examples/misc.cy.js/my-image.png b/cypress/screenshots/2-advanced-examples/misc.cy.js/my-image.png
diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "target": "es5",
+        "lib": [
+            "es5",
+            "dom"
+        ],
+        "types": [
+            "cypress",
+            "node"
+        ]
+    },
+    "include": [
+        "../node_modules/cypress",
+        "**/*.ts"
+    ]
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -7,7 +7,11 @@
   },
   "compilerOptions": {
     "target": "es5",
-    "lib": ["dom", "dom.iterable", "esnext"],
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
     "allowJs": true,
     "skipLibCheck": true,
     "strict": true,
@@ -26,7 +30,9 @@
       }
     ],
     "paths": {
-      "@/*": ["./src/*"]
+      "@/*": [
+        "./src/*"
+      ]
     }
   },
   "include": [
@@ -37,5 +43,9 @@
     ".next/types/**/*.ts",
     "jest.config.mjs"
   ],
-  "exclude": ["node_modules"]
-}
+  "exclude": [
+    "node_modules",
+    "cypress.config.ts",
+    "cypress"
+  ]
+}