Merge pull request #638 from spotify/rugvip/zetypes

explicit types and remove cypress resolution override
backstage · Apr 24, 2020 · 241ee7f · 241ee7f
2 parents 723eaa7 + dfd44f2
commit 241ee7f
Show file tree

Hide file tree

Showing 5 changed files with 170 additions and 89 deletions.
diff --git a/package.json b/package.json
@@ -34,9 +34,6 @@
     "lint-staged": "^10.1.0",
     "prettier": "^1.19.1"
   },
-  "resolutions": {
-    "**/cypress": "4.2.0"
-  },
   "husky": {
     "hooks": {
       "pre-commit": "lint-staged"

diff --git a/packages/app/tsconfig.json b/packages/app/tsconfig.json
@@ -14,7 +14,8 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "react",
-    "incremental": false
+    "incremental": false,
+    "types": ["node", "jest"]
   },
   "include": ["src"]
 }
diff --git a/packages/backend/tsconfig.json b/packages/backend/tsconfig.json
@@ -8,6 +8,7 @@
     "strict": true,
     "target": "es5",
     "module": "commonjs",
-    "esModuleInterop": true
+    "esModuleInterop": true,
+    "types": ["node", "jest"]
   }
 }
diff --git a/packages/cli/config/tsconfig.json b/packages/cli/config/tsconfig.json
@@ -8,6 +8,7 @@
     "incremental": true,
     "module": "es6",
     "resolveJsonModule": true,
-    "esModuleInterop": true
+    "esModuleInterop": true,
+    "types": ["node", "jest"]
   }
 }