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

Author: github-actions[bot]

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

@@ -352,6 +352,7 @@ tasks:
           e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
           e2e_test_group: <%= group.number %>
           debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
+          mongodb_version: latest-enterprise
 <% } %>
 
   - name: generate-vulnerability-report
@@ -472,7 +473,7 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: latest
+          mongodb_version: latest-enterprise
           compass_distribution: compass
           e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
           e2e_test_group: <%= group.number %>
@@ -494,7 +495,7 @@ tasks:
           compass_distribution: compass
       - func: test-web-sandbox
         vars:
-          mongodb_version: latest
+          mongodb_version: latest-enterprise
           browser_name: '<%= browser %>'
           compass_distribution: compass
           e2e_test_groups: <%= E2E_TEST_GROUPS.length %>

.evergreen/buildvariants-and-tasks.yml

@@ -351,6 +351,7 @@ tasks:
           e2e_test_groups: 3
           e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: latest-enterprise
   - name: e2e-multiple-connections-2
     tags:
       - required-for-publish
@@ -364,6 +365,7 @@ tasks:
           e2e_test_groups: 3
           e2e_test_group: 2
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: latest-enterprise
   - name: e2e-multiple-connections-3
     tags:
       - required-for-publish
@@ -377,6 +379,7 @@ tasks:
           e2e_test_groups: 3
           e2e_test_group: 3
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: latest-enterprise
   - name: generate-vulnerability-report
     tags:
       - required-for-publish
@@ -1542,7 +1545,7 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: latest
+          mongodb_version: latest-enterprise
           compass_distribution: compass
           e2e_test_groups: 3
           e2e_test_group: 1
@@ -1565,7 +1568,7 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: latest
+          mongodb_version: latest-enterprise
           compass_distribution: compass
           e2e_test_groups: 3
           e2e_test_group: 2
@@ -1588,7 +1591,7 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: latest
+          mongodb_version: latest-enterprise
           compass_distribution: compass
           e2e_test_groups: 3
           e2e_test_group: 3
@@ -1608,7 +1611,7 @@ tasks:
           compass_distribution: compass
       - func: test-web-sandbox
         vars:
-          mongodb_version: latest
+          mongodb_version: latest-enterprise
           browser_name: chrome
           compass_distribution: compass
           e2e_test_groups: 3
@@ -1629,7 +1632,7 @@ tasks:
           compass_distribution: compass
       - func: test-web-sandbox
         vars:
-          mongodb_version: latest
+          mongodb_version: latest-enterprise
           browser_name: chrome
           compass_distribution: compass
           e2e_test_groups: 3
@@ -1650,7 +1653,7 @@ tasks:
           compass_distribution: compass
       - func: test-web-sandbox
         vars:
-          mongodb_version: latest
+          mongodb_version: latest-enterprise
           browser_name: chrome
           compass_distribution: compass
           e2e_test_groups: 3
@@ -1671,7 +1674,7 @@ tasks:
           compass_distribution: compass
       - func: test-web-sandbox
         vars:
-          mongodb_version: latest
+          mongodb_version: latest-enterprise
           browser_name: firefox
           compass_distribution: compass
           e2e_test_groups: 3
@@ -1692,7 +1695,7 @@ tasks:
           compass_distribution: compass
       - func: test-web-sandbox
         vars:
-          mongodb_version: latest
+          mongodb_version: latest-enterprise
           browser_name: firefox
           compass_distribution: compass
           e2e_test_groups: 3
@@ -1713,7 +1716,7 @@ tasks:
           compass_distribution: compass
       - func: test-web-sandbox
         vars:
-          mongodb_version: latest
+          mongodb_version: latest-enterprise
           browser_name: firefox
           compass_distribution: compass
           e2e_test_groups: 3

.evergreen/compass_package.sh

@@ -7,11 +7,8 @@ if [[ "$OSTYPE" == "cygwin" ]]; then
   net start MSIServer
 fi
 
-# Ensure .sbom is always created with fresh data
-rm -rvf .sbom && mkdir -pv .sbom
-
 echo "Creating signed release build..."
-npm run package-compass $COMPASS_DISTRIBUTION;
+npm run package-compass-nocompile $COMPASS_DISTRIBUTION
 npm run generate-first-party-deps-json
 
 ls -la packages/compass/dist

.evergreen/functions.yml

@@ -410,19 +410,15 @@ functions:
           DEBUG: ${debug}
           npm_config_loglevel: ${npm_loglevel}
           COMPASS_DISTRIBUTION: ${compass_distribution}
