Merge branch 'main' into electron-update

Author: mabaasit

.evergreen.yml

@@ -1,5 +1,6 @@
 stepback: false
 exec_timeout_secs: 5400
+foliage_should_block_merges: false
 ignore:
   - docs/**/*.md
   - AUTHORS

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

@@ -290,6 +290,12 @@ buildvariants:
     <% } %>
     <% } %>
 
+  - name: test-can-bundle-compass-web
+    display_name: Test Can Bundle Compass Web
+    run_on: ubuntu2004-large
+    tasks:
+      - name: test-can-bundle-compass-web
+
   - name: test-web-sandbox-atlas-cloud
     display_name: Test Web Sandbox (w/ Atlas Cloud login)
     run_on: ubuntu2004-large
@@ -557,6 +563,19 @@ tasks:
   <% } %>
 <% } %>
 
+  - name: test-can-bundle-compass-web
+    tags:
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: compile-compass-web
+        vars:
+          debug: 'compass*,electron*,hadron*,mongo*'
+
   - name: test-web-sandbox-atlas-cloud
     tags:
       - required-for-publish

.evergreen/buildvariants-and-tasks.yml

@@ -280,6 +280,11 @@ buildvariants:
       - name: test-web-sandbox-firefox-1
       - name: test-web-sandbox-firefox-2
       - name: test-web-sandbox-firefox-3
+  - name: test-can-bundle-compass-web
+    display_name: Test Can Bundle Compass Web
+    run_on: ubuntu2004-large
+    tasks:
+      - name: test-can-bundle-compass-web
   - name: test-web-sandbox-atlas-cloud
     display_name: Test Web Sandbox (w/ Atlas Cloud login)
     run_on: ubuntu2004-large
@@ -1552,6 +1557,18 @@ tasks:
           e2e_test_groups: 3
           e2e_test_group: 3
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-can-bundle-compass-web
+    tags:
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: compile-compass-web
+        vars:
+          debug: compass*,electron*,hadron*,mongo*
   - name: test-web-sandbox-atlas-cloud
     tags:
       - required-for-publish

.evergreen/functions.yml

@@ -688,6 +688,22 @@ functions:
             npm run --workspace @mongodb-js/compass-smoke-tests start -- dispatch --ref ${branch_name}
           fi
 
+  # Creating the webpack compass-web bundle ensures
+  # that the bundle size does not grow too large for.
+  # The webpack compile fails when it exceeds the size limit.
+  compile-compass-web:
+    - command: shell.exec
+      # Fail the task if it's idle for 10 mins
+      timeout_secs: 600
+      params:
+        working_dir: src
+        shell: bash
+        env:
+          DEBUG: ${debug|}
+        script: |
+          set -e
+          npm run --workspace @mongodb-js/compass-web compile
+
   test-web-sandbox:
     - command: shell.exec
       # Fail the task if it's idle for 10 mins

.snyk

@@ -75,6 +75,14 @@ ignore:
           expecting to be able to update to electron v33 (or later) soon
         expires: 2025-06-20T04:40:36.098Z
         created: 2025-03-21T04:40:36.107Z
+  SNYK-JS-ELECTRON-10245168:
+    - '*':
+        reason: >-
+          Not applicable: this requires attacker to load hand crafted html
+          inside the app. Putting on a short expiration time as we're
+          expecting to be able to update to electron v36 soon
+        expires: 2025-06-27T10:50:52.405Z
+        created: 2025-05-28T10:50:52.409Z
 # patches apply the minimum changes required to fix a vulnerability
 patch:
   'npm:ms:20170412':

THIRD-PARTY-NOTICES.md

@@ -6,7 +6,7 @@
 > the tracking plan for the specific Compass version you can use the following
 > URL: `https://github.com/mongodb-js/compass/blob/<compass version>/docs/tracking-plan.md`
 
-Generated on Sun, May 25, 2025
+Generated on Sun, Jun 1, 2025
 
 ## Table of Contents
 
@@ -110,6 +110,11 @@ Generated on Sun, May 25, 2025
 
 ### Gen AI
 
+- [AI Opt In Modal Shown](#event--AiOptInModalShownEvent)
+- [AI Opt In Modal Dismissed](#event--AiOptInModalDismissedEvent)
+- [AI Sign In Modal Shown](#event--AiSignInModalShownEvent)
+- [AI Sign In Modal Dismissed](#event--AiSignInModalDismissedEvent)
+- [AI Generate Query Clicked](#event--AiGenerateQueryClickedEvent)
 - [AI Prompt Submitted](#event--AiPromptSubmittedEvent)
 - [AI Query Feedback](#event--AiQueryFeedbackEvent)
 - [AI Response Failed](#event--AiResponseFailedEvent)
@@ -154,6 +159,9 @@ Generated on Sun, May 25, 2025
 - [Secret Storage Not Available](#event--SecretStorageNotAvailableEvent)
 - [Experiment Viewed](#event--ExperimentViewedEvent)
 - [Create Index Button Clicked](#event--CreateIndexButtonClickedEvent)
+- [Error parsing query](#event--CreateIndexErrorParsingQueryEvent)
+- [Error generating covered queries](#event--CreateIndexErrorGettingCoveredQueriesEvent)
+- [UUID Encountered](#event--UUIDEncounteredEvent)
 
 ### Performance Tab
 
@@ -1290,6 +1298,42 @@ the query results.
 
 ## Gen AI
 
+<a name="event--AiOptInModalShownEvent"></a>
+
+### AI Opt In Modal Shown
+
+This event is fired when the AI Opt-In Modal is shown to the user.
+
+<a name="event--AiOptInModalDismissedEvent"></a>
+
+### AI Opt In Modal Dismissed
+
+This event is fired when the AI Opt-In Modal is dismissed by the user.
+
+<a name="event--AiSignInModalShownEvent"></a>
+
+### AI Sign In Modal Shown
+
+This event is fired when the AI Sign-In Modal is shown to the user.
+
+<a name="event--AiSignInModalDismissedEvent"></a>
+
+### AI Sign In Modal Dismissed
+
+This event is fired when the AI Sign-In Modal is dismissed by the user.
+
+<a name="event--AiGenerateQueryClickedEvent"></a>
+
+### AI Generate Query Clicked
+
+This event is fired when a user clicks the Generate Query / Aggregation entry point.
+
+**Properties**:
+
+- **type** (required): `"aggregation" | "query"`
+  - The type of query being generated.
+- **is_compass_web** (optional): `true | undefined`
+
 <a name="event--AiPromptSubmittedEvent"></a>
 
 ### AI Prompt Submitted
@@ -1802,6 +1846,34 @@ a system that doesn't offer a suitable secret storage backend.
 - **context** (required): `"Create Index Modal"`
 - **is_compass_web** (optional): `true | undefined`
 
+<a name="event--CreateIndexErrorParsingQueryEvent"></a>
+
+### Error parsing query
+
+**Properties**:
+
+- **context** (required): `"Create Index Modal"`
+- **is_compass_web** (optional): `true | undefined`
+
+<a name="event--CreateIndexErrorGettingCoveredQueriesEvent"></a>
+
+### Error generating covered queries
+
+**Properties**:
+
+- **context** (required): `"Create Index Modal"`
+- **is_compass_web** (optional): `true | undefined`
+
+<a name="event--UUIDEncounteredEvent"></a>
+
+### UUID Encountered
+
+**Properties**:
+
+- **subtype** (required): `3 | 4`
+- **count** (required): `number`
+- **is_compass_web** (optional): `true | undefined`
+
 ## Performance Tab
 
 <a name="event--CurrentOpShowOperationDetailsEvent"></a>