Skip to content

Commit c5feb5c

Browse files
github-actions[bot]github-actions[bot]
committed
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents 4d74d11 + 2dbe83b commit c5feb5c

File tree

142 files changed

+3498
-2220
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+3498
-2220
lines changed

‎.github/workflows/update-dependencies.yaml‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ jobs:
4444
name: Update ${{ matrix.group_name }} to latest
4545
runs-on: ubuntu-latest
4646
needs: configure_matrix
47+
env:
48+
UPDATE_BRANCH_NAME: ci/update-${{ matrix.group_name }}
4749
strategy:
4850
matrix:
4951
group_name: ${{ fromJSON(needs.configure_matrix.outputs.group_name) }}
@@ -77,12 +79,36 @@ jobs:
7779
- name: Run "update dependencies" script
7880
run: npx compass-scripts update-dependencies preset-${{ matrix.group_name }}
7981

82+
# Conditionally performing a sparse checkout of the existing branch to compare changes
83+
# and avoid the "create-pull-request" action force-pushing when changes aren't necessary.
84+
# This also allows us pushing commits to the update branch to fix any breaking changes
85+
# without risking these commits being overwritten by the action.
86+
- name: Check existence of an existing branch
87+
id: check-branch-exists
88+
run: |
89+
if git ls-remote --exit-code --heads origin ${{ env.UPDATE_BRANCH_NAME }}; then
90+
echo "branch_exists=true" >> "$GITHUB_OUTPUT"
91+
else
92+
echo "branch_exists=false" >> "$GITHUB_OUTPUT"
93+
fi
94+
95+
- name: Checkout existing branch
96+
if: steps.check-branch-exists.outputs.branch_exists == 'true'
97+
uses: actions/checkout@v4
98+
with:
99+
ref: ${{ env.UPDATE_BRANCH_NAME }}
100+
path: existing-branch-checkout
101+
sparse-checkout: |
102+
package-lock.json
103+
sparse-checkout-cone-mode: false
104+
80105
- name: Create Pull Request
106+
if: steps.check-branch-exists.outputs.branch_exists == 'false' || hashFiles('package-lock.json') != hashFiles('existing-branch-checkout/package-lock.json')
81107
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # 7.0.5
82108
with:
83109
token: ${{ steps.app-token.outputs.token }}
84110
commit-message: 'chore(deps): update ${{ matrix.group_name }} to latest'
85-
branch: ci/update-${{ matrix.group_name }}
111+
branch: ${{ env.UPDATE_BRANCH_NAME }}
86112
title: 'chore(deps): update ${{ matrix.group_name }} to latest'
87113
labels: |
88114
no-title-validation

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,7 @@ config/*/.npmrc
3535
.sbom
3636
.logs
3737
.evergreen/logs
38+
39+
# The update-dependencies workflow does a sparse checkout
40+
# and we don't want to include these files in the PRs it creates.
41+
existing-branch-checkout/

‎THIRD-PARTY-NOTICES.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
The following third-party software is used by and included in **Mongodb Compass**.
2-
This document was automatically generated on Sun Oct 26 2025.
2+
This document was automatically generated on Thu Oct 30 2025.
33

44
## List of dependencies
55

@@ -258,7 +258,7 @@ This document was automatically generated on Sun Oct 26 2025.
258258
| **[dunder-proto](#390fd69f2035b583e461890d5b0a3230f4adb33b042e6f0d1472dd911bc1de98)** | 1.0.1 | MIT |
259259
| **[ee-first](#e2746902c758ae8a6f91ffb9618cd53717f936cb33c6323e65b6b7b24f7ebefe)** | 1.1.1 | MIT |
260260
| **[electron-dl](#e97e034c7b93c63e7a433d75f6f1de3e0668764225ebbd61dbde8d1b55d6f3b7)** | 3.5.0 | MIT |
261-
| **[electron](#5ab6953bd8e5e74dfba0c41f7ec9f0b72edcac6d6e4752979f75db6e19cc6741)** | 37.6.1 | MIT |
261+
| **[electron](#eb2ce8a05be451e67886155fc66a2882e354ad1c0a3d945aaace02ba0caa5a91)** | 37.7.1 | MIT |
262262
| **[encodeurl](#177948a319ae0aeebbd65742c53c62b37c75ec1d021afa5a188d10a7ceae6623)** | 2.0.0 | MIT |
263263
| **[end-of-stream](#fadc10994f5fa767d06fb25cfff35fb17a895daf3bc3477c782907668ed16563)** | 1.4.4 | MIT |
264264
| **[ensure-error](#3b1eba5276d89414cef21a1007e85c4f1d6749bf57b300e082ab23975a41dbc9)** | 3.0.1 | MIT |
@@ -412,7 +412,7 @@ This document was automatically generated on Sun Oct 26 2025.
412412
| **[native-machine-id](#906056a6d58d5df99105901c8c819d7534e7035561494eadf8ab0b48d4e0c418)** | 0.1.2 | Apache-2.0 |
413413
| **[negotiator](#617fa350c7c0fe851efe2301be0dfe1e0a38808562f7dbd2e655d30b17730ccc)** | 1.0.0 | MIT |
414414
| **[netmask](#2bd5b8ff7fab9adace6c38d3fd32e7328484939fdd07836635b0155d0afc35b2)** | 2.0.2 | MIT |
415-
| **[node-abi](#76c525a30f238c836b5f73dfbdc1e491ec8b30dac7c560d7f97199919174e21b)** | 4.14.0 | MIT |
415+
| **[node-abi](#752e558d1459fb1410bb566afa71057c1c902a54c1e5b53c27152ca3ce18d694)** | 4.15.0 | MIT |
416416
| **[node-addon-api](#75c2a47526765afc024a6641ec7b1b37935dc672a211ebdd9773d74bc43a95b4)** | 6.1.0 | MIT |
417417
| **[node-cache](#7facc0b98aa570bf195800a761cbe85a8d5b639a49d16be0162f589f86ab6f4e)** | 5.1.2 | MIT |
418418
| **[node-domexception](#3c25065fd2bc1b6b56856e30ac5b8f34ddae33ca87b225854f8d855b0ccabfbe)** | 1.0.0 | MIT |
@@ -23440,9 +23440,9 @@ License files:
2344023440

2344123441
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2344223442

23443-
<a id="5ab6953bd8e5e74dfba0c41f7ec9f0b72edcac6d6e4752979f75db6e19cc6741"></a>
23443+
<a id="eb2ce8a05be451e67886155fc66a2882e354ad1c0a3d945aaace02ba0caa5a91"></a>
2344423444

23445-
### [electron](https://www.npmjs.com/package/electron) (version 37.6.1)
23445+
### [electron](https://www.npmjs.com/package/electron) (version 37.7.1)
2344623446

2344723447
License tags: MIT
2344823448

@@ -30207,9 +30207,9 @@ License files:
3020730207

3020830208
License tags: MIT
3020930209

30210-
<a id="76c525a30f238c836b5f73dfbdc1e491ec8b30dac7c560d7f97199919174e21b"></a>
30210+
<a id="752e558d1459fb1410bb566afa71057c1c902a54c1e5b53c27152ca3ce18d694"></a>
3021130211

30212-
### [node-abi](https://www.npmjs.com/package/node-abi) (version 4.14.0)
30212+
### [node-abi](https://www.npmjs.com/package/node-abi) (version 4.15.0)
3021330213

3021430214
License tags: MIT
3021530215

‎configs/testing-library-compass/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
"@testing-library/react": "^12.1.5",
6363
"@testing-library/react-hooks": "^7.0.2",
6464
"@testing-library/user-event": "^13.5.0",
65+
"mongodb-build-info": "^1.8.1",
6566
"mongodb-connection-string-url": "^3.0.1",
6667
"react": "^17.0.2",
6768
"react-redux": "^8.1.3",

‎configs/testing-library-compass/src/index.tsx‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import type {
3434
DataService,
3535
InstanceDetails,
3636
} from 'mongodb-data-service';
37+
import { identifyServerName } from 'mongodb-build-info';
3738
import Sinon from 'sinon';
3839
import React from 'react';
3940
import type {
@@ -175,8 +176,22 @@ export class MockDataService
175176
disconnect(): Promise<void> {
176177
return Promise.resolve();
177178
}
178-
instance(): Promise<InstanceDetails> {
179-
return Promise.resolve({
179+
async instance(): Promise<InstanceDetails> {
180+
const { connectionString } = this.connectionOptions;
181+
const serverName = await identifyServerName({
182+
connectionString,
183+
adminCommand: () =>
184+
Promise.reject(
185+
new Error(
186+
'MockDataService adminCommand: this is a mocked environment; no server commands available.'
187+
)
188+
),
189+
});
190+
const genuineMongoDB = {
191+
serverName,
192+
isGenuine: serverName === 'mongodb' || serverName === 'unknown',
193+
};
194+
return {
180195
auth: {
181196
user: null,
182197
roles: [],
@@ -188,10 +203,7 @@ export class MockDataService
188203
version: '100.0.0',
189204
},
190205
host: {},
191-
genuineMongoDB: {
192-
isGenuine: true,
193-
dbType: 'mongodb',
194-
},
206+
genuineMongoDB,
195207
dataLake: {
196208
isDataLake: false,
197209
version: null,
@@ -200,7 +212,7 @@ export class MockDataService
200212
isAtlas: false,
201213
isLocalAtlas: false,
202214
csfleMode: 'unavailable',
203-
});
215+
};
204216
}
205217
}
206218

‎configs/webpack-config-compass/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"email": "[email protected]"
1212
},
1313
"homepage": "https://github.com/mongodb-js/compass",
14-
"version": "1.10.10",
14+
"version": "1.10.11",
1515
"repository": {
1616
"type": "git",
1717
"url": "https://github.com/mongodb-js/compass.git"
@@ -65,12 +65,12 @@
6565
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
6666
"babel-loader": "^8.2.5",
6767
"babel-plugin-istanbul": "^5.2.0",
68-
"browserslist": "^4.26.3",
68+
"browserslist": "^4.27.0",
6969
"chalk": "^4.1.2",
7070
"cli-progress": "^3.9.1",
7171
"core-js": "^3.17.3",
7272
"css-loader": "^4.3.0",
73-
"electron": "^37.6.1",
73+
"electron": "^37.7.1",
7474
"html-webpack-plugin": "^5.6.0",
7575
"less": "^3.13.1",
7676
"less-loader": "^10.0.1",

‎docs/tracking-plan.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
> the tracking plan for the specific Compass version you can use the following
77
> URL: `https://github.com/mongodb-js/compass/blob/<compass version>/docs/tracking-plan.md`
88
9-
Generated on Sun, Oct 26, 2025
9+
Generated on Thu, Oct 30, 2025
1010

1111
## Table of Contents
1212

0 commit comments

Comments
 (0)