Merge branch 'main' into CLOUDP-286331

Author: Anemy

.evergreen/buildvariants-and-tasks.in.yml

@@ -61,12 +61,12 @@ const PACKAGE_BUILD_VARIANTS = [
 ];
 
 const SMOKETEST_BUILD_VARIANTS = [
-  {
-    name: 'smoketest-ubuntu',
-    display_name: 'Smoketest Ubuntu',
-    run_on: 'ubuntu2004-large',
-    depends_on: 'package-ubuntu',
-  },
+//  {
+//    name: 'smoketest-ubuntu',
+//    display_name: 'Smoketest Ubuntu',
+//    run_on: 'ubuntu2004-large',
+//    depends_on: 'package-ubuntu',
+//  },
   
 //  {
 //    name: 'smoketest-windows',

.evergreen/buildvariants-and-tasks.yml

@@ -76,14 +76,6 @@ buildvariants:
       - name: package-compass
       - name: package-compass-isolated
       - name: package-compass-readonly
-  - name: smoketest-ubuntu-compass
-    display_name: Smoketest Ubuntu (compass)
-    run_on: ubuntu2004-large
-    depends_on:
-      - name: package-compass
-        variant: package-ubuntu
-    tasks:
-      - name: smoketest-compass
   - name: smoketest-macos-x64-compass
     display_name: Smoketest MacOS Intel (compass)
     run_on: macos-14-gui

.evergreen/functions.yml

@@ -669,12 +669,29 @@ functions:
           # Load environment variables
           eval $(.evergreen/print-compass-env.sh)
 
+          #if [[ "$IS_WINDOWS" == "true" ]]; then
+            # TODO: windows_setup
+            # TODO: windows_msi
+            # TODO: windows_zip
+          #fi
+
           if [[ "$IS_OSX" == "true" ]]; then
             echo "Disabling clipboard usage in e2e tests (TODO: https://jira.mongodb.org/browse/BUILD-14780)"
             export COMPASS_E2E_DISABLE_CLIPBOARD_USAGE="true"
+            npm run --unsafe-perm --workspace compass-e2e-tests smoketest -- --package=osx_dmg
+            # TODO: osx_zip
           fi
 
-          npm run --unsafe-perm --workspace compass-e2e-tests smoketest
+          #if [[ "$IS_UBUNTU" == "true" ]]; then
+            # TODO: linux_deb
+            # TODO: linux_tar
+          #fi
+
+          #if [[ "$IS_RHEL" == "true" ]]; then
+            # TODO: linux_rpm
+            # TODO: rhel_tar
+          #fi
+
 
   test-web-sandbox:
     - command: shell.exec

.npmrc

@@ -1,5 +1,4 @@
 engine-strict=true
 registry=https://registry.npmjs.org/
-legacy-peer-deps=true
 napi-build-version=7
 foreground-scripts=true

THIRD-PARTY-NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **Mongodb Compass**.
-This document was automatically generated on Wed Jan 08 2025.
+This document was automatically generated on Mon Jan 13 2025.
 
 ## List of dependencies
 

configs/eslint-config-compass/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongodb-js/eslint-config-compass",
-  "version": "1.1.11",
+  "version": "1.2.1",
   "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.25",
+    "@mongodb-js/eslint-plugin-compass": "^1.1.1",
     "@typescript-eslint/eslint-plugin": "^5.59.0",
     "@typescript-eslint/parser": "^5.59.0",
     "eslint-config-prettier": "^8.3.0",

configs/eslint-plugin-compass/package.json

@@ -13,7 +13,7 @@
     "email": "[email protected]"
   },
   "homepage": "https://github.com/mongodb-js/compass",
-  "version": "1.0.25",
+  "version": "1.1.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/mongodb-js/compass.git"
@@ -37,8 +37,8 @@
     "reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
   },
   "devDependencies": {
-    "@mongodb-js/mocha-config-compass": "^1.4.6",
-    "@mongodb-js/prettier-config-compass": "^1.0.6",
+    "@mongodb-js/mocha-config-compass": "^1.5.1",
+    "@mongodb-js/prettier-config-compass": "^1.1.1",
     "depcheck": "^1.4.1",
     "eslint": "^7.25.0",
     "mocha": "^10.2.0",

configs/mocha-config-compass/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@mongodb-js/mocha-config-compass",
-  "version": "1.4.6",
+  "version": "1.5.1",
   "description": "Shared mocha mocha configuration for Compass packages",
   "license": "SSPL",
   "main": "index.js",
   "devDependencies": {
-    "@mongodb-js/prettier-config-compass": "^1.0.6",
+    "@mongodb-js/prettier-config-compass": "^1.1.1",
     "prettier": "^2.7.1"
   },
   "scripts": {

configs/prettier-config-compass/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongodb-js/prettier-config-compass",
-  "version": "1.0.6",
+  "version": "1.1.1",
   "description": "Shared Compass prettier configuration",
   "license": "SSPL",
   "main": "index.js",

configs/testing-library-compass/package.json

@@ -11,7 +11,7 @@
     "email": "[email protected]"
   },
   "homepage": "https://github.com/mongodb-js/compass",
-  "version": "1.0.6",
+  "version": "1.1.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/mongodb-js/compass.git"
@@ -45,10 +45,10 @@
     "reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
   },
   "devDependencies": {
-    "@mongodb-js/eslint-config-compass": "^1.1.11",
-    "@mongodb-js/mocha-config-compass": "^1.4.6",
-    "@mongodb-js/prettier-config-compass": "^1.0.6",
-    "@mongodb-js/tsconfig-compass": "^1.0.9",
+    "@mongodb-js/eslint-config-compass": "^1.2.1",
+    "@mongodb-js/mocha-config-compass": "^1.5.1",
+    "@mongodb-js/prettier-config-compass": "^1.1.1",
+    "@mongodb-js/tsconfig-compass": "^1.1.1",
     "@types/chai": "^4.2.21",
     "@types/mocha": "^9.0.0",
     "@types/sinon-chai": "^3.2.5",