Merge remote-tracking branch 'origin/main' into beta-releases

Author: github-actions[bot]

.evergreen/functions.yml

@@ -122,10 +122,9 @@ post:
       remote_file: ${project}/${revision}_${revision_order_id}/vulnerability-report.md
       content_type: text/markdown
       optional: true
-  - command: attach.results
+  - command: attach.xunit_results
     params:
-      file_location: src/packages/compass-e2e-tests/.log/report.json
-
+      file: src/.logs/*.xml
 functions:
   clone:
     - command: git.get_project

.gitignore

@@ -33,4 +33,5 @@ mongodb-crypt
 packages/*/.npmrc
 config/*/.npmrc
 .sbom
+.logs
 .evergreen/logs

.snyk

@@ -13,8 +13,8 @@ ignore:
   SNYK-JS-AGGRIDCOMMUNITY-1932011:
     - '*':
         reason: None Given
-        expires: 2024-01-10T00:00:00.000Z
-        created: 2023-08-23T16:17:24.728Z
+        expires: 2024-02-09T14:01:23.838Z
+        created: 2024-01-10T14:01:23.846Z
   SNYK-JS-AXIOS-6032459:
     - '*':
         reason: Not applicable to axios usage inside node-analytics package

THIRD-PARTY-NOTICES.md

@@ -1,6 +1,6 @@
 {
   "name": "@mongodb-js/eslint-config-compass",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "description": "Shared Compass eslint configuration",
   "license": "SSPL",
   "main": "index.js",
@@ -16,7 +16,7 @@
     "@babel/core": "^7.21.4",
     "@babel/eslint-parser": "^7.14.3",
     "@mongodb-js/eslint-config-devtools": "^0.9.9",
-    "@mongodb-js/eslint-plugin-compass": "^1.0.13",
+    "@mongodb-js/eslint-plugin-compass": "^1.0.14",
     "@typescript-eslint/eslint-plugin": "^5.59.0",
     "@typescript-eslint/parser": "^5.59.0",
     "eslint-config-prettier": "^8.3.0",

configs/eslint-config-compass/package.json

@@ -13,7 +13,7 @@
     "email": "[email protected]"
   },
   "homepage": "https://github.com/mongodb-js/compass",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/mongodb-js/compass.git"
@@ -37,7 +37,7 @@
     "reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
   },
   "devDependencies": {
-    "@mongodb-js/mocha-config-compass": "^1.3.5",
+    "@mongodb-js/mocha-config-compass": "^1.3.6",
     "@mongodb-js/prettier-config-compass": "^1.0.1",
     "depcheck": "^1.4.1",
     "eslint": "^7.25.0",

configs/eslint-plugin-compass/package.json

@@ -3,8 +3,11 @@
 const path = require('path');
 const base = require('@mongodb-js/mocha-config-devtools');
 
+const fs = require('fs');
+
 module.exports = {
   ...base,
+  reporter: path.resolve(__dirname, 'reporter.js'),
   require: [
     ...base.require,
     path.resolve(__dirname, 'register', 'resolve-from-source-register.js'),

configs/mocha-config-compass/index.js

@@ -1,6 +1,6 @@
 {
   "name": "@mongodb-js/mocha-config-compass",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "description": "Shared mocha mocha configuration for Compass packages",
   "license": "SSPL",
   "main": "index.js",

configs/mocha-config-compass/package.json

@@ -0,0 +1,30 @@
+const Mocha = require('mocha');
+const fs = require('fs');
+const path = require('path');
+
+// Import the built-in reporters
+const Spec = Mocha.reporters.Spec;
+const XUnit = Mocha.reporters.XUnit;
+
+class Reporter {
+  constructor(runner) {
+    const suiteName = path.basename(process.cwd());
+
+    new Spec(runner);
+
+    runner.on('suite', (suite) => {
+      if (suite.parent?.root) {
+        suite.title = `${suiteName}__${suite.title}`;
+      }
+    });
+
+    new XUnit(runner, {
+      reporterOptions: {
+        suiteName,
+        output: path.join(__dirname, '..', '..', '.logs', `${suiteName}.xml`),
+      },
+    });
+  }
+}
+
+module.exports = Reporter;

configs/mocha-config-compass/reporter.js

@@ -13,7 +13,7 @@
     "email": "[email protected]"
   },
   "homepage": "https://github.com/mongodb-js/compass",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/mongodb-js/compass.git"
@@ -45,7 +45,7 @@
     "reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
   },
   "devDependencies": {
-    "@mongodb-js/eslint-config-compass": "^1.0.14",
+    "@mongodb-js/eslint-config-compass": "^1.0.15",
     "@mongodb-js/prettier-config-compass": "^1.0.1",
     "@mongodb-js/tsconfig-compass": "^1.0.3",
     "@types/cli-progress": "^3.9.2",