-          SIGNING_SERVER_HOSTNAME: ${SIGNING_SERVER_HOSTNAME}
-          SIGNING_SERVER_PRIVATE_KEY: ${SIGNING_SERVER_PRIVATE_KEY}
-          SIGNING_SERVER_PRIVATE_KEY_CYGPATH: ${SIGNING_SERVER_PRIVATE_KEY_CYGPATH}
-          SIGNING_SERVER_USERNAME: ${SIGNING_SERVER_USERNAME}
-          SIGNING_SERVER_PORT: ${SIGNING_SERVER_PORT}
-          GITHUB_PR_NUMBER: ${github_pr_number}
-          PAPERTRAIL_KEY_ID: ${papertrail_key_id}
-          PAPERTRAIL_SECRET_KEY: ${papertrail_secret_key}
         script: |
           set -e
+
+          # Ensure .sbom is always created with fresh data
+          rm -rvf .sbom && mkdir -pv .sbom
+
           # Load environment variables
           eval $(.evergreen/print-compass-env.sh)
-          .evergreen/compass_package.sh
+          cd packages/compass && npm run prepackage-compass
     - command: shell.exec
       params:
         working_dir: src
@@ -443,6 +439,29 @@ functions:
           set -e
 
           .evergreen/create-sbom.sh
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        env:
+          <<: *compass-env
+          DEBUG: ${debug}
+          npm_config_loglevel: ${npm_loglevel}
+          COMPASS_DISTRIBUTION: ${compass_distribution}
+          SIGNING_SERVER_HOSTNAME: ${SIGNING_SERVER_HOSTNAME}
+          SIGNING_SERVER_PRIVATE_KEY: ${SIGNING_SERVER_PRIVATE_KEY}
+          SIGNING_SERVER_PRIVATE_KEY_CYGPATH: ${SIGNING_SERVER_PRIVATE_KEY_CYGPATH}
+          SIGNING_SERVER_USERNAME: ${SIGNING_SERVER_USERNAME}
+          SIGNING_SERVER_PORT: ${SIGNING_SERVER_PORT}
+          GITHUB_PR_NUMBER: ${github_pr_number}
+          PAPERTRAIL_KEY_ID: ${papertrail_key_id}
+          PAPERTRAIL_SECRET_KEY: ${papertrail_secret_key}
+          COMPASS_WAS_COMPILED_AND_HAS_SBOM: '1'
+        script: |
+          set -e
+          # Load environment variables
+          eval $(.evergreen/print-compass-env.sh)
+          .evergreen/compass_package.sh
 
   get_first_party_dependency_list:
     - command: s3.get

.snyk

@@ -4,14 +4,21 @@ version: v1.25.0
 ignore:
   SNYK-JS-AGGRIDCOMMUNITY-1932011:
     - '*':
-        reason: Not applicable as we do not use a valueFormatter or cellRenderer function
-        expires: 2024-07-17T18:27:24.346Z
+        reason: >-
+          Not applicable as we do not use a valueFormatter or cellRenderer
+          function
+        expires: 2024-08-17T18:27:24.346Z
         created: 2024-01-18T18:27:24.353Z
   SNYK-JS-AXIOS-6032459:
     - '*':
         reason: Not applicable to axios usage inside node-analytics package
         expires: 2024-10-30T10:18:43.435Z
         created: 2023-10-30T10:18:43.435Z
+  SNYK-JS-ELECTRON-7443355:
+    - '*':
+        reason: Not applicable as we do not open / allow opening random webpages in our Electron app.
+        expires: 2024-07-25T12:41:36.996Z
+        created: 2024-07-19T12:41:36.999Z
 # patches apply the minimum changes required to fix a vulnerability
 patch:
   'npm:ms:20170412':

CONTRIBUTING.md

@@ -3,10 +3,10 @@
 
 ## Getting Started
 
-You'll need node `^16` and npm `^8` installed on your machine to work with the repository locally.
+You'll need node `^18` and npm `^10` installed on your machine to work with the repository locally.
 After your environment is ready, navigate to the repository and run `npm run bootstrap`, this will install dependencies and will compile all packages.
 
-After bootstrap is finished, you should be able to run `npm run start` and see Compass application running locally.
+After bootstrap is finished, you should be able to run `npm run start` and see Compass application running locally. Alternatively you can start a web version of the app by running `npm run start-web`.
 
 Compass uses a monorepo is powered by [`npm workspaces`](https://docs.npmjs.com/cli/v7/using-npm/workspaces) and [`lerna`](https://github.com/lerna/lerna#readme), although not necessary, it might be helpful to have a high level understanding of those tools.
 
@@ -80,7 +80,7 @@ DEBUG=hadron* npm run package-compass
 To speed up the process you might want to disable creating installer for the application. To do that you can set `HADRON_SKIP_INSTALLER` environmental variable to `true` when running the script
 
 ```sh
-HADRON_SKIP_INSTALLER=true npm run test-package-compass
+HADRON_SKIP_INSTALLER=true npm run package-compass
 ```
 
 ### Publishing Packages