Merge branch 'main' into bump-to-rc.4

Author: kriswest

package-lock.json

@@ -117,7 +117,6 @@
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
     "react-html-parser": "^2.0.2",
-    "supertest": "^7.1.4",
     "react-router-dom": "6.30.2",
     "simple-git": "^3.30.0",
     "uuid": "^11.1.0",
@@ -163,6 +162,7 @@
     "nyc": "^17.1.0",
     "prettier": "^3.6.2",
     "quicktype": "^23.2.6",
+    "supertest": "^7.1.4",
     "ts-node": "^10.9.2",
     "tsx": "^4.20.6",
     "typescript": "^5.9.3",