Merge branch 'main' of https://github.com/mongodb-js/compass into fix…

…-crud-json-view

.evergreen/functions.yml

@@ -86,7 +86,7 @@ post:
       target: src/all-e2e-logs.tgz
       source_dir: src/packages/compass-e2e-tests/.log
       include:
-        - "**"
+        - '**'
   - command: s3.put
     params:
       <<: *save-artifact-params-private
@@ -303,7 +303,7 @@ functions:
           echo "Running tests in Electron runtime"
 
           # Preparing native addons for electron runtime
-          npm run --unsafe-perm electron-rebuild
+          DEBUG=electron-rebuild* npm run --unsafe-perm electron-rebuild
 
           npm run --unsafe-perm test-ci-electron -- --stream
 
@@ -664,7 +664,7 @@ functions:
           DEBUG: ${debug|}
           MONGODB_VERSION: ${mongodb_version|}
           MONGODB_RUNNER_VERSION: ${mongodb_version|}
-          BROWSER_NAME: ${browser_name}
+          COMPASS_WEB_BROWSER_NAME: ${browser_name}
           E2E_TEST_GROUPS: ${e2e_test_groups}
           E2E_TEST_GROUP: ${e2e_test_group}
         script: |

.evergreen/preinstall.sh

@@ -39,9 +39,6 @@ if [ -n "$IS_WINDOWS" ]; then
     ./node.exe node_modules/npm2/bin/npm-cli.js i -g npm@$NPM_VERSION
     rm -rf node_modules/npm2/
     chmod +x npm.cmd npm
-
-    cd ..
-    .evergreen/node-gyp-bug-workaround.sh
 else
     if command -v ldd &> /dev/null && `ldd $(which bash) | grep 'libc.so' | awk '{print $3}'` | grep -Eq 'release version 2.(1|2[0-7])'; then
         echo "Installing unofficial nodejs compiled for glibc 2.17 v${NODE_JS_VERSION} for ${PLATFORM} on ${ARCH}..."

.evergreen/print-compass-env.js

@@ -68,13 +68,10 @@ function printCompassEnv() {
   }
 
   if (process.env.PLATFORM === 'linux') {
-    // To build node modules on linux post electron 13 we need
-    // a newer c++ compiler version, this adds it.
+    // To build node modules on linux post electron 13 we need a newer c++
+    // compiler version and at least python v3.9, this adds it.
     // https://jira.mongodb.org/browse/COMPASS-5150
     pathsToPrepend.unshift('/opt/mongodbtoolchain/v3/bin');
-
-    // Make sure that linux is using python 3.6 (node-gyp requirement)
-    pathsToPrepend.unshift('/opt/python/3.6/bin');
   }
 
   PATH = maybePrependPaths(PATH, pathsToPrepend);
@@ -103,10 +100,16 @@ function printCompassEnv() {
   printVar('IS_RHEL', process.env.IS_RHEL);
   printVar('IS_UBUNTU', process.env.IS_UBUNTU);
   printVar('DEBUG', process.env.DEBUG);
-  printVar('MONGODB_VERSION', process.env.MONGODB_VERSION || process.env.MONGODB_DEFAULT_VERSION);
+  printVar(
+    'MONGODB_VERSION',
+    process.env.MONGODB_VERSION || process.env.MONGODB_DEFAULT_VERSION
+  );
   printVar('DEV_VERSION_IDENTIFIER', process.env.DEV_VERSION_IDENTIFIER);
   printVar('EVERGREEN_REVISION', process.env.EVERGREEN_REVISION);
-  printVar('EVERGREEN_REVISION_ORDER_ID', process.env.EVERGREEN_REVISION_ORDER_ID);
+  printVar(
+    'EVERGREEN_REVISION_ORDER_ID',
+    process.env.EVERGREEN_REVISION_ORDER_ID
+  );
 
   if (process.platform === 'darwin') {
     // Without this, kerberos 2.1.1 is broken on macOS, but this flag is only

AUTHORS

@@ -92,3 +92,4 @@ admin-token-bot <[email protected]>
 Kræn Hansen <[email protected]>
 Kræn Hansen <[email protected]>
 Ruchitha Rajaghatta <[email protected]>
+syn-zhu <[email protected]>

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 Sun Oct 20 2024.
+This document was automatically generated on Mon Oct 28 2024.
 
 ## List of dependencies
 
@@ -364,7 +364,7 @@ Package|Version|License
 **[json5](#16281c6ea25e0cec4bc0bb8c01d1759d66992776381bf9c5af6959bec47d2f77)**|2.2.3|MIT
 **[jsondiffpatch](#2cc3b990f6692cd23f883319a727b42a76a3a9d6675d1ebd8a05241eb7edc4ac)**|0.5.0|MIT
 **[jsonfile](#1504ddbe5031429f6d90bb02373b4629ff5da9ef4e869d5015ff42f685817e74)**|6.1.0|MIT
-**[kerberos](#e9b8ef28e3d246d5071f34b07b67580523cda7bd0d7d74dc2e422d79d30c238d)**|2.1.1|Apache-2.0
+**[kerberos](#ac70d4903c6441fd96843a6ecb73f258ee27ef26b25290257564a11c10ecd17b)**|2.2.0|Apache-2.0
 **[key-tree-store](#63e3bcb8e06ac6b9f7c153030ce57fad6e985a0cc7f0109d3fc6073192a932f8)**|1.3.0|MIT
 **[keytar](#752f1130bbd6c5dc941bdb20fb39579c1d350252a112c58f2558b7c5f536d6f7)**|7.9.0|MIT
 **[leaflet-defaulticon-compatibility](#7fba582082c899d764d8e4214d2f6f06cd043b2dce51598ec24ce299f5640a6e)**|0.1.1|BSD-2-Clause
@@ -23138,8 +23138,8 @@ License files:
 
 
 
-<a id="e9b8ef28e3d246d5071f34b07b67580523cda7bd0d7d74dc2e422d79d30c238d"></a>
-### [kerberos](https://www.npmjs.com/package/kerberos) (version 2.1.1)
+<a id="ac70d4903c6441fd96843a6ecb73f258ee27ef26b25290257564a11c10ecd17b"></a>
+### [kerberos](https://www.npmjs.com/package/kerberos) (version 2.2.0)
 License tags: Apache-2.0
 
 License files:

docs/tracking-plan.md

@@ -1,7 +1,7 @@
 
 # Compass Tracking Plan
 
-Generated on Sun, Oct 20, 2024 at 03:17 AM
+Generated on Mon, Oct 28, 2024 at 08:31 AM
 
 ## Table of Contents