🧹 Update mocha and remove resolutions (#18736)

* remove resolutions in root package.json

update mocha to avoid pulling in minimatch@3.0.4

* adjust mocha config

* also consider *.spec.db.*

* re-add missing exclude of node_modules

* remove recursive

* fix mocha execution

Author: AlexTugarev

components/gitpod-db/mocha.opts

@@ -12,14 +12,25 @@
     "test": "yarn db-test",
     "watch": "leeway exec --package .:lib --transitive-dependencies --filter-type yarn --components --parallel -- tsc -w --preserveWatchOutput",
     "db-test": "r(){ . $(leeway run components/gitpod-db:db-test-env); yarn db-test-run; };r",
-    "db-test-run": "mocha --opts mocha.opts '**/*.spec.db.ts' --exclude './node_modules/**'",
+    "db-test-run": "mocha '**/*.spec.db.ts' --exclude './node_modules/**' --exit",
     "wait-for-db": "node ./lib/wait-for-db.js",
     "typeorm": "typeorm -f lib/typeorm/ormconfig",
     "migrate-migrations": "node ./lib/migrate-migrations.js",
     "clean": "yarn run rimraf lib",
     "clean:node": "yarn run rimraf node_modules",
     "purge": "yarn clean && yarn clean:node && yarn run rimraf yarn.lock"
   },
+  "mocha": {
+    "require": [
+      "ts-node/register",
+      "reflect-metadata/Reflect",
+      "source-map-support/register"
+    ],
+    "extensions": [
+      "ts"
+    ],
+    "exit": true
+  },
   "files": [
     "/lib"
   ],
@@ -38,14 +49,14 @@
   "devDependencies": {
     "@testdeck/mocha": "^0.3.3",
     "@types/chai": "^4.2.2",
-    "@types/mocha": "^2.2.45",
+    "@types/mocha": "^10.0.1",
     "@types/mysql": "^2.15.0",
     "@types/uuid": "^8.3.1",
     "@typescript-eslint/eslint-plugin": "^5.5.0",
     "@typescript-eslint/parser": "^5.5.0",
     "chai": "^4.2.0",
     "eslint": "^8.47.0",
-    "mocha": "^4.1.0",
+    "mocha": "^10.2.0",
     "rimraf": "^2.6.1",
     "ts-node": "^10.4.0",
     "typescript": "~4.4.2"

components/gitpod-db/package.json

@@ -19,7 +19,7 @@
         "@types/google-protobuf": "^3.15.5",
         "@types/jaeger-client": "^3.18.3",
         "@types/js-yaml": "^3.10.1",
-        "@types/mocha": "^5.2.7",
+        "@types/mocha": "^10.0.1",
         "@types/node": "^16.11.6",
         "@types/random-number-csprng": "^1.0.0",
         "@types/uuid": "^8.3.1",
@@ -29,7 +29,7 @@
         "chai": "^4.3.4",
         "chai-subset": "^1.6.0",
         "eslint": "^8.47.0",
-        "mocha": "^5.0.0",
+        "mocha": "^10.2.0",
         "rimraf": "^2.6.2",
         "ts-node": "^10.4.0",
         "typescript": "~4.4.2",
@@ -41,10 +41,21 @@
         "build": "yarn lint && tsc",
         "lint": "yarn eslint src/*.ts src/**/*.ts",
         "lint:fix": "yarn eslint src/*.ts src/**/*.ts --fix",
-        "test": "mocha --opts mocha.opts './**/*.spec.ts' --exclude './node_modules/**'",
-        "test-debug": "mocha --opts mocha.opts --inspect-brk './**/*.spec.ts' --exclude './node_modules/**'",
+        "test": "mocha './**/*.spec.ts' --exclude './node_modules/**'",
+        "test-debug": "mocha --inspect-brk './**/*.spec.ts' --exclude './node_modules/**' --exit",
         "watch": "leeway exec --package .:lib --transitive-dependencies --filter-type yarn --components --parallel -- tsc -w --preserveWatchOutput"
     },
