From 7f758196697070a6541d230cca20f0a4c878ca64 Mon Sep 17 00:00:00 2001
From: Chuck Driesler <cdriesler.iv@gmail.com>
Date: Sat, 3 Jun 2023 10:46:34 +0100
Subject: [PATCH] simplify test types

---
 package-lock.json  | 35 +++++++++++++----------------------
 package.json       |  2 +-
 tsconfig.base.json | 19 ++++---------------
 3 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b4af2989f..5061fc131 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,7 @@
         "apps/nodepen-client"
       ],
       "devDependencies": {
-        "@types/mocha": "^10.0.1",
+        "@types/jest": "^29.5.2",
         "@types/node": "^20.2.5",
         "@typescript-eslint/eslint-plugin": "^5.59.8",
         "@typescript-eslint/parser": "^5.59.8",
@@ -934,7 +934,6 @@
       "version": "29.2.0",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "jest-get-type": "^29.2.0"
       },
@@ -946,7 +945,6 @@
       "version": "29.2.0",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
@@ -1836,6 +1834,16 @@
         "@types/istanbul-lib-report": "*"
       }
     },
+    "node_modules/@types/jest": {
+      "version": "29.5.2",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.2.tgz",
+      "integrity": "sha512-mSoZVJF5YzGVCk+FsDxzDuH7s+SCkzrgKZzf0Z0T2WudhBUPoF6ktoTPC4R0ZoCPCV5xUvuU6ias5NvxcBcMMg==",
+      "dev": true,
+      "dependencies": {
+        "expect": "^29.0.0",
+        "pretty-format": "^29.0.0"
+      }
+    },
     "node_modules/@types/json-schema": {
       "version": "7.0.11",
       "license": "MIT"
@@ -1845,11 +1853,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/mocha": {
-      "version": "10.0.1",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@types/node": {
       "version": "20.2.5",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.5.tgz",
@@ -1912,8 +1915,7 @@
     "node_modules/@types/stack-utils": {
       "version": "2.0.1",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@types/stats.js": {
       "version": "0.17.0",
@@ -4213,7 +4215,6 @@
       "version": "29.2.0",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/expect-utils": "^29.2.0",
         "jest-get-type": "^29.2.0",
@@ -4229,7 +4230,6 @@
       "version": "29.2.0",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
@@ -4238,7 +4238,6 @@
       "version": "29.2.0",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "diff-sequences": "^29.2.0",
@@ -4253,7 +4252,6 @@
       "version": "29.2.0",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
@@ -4262,7 +4260,6 @@
       "version": "29.2.0",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "jest-diff": "^29.2.0",
@@ -5692,7 +5689,6 @@
       "version": "29.2.0",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
         "@jest/types": "^29.2.0",
@@ -7229,7 +7225,6 @@
       "version": "29.5.0",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/schemas": "^29.4.3",
         "ansi-styles": "^5.0.0",
@@ -7243,7 +7238,6 @@
       "version": "5.2.0",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -7579,8 +7573,7 @@
     "node_modules/react-is": {
       "version": "18.2.0",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/read-cache": {
       "version": "1.0.0",
@@ -7962,7 +7955,6 @@
       "version": "2.0.5",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "escape-string-regexp": "^2.0.0"
       },
@@ -7974,7 +7966,6 @@
       "version": "2.0.0",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8"
       }
diff --git a/package.json b/package.json
index 53552836d..e6d11a547 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "install:ci": "npm install -D --arch=x64 --platform=linux turbo && npm install -D --arch=arm64 --platform=darwin turbo"
   },
   "devDependencies": {
-    "@types/mocha": "^10.0.1",
+    "@types/jest": "^29.5.2",
     "@types/node": "^20.2.5",
     "@typescript-eslint/eslint-plugin": "^5.59.8",
     "@typescript-eslint/parser": "^5.59.8",
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 1f08d642c..936e73c01 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -3,10 +3,7 @@
     "target": "es6",
     "module": "esnext",
     "moduleResolution": "node",
-    "lib": [
-        "dom",
-        "esnext"
-    ],
+    "lib": ["dom", "esnext"],
     "declaration": true,
     "declarationMap": false,
     "sourceMap": false,
@@ -22,15 +19,7 @@
     "strictFunctionTypes": true,
     "strictNullChecks": true,
     "stripInternal": true,
-    "typeRoots": [
-      "node_modules/@types",
-      "node_modules/jest"
-    ],
-    "types": [
-      "mocha",
-      "node",
-      "jest"
-    ],
-    "verbatimModuleSyntax": true,
+    "types": ["node", "jest"],
+    "verbatimModuleSyntax": true
   }
-}
\ No newline at end of file
+}