From 6d471e476c1fa5f1cc4a90bf3532da6ba2651c85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 May 2025 04:30:20 +0000 Subject: [PATCH 1/2] chore(deps): bump the compass group with 3 updates Bumps the compass group with 3 updates: [@mongodb-js/compass-components](https://github.com/mongodb-js/compass), [@mongodb-js/connection-form](https://github.com/mongodb-js/compass) and [@mongodb-js/compass-editor](https://github.com/mongodb-js/compass). Updates `@mongodb-js/compass-components` from 1.34.8 to 1.35.0 - [Release notes](https://github.com/mongodb-js/compass/releases) - [Commits](https://github.com/mongodb-js/compass/compare/@mongodb-js/compass-components@1.34.8...@mongodb-js/compass-components@1.35.0) Updates `@mongodb-js/connection-form` from 1.47.8 to 1.48.0 - [Release notes](https://github.com/mongodb-js/compass/releases) - [Commits](https://github.com/mongodb-js/compass/compare/@mongodb-js/connection-form@1.47.8...@mongodb-js/connection-form@1.48.0) Updates `@mongodb-js/compass-editor` from 0.36.8 to 0.37.0 - [Release notes](https://github.com/mongodb-js/compass/releases) - [Commits](https://github.com/mongodb-js/compass/compare/@mongodb-js/compass-editor@0.36.8...@mongodb-js/compass-editor@0.37.0) --- updated-dependencies: - dependency-name: "@mongodb-js/compass-components" dependency-version: 1.35.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: compass - dependency-name: "@mongodb-js/connection-form" dependency-version: 1.48.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: compass - dependency-name: "@mongodb-js/compass-editor" dependency-version: 0.37.0 dependency-type: indirect update-type: version-update:semver-minor dependency-group: compass ... Signed-off-by: dependabot[bot] --- package-lock.json | 42 +++++++++++++++++++++--------------------- package.json | 4 ++-- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index a9dfbf40..07e1b3a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,8 +12,8 @@ "@babel/core": "^7.25.8", "@babel/parser": "^7.25.8", "@babel/traverse": "^7.25.7", - "@mongodb-js/compass-components": "^1.34.8", - "@mongodb-js/connection-form": "1.47.8", + "@mongodb-js/compass-components": "^1.35.1", + "@mongodb-js/connection-form": "1.48.1", "@mongodb-js/connection-info": "^0.11.9", "@mongodb-js/mongodb-constants": "^0.11.1", "@mongosh/browser-runtime-electron": "^3.10.1", @@ -5045,9 +5045,9 @@ } }, "node_modules/@codemirror/view": { - "version": "6.36.5", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.5.tgz", - "integrity": "sha512-cd+FZEUlu3GQCYnguYm3EkhJ8KJVisqqUsCOKedBoAt/d9c76JUUap6U0UrpElln5k6VyrEOYliMuDAKIeDQLg==", + "version": "6.36.6", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.6.tgz", + "integrity": "sha512-uxugGLet+Nzp0Jcit8Hn3LypM8ioMLKTsdf8FRoT3HWvZtb9GhaWMe0Cc15rz90Ljab4YFJiAulmIVB74OY0IQ==", "license": "MIT", "dependencies": { "@codemirror/state": "^6.5.0", @@ -7286,9 +7286,9 @@ } }, "node_modules/@lezer/javascript": { - "version": "1.4.21", - "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.21.tgz", - "integrity": "sha512-lL+1fcuxWYPURMM/oFZLEDm0XuLN128QPV+VuGtKpeaOGdcl9F2LYC3nh1S9LkPqx9M0mndZFdXCipNAZpzIkQ==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.5.1.tgz", + "integrity": "sha512-ATOImjeVJuvgm3JQ/bpo2Tmv55HSScE2MTPnKRMRIPx2cLhHGyX2VnqpHhtIV1tVzIjZDbcWQm+NCTF40ggZVw==", "license": "MIT", "dependencies": { "@lezer/common": "^1.2.0", @@ -7377,9 +7377,9 @@ "license": "BSD-2-Clause" }, "node_modules/@mongodb-js/compass-components": { - "version": "1.34.8", - "resolved": "https://registry.npmjs.org/@mongodb-js/compass-components/-/compass-components-1.34.8.tgz", - "integrity": "sha512-Yibm3H6mwyjvwhbcWey8DWQC1WAYGN/H5gjC7ppTdJ8bWfcHqbuDzbOql4x6WtmRll+FB+aw3HoRvt+0XuRamQ==", + "version": "1.35.1", + "resolved": "https://registry.npmjs.org/@mongodb-js/compass-components/-/compass-components-1.35.1.tgz", + "integrity": "sha512-0/7c0+HPOYiqZcexGTQwJhwONV/BUFucKvpy/fA555qLqGP2s8kPN2tbRGJ4bpuZkm5e89NpdB9CcqDVFm2ZKw==", "license": "SSPL", "dependencies": { "@dnd-kit/core": "^6.0.7", @@ -7462,9 +7462,9 @@ } }, "node_modules/@mongodb-js/compass-editor": { - "version": "0.36.8", - "resolved": "https://registry.npmjs.org/@mongodb-js/compass-editor/-/compass-editor-0.36.8.tgz", - "integrity": "sha512-IMYehrScjKWRsIUf9oaCd6RehpyMWyco/D61TAe4vqNH0XiQc9q/SmLVidmTI8H7f0SmLLfCFRo0VjrKVnkf/A==", + "version": "0.37.1", + "resolved": "https://registry.npmjs.org/@mongodb-js/compass-editor/-/compass-editor-0.37.1.tgz", + "integrity": "sha512-241rfjZxYGO0bM5/71qfYNJuYAa9PQi4f7qhHTaKgI9WA4uOYymCf4mSQyt7qXcjEvnqTWwdhuZp2kTfi/HtaA==", "license": "SSPL", "dependencies": { "@codemirror/autocomplete": "^6.17.0", @@ -7476,7 +7476,7 @@ "@codemirror/state": "^6.1.4", "@codemirror/view": "^6.7.1", "@lezer/highlight": "^1.2.0", - "@mongodb-js/compass-components": "^1.34.8", + "@mongodb-js/compass-components": "^1.35.1", "@mongodb-js/mongodb-constants": "^0.11.0", "mongodb-query-parser": "^4.3.0", "polished": "^4.2.2", @@ -7509,14 +7509,14 @@ } }, "node_modules/@mongodb-js/connection-form": { - "version": "1.47.8", - "resolved": "https://registry.npmjs.org/@mongodb-js/connection-form/-/connection-form-1.47.8.tgz", - "integrity": "sha512-jIoEHCuyozvC6U6fthf7K9DcYVKzjgjcKNEO9ZkMeV1mCJ7yXh89TIZuoD0k4CqqYQOi2hFPhJZvC6ukdY1AqA==", + "version": "1.48.1", + "resolved": "https://registry.npmjs.org/@mongodb-js/connection-form/-/connection-form-1.48.1.tgz", + "integrity": "sha512-KLqOcITIrycvwjDjhcFXt7y2C0fDnlV7Kb0kka+WrBoXxkV91yyWCGUtZVBcY8OCOrNN4A4dZRgXbv6RCNspsw==", "license": "SSPL", "dependencies": { - "@mongodb-js/compass-components": "^1.34.8", - "@mongodb-js/compass-editor": "^0.36.8", - "@mongodb-js/connection-info": "^0.11.8", + "@mongodb-js/compass-components": "^1.35.1", + "@mongodb-js/compass-editor": "^0.37.1", + "@mongodb-js/connection-info": "^0.11.9", "@mongodb-js/shell-bson-parser": "^1.2.0", "lodash": "^4.17.21", "mongodb": "^6.14.1", diff --git a/package.json b/package.json index 5db613c3..cca0dfa5 100644 --- a/package.json +++ b/package.json @@ -1315,8 +1315,8 @@ "@babel/core": "^7.25.8", "@babel/parser": "^7.25.8", "@babel/traverse": "^7.25.7", - "@mongodb-js/compass-components": "^1.34.8", - "@mongodb-js/connection-form": "1.47.8", + "@mongodb-js/compass-components": "^1.35.1", + "@mongodb-js/connection-form": "1.48.1", "@mongodb-js/connection-info": "^0.11.9", "@mongodb-js/mongodb-constants": "^0.11.1", "@mongosh/browser-runtime-electron": "^3.10.1", From 8f2a511ef1c2b7f0c0f5c83ae6bd2387bc3661e4 Mon Sep 17 00:00:00 2001 From: gagik Date: Mon, 5 May 2025 14:42:09 +0200 Subject: [PATCH 2/2] fix: adjust connection ID --- src/connectionController.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/connectionController.ts b/src/connectionController.ts index 06ef42e0..a5b071f8 100644 --- a/src/connectionController.ts +++ b/src/connectionController.ts @@ -480,12 +480,7 @@ export default class ConnectionController { const connectionOptions = adjustConnectionOptionsBeforeConnect({ connectionOptions: connectionInfo.connectionOptions, - connectionInfo: { - id: connectionId, - isAtlas: getBuildInfo.isAtlas( - connectionInfo.connectionOptions.connectionString - ), - }, + connectionId, defaultAppName: `${packageJSON.name} ${packageJSON.version}`, notifyDeviceFlow, preferences: {