+    "mocha": {
+        "require": [
+            "ts-node/register",
+            "reflect-metadata/Reflect",
+            "source-map-support/register"
+        ],
+        "extensions": [
+            "ts"
+        ],
+        "exit": true
+    },
     "dependencies": {
         "@types/react": "17.0.32",
         "abort-controller-x": "^0.4.0",

components/gitpod-protocol/mocha.opts

@@ -10,9 +10,20 @@
   "scripts": {
     "build": "mkdir -p lib; tsc",
     "watch": "leeway exec --package .:lib --transitive-dependencies --filter-type yarn --components --parallel -- tsc -w --preserveWatchOutput",
-    "test": "mocha --opts mocha.opts './**/*.spec.ts' --exclude './node_modules/**'",
+    "test": "mocha './**/*.spec.ts' --exclude './node_modules/**' --exit",
     "test:brk": "yarn test --inspect-brk"
   },
+  "mocha": {
+    "require": [
+      "ts-node/register",
+      "reflect-metadata/Reflect",
+      "source-map-support/register"
+    ],
+    "extensions": [
+      "ts"
+    ],
+    "exit": true
+  },
   "dependencies": {
     "@bufbuild/connect": "^0.13.0",
     "@bufbuild/protobuf": "^0.1.1",

components/gitpod-protocol/package.json

@@ -18,8 +18,8 @@
     "purge": "yarn clean && yarn clean:node && yarn run rimraf yarn.lock",
     "test:leeway": "yarn build && yarn test",
     "test": "yarn test:unit && yarn test:db",
-    "test:unit": "mocha --opts mocha.opts './**/*.spec.js' --exclude './node_modules/**'",
-    "test:db": "cleanup() { echo 'Cleanup started'; yarn stop-services; }; trap cleanup EXIT; . $(leeway run components/gitpod-db:db-test-env) && yarn start-services && mocha --opts mocha.opts './**/*.spec.db.js'  --exclude './node_modules/**'",
+    "test:unit": "mocha './**/*.spec.js' --exclude './node_modules/**' --exit",
+    "test:db": "cleanup() { echo 'Cleanup started'; yarn stop-services; }; trap cleanup EXIT; . $(leeway run components/gitpod-db:db-test-env) && yarn start-services && mocha './**/*.spec.db.js'  --exclude './node_modules/**' --exit",
     "start-services": "yarn start-testdb && yarn start-redis && yarn start-spicedb",
     "stop-services": "yarn stop-redis && yarn stop-spicedb",
     "start-testdb": "leeway run components/gitpod-db:init-testdb",
@@ -29,6 +29,16 @@
     "stop-redis": "docker stop test-redis || true",
     "telepresence": "telepresence --swap-deployment server --method inject-tcp --run yarn start-inspect"
   },
+  "mocha": {
+    "require": [
+      "reflect-metadata/Reflect",
+      "source-map-support/register"
+    ],
+    "extensions": [
+      "js"
+    ],
+    "exit": true
+  },
   "files": [
     "/dist",
     "/src"
@@ -73,6 +83,7 @@
     "jsonwebtoken": "^9.0.0",
     "lodash.debounce": "^4.0.8",
     "longjohn": "^0.2.12",
+    "minimatch": "^9.0.3",
     "nice-grpc-client-middleware-retry": "^2.0.1",
     "node-fetch": "^2.6.7",
     "opentracing": "^0.14.4",
@@ -110,7 +121,7 @@
     "@types/http-proxy": "^1.17.7",
     "@types/js-yaml": "^4.0.3",
     "@types/lodash.debounce": "^4.0.6",
-    "@types/mocha": "^2.2.45",
+    "@types/mocha": "^10.0.1",
     "@types/node": "^16.11.0",
     "@types/node-fetch": "^2.6.1",
     "@types/passport": "^1.0.7",
@@ -126,7 +137,7 @@
     "deep-equal-in-any-order": "^2.0.0",
     "eslint": "^8.47.0",
     "expect": "^1.20.2",
-    "mocha": "^5.0.0",
+    "mocha": "^10.2.0",
     "prettier": "^3.0.0",
     "rimraf": "^3.0.2",
     "source-map-loader": "^4.0.1",

components/public-api/typescript/mocha.opts

@@ -10,9 +10,20 @@
   "scripts": {
     "build": "mkdir -p lib && cp -f src/*.js src/*d.ts lib && tsc",
     "watch": "leeway exec --package .:lib --transitive-dependencies --filter-type yarn --components --parallel -- tsc -w --preserveWatchOutput",
-    "test": "mocha --opts mocha.opts './**/*.spec.ts' --exclude './node_modules/**'",
+    "test": "mocha './**/*.spec.ts' --exclude './node_modules/**' --exit",
     "test:brk": "yarn test --inspect-brk"
   },
+  "mocha": {
+    "require": [
+      "ts-node/register",
+      "reflect-metadata/Reflect",
+      "source-map-support/register"
+    ],
+    "extensions": [
+      "ts"
+    ],
+    "exit": true
+  },
   "dependencies": {
     "@gitpod/content-service": "0.1.5",
     "@gitpod/gitpod-protocol": "0.1.5",
@@ -29,7 +40,7 @@
     "chai": "^4.3.4",
     "grpc-tools": "^1.12.4",
     "grpc_tools_node_protoc_ts": "^5.3.2",
-    "mocha": "^5.0.0",
+    "mocha": "^10.2.0",
     "ts-node": "^10.4.0",
     "typescript": "~4.4.2",
     "typescript-formatter": "^7.2.2"