diff --git a/package-lock.json b/package-lock.json index 14155662c..8f351a4a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,9 +12,9 @@ "@babel/core": "^7.24.6", "@babel/parser": "^7.24.6", "@babel/traverse": "^7.24.6", - "@mongodb-js/compass-components": "^1.25.0", - "@mongodb-js/connection-form": "^1.22.2", - "@mongodb-js/connection-info": "^0.1.2", + "@mongodb-js/compass-components": "^1.30.0", + "@mongodb-js/connection-form": "^1.41.1", + "@mongodb-js/connection-info": "^0.7.0", "@mongodb-js/mongodb-constants": "^0.10.2", "@mongosh/browser-runtime-electron": "^2.3.0", "@mongosh/i18n": "^2.3.0", @@ -1752,9 +1752,10 @@ } }, "node_modules/@codemirror/autocomplete": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.12.0.tgz", - "integrity": "sha512-r4IjdYFthwbCQyvqnSlx0WBHRHi8nBvU+WjJxFUij81qsBfhNudf/XKKmmC2j3m0LaOYUQTf3qiEK1J8lO1sdg==", + "version": "6.18.1", + "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.1.tgz", + "integrity": "sha512-iWHdj/B1ethnHRTwZj+C1obmmuCzquH29EbcKr0qIjA9NfDeBDJ7vs+WOHsFeLeflE4o+dHfYndJloMKHUkWUA==", + "license": "MIT", "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", @@ -1769,20 +1770,22 @@ } }, "node_modules/@codemirror/commands": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.3.3.tgz", - "integrity": "sha512-dO4hcF0fGT9tu1Pj1D2PvGvxjeGkbC6RGcZw6Qs74TH+Ed1gw98jmUgd2axWvIZEqTeTuFrg1lEB1KV6cK9h1A==", + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.2.tgz", + "integrity": "sha512-Fq7eWOl1Rcbrfn6jD8FPCj9Auaxdm5nIK5RYOeW7ughnd/rY5AmPg6b+CfsG39ZHdwiwe8lde3q8uR7CF5S0yQ==", + "license": "MIT", "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.4.0", - "@codemirror/view": "^6.0.0", + "@codemirror/view": "^6.27.0", "@lezer/common": "^1.1.0" } }, "node_modules/@codemirror/lang-javascript": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.1.tgz", - "integrity": "sha512-jlFOXTejVyiQCW3EQwvKH0m99bUYIw40oPmFjSX2VS78yzfe0HELZ+NEo9Yfo1MkGRpGlj3Gnu4rdxV1EnAs5A==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.2.tgz", + "integrity": "sha512-VGQfY+FCc285AhWuwjYxQyUQcYurWlxdKYT4bqwr3Twnd5wP5WSeu52t4tvvuWmljT4EmgEgZCqSieokhtY8hg==", + "license": "MIT", "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", @@ -1797,15 +1800,17 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/@codemirror/lang-json/-/lang-json-6.0.1.tgz", "integrity": "sha512-+T1flHdgpqDDlJZ2Lkil/rLiRy684WMLc74xUnjJH48GQdfJo/pudlTRreZmKwzP8/tGdKf83wlbAdOCzlJOGQ==", + "license": "MIT", "dependencies": { "@codemirror/language": "^6.0.0", "@lezer/json": "^1.0.0" } }, "node_modules/@codemirror/language": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.0.tgz", - "integrity": "sha512-2vaNn9aPGCRFKWcHPFksctzJ8yS5p7YoaT+jHpc0UGKzNuAIx4qy6R5wiqbP+heEEdyaABA582mNqSHzSoYdmg==", + "version": "6.10.3", + "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.3.tgz", + "integrity": "sha512-kDqEU5sCP55Oabl6E7m5N+vZRoc0iWqgDVhEKifcHzPzjqCegcO4amfrYVL9PmPZpl4G0yjkpTpUO/Ui8CzO8A==", + "license": "MIT", "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.23.0", @@ -1816,9 +1821,10 @@ } }, "node_modules/@codemirror/lint": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.4.2.tgz", - "integrity": "sha512-wzRkluWb1ptPKdzlsrbwwjYCPLgzU6N88YBAmlZi8WFyuiEduSd05MnJYNogzyc8rPK7pj6m95ptUApc8sHKVA==", + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.2.tgz", + "integrity": "sha512-PDFG5DjHxSEjOXk9TQYYVjZDqlZTFaDBfhQixHnQOEVDDNHUbEh/hstAjcQJaA6FQdZTD1hquXTK0rVBLADR1g==", + "license": "MIT", "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", @@ -1826,14 +1832,16 @@ } }, "node_modules/@codemirror/state": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.0.tgz", - "integrity": "sha512-hm8XshYj5Fo30Bb922QX9hXB/bxOAVH+qaqHBzw5TKa72vOeslyGwd4X8M0c1dJ9JqxlaMceOQ8RsL9tC7gU0A==" + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz", + "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==", + "license": "MIT" }, "node_modules/@codemirror/view": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.23.0.tgz", - "integrity": "sha512-/51px9N4uW8NpuWkyUX+iam5+PM6io2fm+QmRnzwqBy5v/pwGg9T0kILFtYeum8hjuvENtgsGNKluOfqIICmeQ==", + "version": "6.34.1", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.34.1.tgz", + "integrity": "sha512-t1zK/l9UiRqwUNPm+pdIT0qzJlzuVckbTEMVNFhfWkGiBQClstzg+78vedCvLSX0xJEZ6lwZbPpnljL7L6iwMQ==", + "license": "MIT", "dependencies": { "@codemirror/state": "^6.4.0", "style-mod": "^4.1.0", @@ -3554,23 +3562,27 @@ "integrity": "sha512-Tr2TmpS0YFJ3hGNbVWQpeseJRo4kTrVumVlZ4aF4hId1JYDzF0TU5JJO40v+brhbgnKsyBu7+Rvz6ExY1NcKew==" }, "node_modules/@lezer/common": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.0.tgz", - "integrity": "sha512-Wmvlm4q6tRpwiy20TnB3yyLTZim38Tkc50dPY8biQRwqE+ati/wD84rm3N15hikvdT4uSg9phs9ubjvcLmkpKg==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.1.tgz", + "integrity": "sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ==", + "license": "MIT" }, "node_modules/@lezer/highlight": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.0.tgz", - "integrity": "sha512-WrS5Mw51sGrpqjlh3d4/fOwpEV2Hd3YOkp9DBt4k8XZQcoTHZFB7sx030A6OcahF4J1nDQAa3jXlTVVYH50IFA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.1.tgz", + "integrity": "sha512-Z5duk4RN/3zuVO7Jq0pGLJ3qynpxUVsh7IbUbGj88+uV2ApSAn6kWg2au3iJb+0Zi7kKtqffIESgNcRXWZWmSA==", + "license": "MIT", "dependencies": { "@lezer/common": "^1.0.0" } }, "node_modules/@lezer/javascript": { - "version": "1.4.12", - "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.12.tgz", - "integrity": "sha512-kwO5MftUiyfKBcECMEDc4HYnc10JME9kTJNPVoCXqJj/Y+ASWF0rgstORi3BThlQI6SoPSshrK5TjuiLFnr29A==", + "version": "1.4.18", + "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.18.tgz", + "integrity": "sha512-Y8BeHOt4LtcxJgXwadtfSeWPrh0XzklcCHnCVT+vOsxqH4gWmunP2ykX+VVOlM/dusyVyiNfG3lv0f10UK+mgA==", + "license": "MIT", "dependencies": { + "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.1.3", "@lezer/lr": "^1.3.0" } @@ -3579,6 +3591,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/@lezer/json/-/json-1.0.2.tgz", "integrity": "sha512-xHT2P4S5eeCYECyKNPhr4cbEL9tc8w83SPwRC373o9uEdrvGKTZoJVAGxpOsZckMlEh9W23Pc72ew918RWQOBQ==", + "license": "MIT", "dependencies": { "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.0.0", @@ -3586,9 +3599,10 @@ } }, "node_modules/@lezer/lr": { - "version": "1.3.14", - "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.14.tgz", - "integrity": "sha512-z5mY4LStlA3yL7aHT/rqgG614cfcvklS+8oFRFBYrs4YaWLJyKKM4+nN6KopToX0o9Hj6zmH6M5kinOYuy06ug==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.2.tgz", + "integrity": "sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==", + "license": "MIT", "dependencies": { "@lezer/common": "^1.0.0" } @@ -3663,9 +3677,10 @@ } }, "node_modules/@mongodb-js/compass-components": { - "version": "1.26.0", - "resolved": "https://registry.npmjs.org/@mongodb-js/compass-components/-/compass-components-1.26.0.tgz", - "integrity": "sha512-YiWQkAmLEOH4z5vcoraLF3x9B0MYDJmOGYkWUeVzBXmbtkDNI+Y4tkAV0uFr8+PkkGglH1jmOso81O6Op3A0IQ==", + "version": "1.30.0", + "resolved": "https://registry.npmjs.org/@mongodb-js/compass-components/-/compass-components-1.30.0.tgz", + "integrity": "sha512-TDXQ/8PfcvLcvMu+X5g0ADm48kK3Fv90FXI+9zT+2TwDcpnp3XsaawnfqckGZfKtF5st0568qFx6fmjQCutG4A==", + "license": "SSPL", "dependencies": { "@dnd-kit/core": "^6.0.7", "@dnd-kit/sortable": "^7.0.2", @@ -3676,7 +3691,7 @@ "@leafygreen-ui/card": "^10.0.6", "@leafygreen-ui/checkbox": "^12.1.1", "@leafygreen-ui/code": "^14.3.1", - "@leafygreen-ui/confirmation-modal": "^5.0.11", + "@leafygreen-ui/confirmation-modal": "^5.2.0", "@leafygreen-ui/emotion": "^4.0.7", "@leafygreen-ui/guide-cue": "^5.0.6", "@leafygreen-ui/hooks": "^8.1.2", @@ -3686,7 +3701,7 @@ "@leafygreen-ui/inline-definition": "^6.0.14", "@leafygreen-ui/leafygreen-provider": "^3.1.11", "@leafygreen-ui/lib": "^13.2.1", - "@leafygreen-ui/logo": "^9.0.1", + "@leafygreen-ui/logo": "^9.1.1", "@leafygreen-ui/marketing-modal": "^4.2.1", "@leafygreen-ui/menu": "^23.0.2", "@leafygreen-ui/modal": "^16.0.6", @@ -3707,16 +3722,14 @@ "@leafygreen-ui/toast": "^6.1.23", "@leafygreen-ui/toggle": "^10.0.19", "@leafygreen-ui/tokens": "^2.5.1", - "@leafygreen-ui/tooltip": "^11.0.2", + "@leafygreen-ui/tooltip": "^11.1.0", "@leafygreen-ui/typography": "^18.2.3", "@react-aria/interactions": "^3.9.1", - "@react-aria/tooltip": "^3.2.1", "@react-aria/utils": "^3.13.1", "@react-aria/visually-hidden": "^3.3.1", - "@react-stately/tooltip": "^3.0.5", "bson": "^6.7.0", "focus-trap-react": "^9.0.2", - "hadron-document": "^8.5.4", + "hadron-document": "^8.6.3", "hadron-type-checker": "^7.2.2", "is-electron-renderer": "^2.0.1", "lodash": "^4.17.21", @@ -3725,15 +3738,17 @@ "react": "^17.0.2", "react-hotkeys-hook": "^4.3.7", "react-intersection-observer": "^8.34.0", + "react-virtualized-auto-sizer": "^1.0.6", "react-window": "^1.8.6" } }, "node_modules/@mongodb-js/compass-editor": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@mongodb-js/compass-editor/-/compass-editor-0.20.2.tgz", - "integrity": "sha512-liiP6yrvpLSqpgkJ73KzkpbUIU7/CiU78Ldl381UbFkFjclq+pe6DXMRXwvCdBhcu+l1DoIPMFDz2ql93e6/4Q==", + "version": "0.31.0", + "resolved": "https://registry.npmjs.org/@mongodb-js/compass-editor/-/compass-editor-0.31.0.tgz", + "integrity": "sha512-0O5xIp42Bcq3emTHOQoKNUIeq9Kt+7aLW9IyquUO4ZyM5e4Ooo3Jcor2UsH2dZ7a5sqmyqXfBqkIap8EhNPvxQ==", + "license": "SSPL", "dependencies": { - "@codemirror/autocomplete": "^6.4.0", + "@codemirror/autocomplete": "^6.17.0", "@codemirror/commands": "^6.1.2", "@codemirror/lang-javascript": "^6.1.2", "@codemirror/lang-json": "^6.0.1", @@ -3741,170 +3756,80 @@ "@codemirror/lint": "^6.1.1", "@codemirror/state": "^6.1.4", "@codemirror/view": "^6.7.1", - "@lezer/highlight": "^1.1.3", - "@mongodb-js/compass-components": "^1.21.2", - "@mongodb-js/mongodb-constants": "^0.8.7", + "@lezer/highlight": "^1.2.0", + "@mongodb-js/compass-components": "^1.30.0", + "@mongodb-js/mongodb-constants": "^0.10.0", + "mongodb-query-parser": "^4.2.3", "polished": "^4.2.2", - "prettier": "^2.7.1" - }, - "peerDependencies": { + "prettier": "^2.7.1", "react": "^17.0.2" } }, - "node_modules/@mongodb-js/compass-editor/node_modules/@mongodb-js/mongodb-constants": { - "version": "0.8.10", - "resolved": "https://registry.npmjs.org/@mongodb-js/mongodb-constants/-/mongodb-constants-0.8.10.tgz", - "integrity": "sha512-tLXBNzLzk7KD0UsZaSpAg7bftgiDRVYFjc3zXT+828ENtg7TIvahkzJzoD7K6SwnFjPp8PZ/R36rpEL3zFq9yg==", - "dependencies": { - "semver": "^7.5.4" - } - }, "node_modules/@mongodb-js/compass-logging": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/@mongodb-js/compass-logging/-/compass-logging-1.4.4.tgz", - "integrity": "sha512-bZWRep/WBPG2Ao7PGgCmRq9L7R2+njh+RCxeWxHd7YXOjEHQYdfxOzFks7oogLWF0O6dvO856nINFMTj5xbqZw==", + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/@mongodb-js/compass-logging/-/compass-logging-1.4.8.tgz", + "integrity": "sha512-+mCyiKM24u6k+380/Gr59DksbW/1ago0g3BGZqR8KVFG4WVQ1UQWyan28xI81ofOuF9/Sz3qGmpG5T7lMxJOcQ==", "license": "SSPL", "dependencies": { "debug": "^4.3.4", - "hadron-app-registry": "^9.2.3", - "hadron-ipc": "^3.2.21", + "hadron-app-registry": "^9.2.7", + "hadron-ipc": "^3.2.23", "is-electron-renderer": "^2.0.1", "mongodb-log-writer": "^1.4.2", "react": "^17.0.2" } }, - "node_modules/@mongodb-js/compass-user-data": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/@mongodb-js/compass-user-data/-/compass-user-data-0.3.4.tgz", - "integrity": "sha512-nwdkVNVPlf7bD591ShMOW+qNHySp/v88z0ExKVS6NIsv30YTuMogZuSeIt2i3d+0ThEKVeR3Urp75diSWaysNg==", - "license": "SSPL", - "dependencies": { - "@mongodb-js/compass-logging": "^1.4.4", - "@mongodb-js/compass-utils": "^0.6.10", - "write-file-atomic": "^5.0.1", - "zod": "^3.22.3" - } - }, "node_modules/@mongodb-js/compass-utils": { - "version": "0.6.10", - "resolved": "https://registry.npmjs.org/@mongodb-js/compass-utils/-/compass-utils-0.6.10.tgz", - "integrity": "sha512-zokjRzVelu7xsLXnm26kQB2Vtbt3pJyInNQxrZPW9rqaOZTAZIWh/0Kr9bb3A4WdCSSiu3P4nty5OHMsSXGF4A==", + "version": "0.6.12", + "resolved": "https://registry.npmjs.org/@mongodb-js/compass-utils/-/compass-utils-0.6.12.tgz", + "integrity": "sha512-TIeNeta2aGmkIWlzqKwkPfXUMFAxpCG9ml68wYRrKHXvWmnnCot0/lJZdXyD9PQ3U41DnF6BfmguTeo3A/Us6Q==", "license": "SSPL", "dependencies": { "@electron/remote": "^2.1.2", - "electron": "^30.4.0" + "electron": "^30.5.1" } }, "node_modules/@mongodb-js/connection-form": { - "version": "1.22.2", - "resolved": "https://registry.npmjs.org/@mongodb-js/connection-form/-/connection-form-1.22.2.tgz", - "integrity": "sha512-bRQKka5LtYnQxuOfo08+tmFyAI12SkHE2EjlPzfFB8Zrn++O8BqfH88Nt4wXSMMnfH2gqWfsruFquMKmW+Favg==", - "dependencies": { - "@mongodb-js/compass-components": "^1.21.2", - "@mongodb-js/compass-editor": "^0.20.2", - "@mongodb-js/connection-info": "^0.1.2", - "@testing-library/react-hooks": "^7.0.2", + "version": "1.41.1", + "resolved": "https://registry.npmjs.org/@mongodb-js/connection-form/-/connection-form-1.41.1.tgz", + "integrity": "sha512-UycBZSvUG9kNz8vsbw9MqnkvKYyPrGAI5J92q1ZTj0GnvxxD5aRXoGZUyAVXrPuyH2WnUmlG73oFSvtQyQY1mA==", + "license": "SSPL", + "dependencies": { + "@mongodb-js/compass-components": "^1.30.0", + "@mongodb-js/compass-editor": "^0.31.0", + "@mongodb-js/connection-info": "^0.9.0", + "@mongodb-js/shell-bson-parser": "^1.1.2", "lodash": "^4.17.21", - "mongodb-build-info": "^1.7.0", - "mongodb-connection-string-url": "^2.6.0", - "mongodb-query-parser": "^4.0.2" - }, - "peerDependencies": { - "@mongodb-js/compass-components": "^1.21.2", - "@mongodb-js/compass-editor": "^0.20.2", + "mongodb": "^6.8.0", + "mongodb-build-info": "^1.7.2", + "mongodb-connection-string-url": "^3.0.1", + "mongodb-data-service": "^22.23.4", + "mongodb-query-parser": "^4.2.3", "react": "^17.0.2" } }, - "node_modules/@mongodb-js/connection-form/node_modules/@types/whatwg-url": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.2.tgz", - "integrity": "sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA==", - "dependencies": { - "@types/node": "*", - "@types/webidl-conversions": "*" - } - }, - "node_modules/@mongodb-js/connection-form/node_modules/mongodb-connection-string-url": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz", - "integrity": "sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ==", - "dependencies": { - "@types/whatwg-url": "^8.2.1", - "whatwg-url": "^11.0.0" - } - }, - "node_modules/@mongodb-js/connection-form/node_modules/tr46": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", - "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", - "dependencies": { - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@mongodb-js/connection-form/node_modules/whatwg-url": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", - "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", + "node_modules/@mongodb-js/connection-form/node_modules/@mongodb-js/connection-info": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@mongodb-js/connection-info/-/connection-info-0.9.0.tgz", + "integrity": "sha512-mB2JQVXPWafPQSofv9K6euZM398D+NFGGiKDyVoG357hdWf3Qq/Vm4MpP6me0QhLPo+xqMavTV6hNnidrfRdSw==", + "license": "SSPL", "dependencies": { - "tr46": "^3.0.0", - "webidl-conversions": "^7.0.0" - }, - "engines": { - "node": ">=12" + "lodash": "^4.17.21", + "mongodb": "^6.8.0", + "mongodb-connection-string-url": "^3.0.1", + "mongodb-data-service": "^22.23.4" } }, "node_modules/@mongodb-js/connection-info": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@mongodb-js/connection-info/-/connection-info-0.1.2.tgz", - "integrity": "sha512-SjEsSJ+j5X64xrLRU+g03lewIQCUNLB8UDZMFzEvEpWdRIYPf0lKEBmQ/NIrIyij/qaRzmw2avWFAqvxk3oUqQ==", + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@mongodb-js/connection-info/-/connection-info-0.7.0.tgz", + "integrity": "sha512-rSKGIufLovb4YJc9LQmZwdqxKVhsGpYcWTN65azax7TIsWIA0q+AkX/JHJo+Z0IryUeNng1aH2BAlSbyOozBQA==", + "license": "SSPL", "dependencies": { - "bson": "^6.2.0", "lodash": "^4.17.21", - "mongodb-connection-string-url": "^2.6.0" - } - }, - "node_modules/@mongodb-js/connection-info/node_modules/@types/whatwg-url": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.2.tgz", - "integrity": "sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA==", - "dependencies": { - "@types/node": "*", - "@types/webidl-conversions": "*" - } - }, - "node_modules/@mongodb-js/connection-info/node_modules/mongodb-connection-string-url": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz", - "integrity": "sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ==", - "dependencies": { - "@types/whatwg-url": "^8.2.1", - "whatwg-url": "^11.0.0" - } - }, - "node_modules/@mongodb-js/connection-info/node_modules/tr46": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", - "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", - "dependencies": { - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@mongodb-js/connection-info/node_modules/whatwg-url": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", - "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", - "dependencies": { - "tr46": "^3.0.0", - "webidl-conversions": "^7.0.0" - }, - "engines": { - "node": ">=12" + "mongodb": "^6.8.0", + "mongodb-connection-string-url": "^3.0.1", + "mongodb-data-service": "^22.23.2" } }, "node_modules/@mongodb-js/devtools-proxy-support": { @@ -4096,9 +4021,9 @@ } }, "node_modules/@mongodb-js/shell-bson-parser": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@mongodb-js/shell-bson-parser/-/shell-bson-parser-1.1.1.tgz", - "integrity": "sha512-MqFWxo3D1S4lpxPR+IOi0CahRQiwrCH0OiCYBA16Y5VojtWENs2Kq8hqxor2V3ZJhTHqpfJFs2858DAcAYdSeA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@mongodb-js/shell-bson-parser/-/shell-bson-parser-1.1.3.tgz", + "integrity": "sha512-WdUrL+m/JRk+e8ew2+jR62YRN4ICDRbaIZwHmM7tIdrbvA7LFDssFg9tmr7Wj3CO9ITY7XSlwq4ZVi/xNA0dtA==", "license": "Apache-2.0", "dependencies": { "acorn": "^8.1.0" @@ -4260,49 +4185,6 @@ "mongodb-client-encryption": "^6.1.0" } }, - "node_modules/@mongosh/service-provider-core/node_modules/mongodb-client-encryption": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-6.1.0.tgz", - "integrity": "sha512-Y3Hakre82nXD/pNDUzBjxfgwWSj5E1ar9ZLkqyXDfvirv4huHMbg8Q2qVO/TXlNJuf1B2bzrEDXsTqHKQSQLtw==", - "hasInstallScript": true, - "license": "Apache-2.0", - "optional": true, - "dependencies": { - "bindings": "^1.5.0", - "node-addon-api": "^4.3.0", - "prebuild-install": "^7.1.2" - }, - "engines": { - "node": ">=16.20.1" - } - }, - "node_modules/@mongosh/service-provider-core/node_modules/prebuild-install": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz", - "integrity": "sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==", - "license": "MIT", - "optional": true, - "dependencies": { - "detect-libc": "^2.0.0", - "expand-template": "^2.0.3", - "github-from-package": "0.0.0", - "minimist": "^1.2.3", - "mkdirp-classic": "^0.5.3", - "napi-build-utils": "^1.0.1", - "node-abi": "^3.3.0", - "pump": "^3.0.0", - "rc": "^1.2.7", - "simple-get": "^4.0.0", - "tar-fs": "^2.0.0", - "tunnel-agent": "^0.6.0" - }, - "bin": { - "prebuild-install": "bin.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@mongosh/service-provider-server": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-2.3.0.tgz", @@ -4365,49 +4247,6 @@ "node": ">= 16.20.1" } }, - "node_modules/@mongosh/service-provider-server/node_modules/mongodb-client-encryption": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-6.1.0.tgz", - "integrity": "sha512-Y3Hakre82nXD/pNDUzBjxfgwWSj5E1ar9ZLkqyXDfvirv4huHMbg8Q2qVO/TXlNJuf1B2bzrEDXsTqHKQSQLtw==", - "hasInstallScript": true, - "license": "Apache-2.0", - "optional": true, - "dependencies": { - "bindings": "^1.5.0", - "node-addon-api": "^4.3.0", - "prebuild-install": "^7.1.2" - }, - "engines": { - "node": ">=16.20.1" - } - }, - "node_modules/@mongosh/service-provider-server/node_modules/prebuild-install": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz", - "integrity": "sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==", - "license": "MIT", - "optional": true, - "dependencies": { - "detect-libc": "^2.0.0", - "expand-template": "^2.0.3", - "github-from-package": "0.0.0", - "minimist": "^1.2.3", - "mkdirp-classic": "^0.5.3", - "napi-build-utils": "^1.0.1", - "node-abi": "^3.3.0", - "pump": "^3.0.0", - "rc": "^1.2.7", - "simple-get": "^4.0.0", - "tar-fs": "^2.0.0", - "tunnel-agent": "^0.6.0" - }, - "bin": { - "prebuild-install": "bin.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@mongosh/shell-api": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-2.3.0.tgz", @@ -4724,21 +4563,6 @@ "resolved": "https://registry.npmjs.org/@reach/observe-rect/-/observe-rect-1.2.0.tgz", "integrity": "sha512-Ba7HmkFgfQxZqqaeIWWkNK0rEhpxVQHIoVyW1YDSkGsGIXzcaW4deC8B0pZrNSSyLTdIk7y+5olKt5+g0GmFIQ==" }, - "node_modules/@react-aria/focus": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/@react-aria/focus/-/focus-3.15.0.tgz", - "integrity": "sha512-nnxRyfqHuAjRwdQ4BpQyZPtGFKZmRU6cnaIb3pqWFCqEyJQensV7MA3TJ4Jhadq67cy1Ji5SYSlr1duBwjoYvw==", - "dependencies": { - "@react-aria/interactions": "^3.20.0", - "@react-aria/utils": "^3.22.0", - "@react-types/shared": "^3.22.0", - "@swc/helpers": "^0.5.0", - "clsx": "^1.1.1" - }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" - } - }, "node_modules/@react-aria/interactions": { "version": "3.20.0", "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.20.0.tgz", @@ -4767,23 +4591,6 @@ "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" } }, - "node_modules/@react-aria/tooltip": { - "version": "3.6.5", - "resolved": "https://registry.npmjs.org/@react-aria/tooltip/-/tooltip-3.6.5.tgz", - "integrity": "sha512-hXw4Z8nYLOWz3QOQ807wWZdvDwR3gofsmZhAehg2HPRwdRfCQK+1cjVKeUd9cKCAxs0Cay7dV0oUdilLbCQ2Gg==", - "dependencies": { - "@react-aria/focus": "^3.15.0", - "@react-aria/interactions": "^3.20.0", - "@react-aria/utils": "^3.22.0", - "@react-stately/tooltip": "^3.4.6", - "@react-types/shared": "^3.22.0", - "@react-types/tooltip": "^3.4.6", - "@swc/helpers": "^0.5.0" - }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" - } - }, "node_modules/@react-aria/utils": { "version": "3.22.0", "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.22.0.tgz", @@ -4813,32 +4620,6 @@ "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" } }, - "node_modules/@react-stately/overlays": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.4.tgz", - "integrity": "sha512-tHEaoAGpE9dSnsskqLPVKum59yGteoSqsniTopodM+miQozbpPlSjdiQnzGLroy5Afx5OZYClE616muNHUILXA==", - "dependencies": { - "@react-stately/utils": "^3.9.0", - "@react-types/overlays": "^3.8.4", - "@swc/helpers": "^0.5.0" - }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" - } - }, - "node_modules/@react-stately/tooltip": { - "version": "3.4.6", - "resolved": "https://registry.npmjs.org/@react-stately/tooltip/-/tooltip-3.4.6.tgz", - "integrity": "sha512-uL93bmsXf+OOgpKLPEKfpDH4z+MK2CuqlqVxx7rshN0vjWOSoezE5nzwgee90+RpDrLNNNWTNa7n+NkDRpI1jA==", - "dependencies": { - "@react-stately/overlays": "^3.6.4", - "@react-types/tooltip": "^3.4.6", - "@swc/helpers": "^0.5.0" - }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" - } - }, "node_modules/@react-stately/utils": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.9.0.tgz", @@ -4850,17 +4631,6 @@ "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" } }, - "node_modules/@react-types/overlays": { - "version": "3.8.4", - "resolved": "https://registry.npmjs.org/@react-types/overlays/-/overlays-3.8.4.tgz", - "integrity": "sha512-pfgNlQnbF6RB/R2oSxyqAP3Uzz0xE/k5q4n5gUeCDNLjY5qxFHGE8xniZZ503nZYw6VBa9XMN1efDOKQyeiO0w==", - "dependencies": { - "@react-types/shared": "^3.22.0" - }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" - } - }, "node_modules/@react-types/shared": { "version": "3.22.0", "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.22.0.tgz", @@ -4869,18 +4639,6 @@ "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" } }, - "node_modules/@react-types/tooltip": { - "version": "3.4.6", - "resolved": "https://registry.npmjs.org/@react-types/tooltip/-/tooltip-3.4.6.tgz", - "integrity": "sha512-RaZewdER7ZcsNL99RhVHs8kSLyzIBkwc0W6eFZrxST2MD9J5GzkVWRhIiqtFOd5U1aYnxdJ6woq72Ef+le6Vfw==", - "dependencies": { - "@react-types/overlays": "^3.8.4", - "@react-types/shared": "^3.22.0" - }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" - } - }, "node_modules/@segment/analytics-core": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/@segment/analytics-core/-/analytics-core-1.4.1.tgz", @@ -5678,34 +5436,6 @@ "react-dom": "^18.0.0" } }, - "node_modules/@testing-library/react-hooks": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/@testing-library/react-hooks/-/react-hooks-7.0.2.tgz", - "integrity": "sha512-dYxpz8u9m4q1TuzfcUApqi8iFfR6R0FaMbr2hjZJy1uC8z+bO/K4v8Gs9eogGKYQop7QsrBTFkv/BCF7MzD2Cg==", - "dependencies": { - "@babel/runtime": "^7.12.5", - "@types/react": ">=16.9.0", - "@types/react-dom": ">=16.9.0", - "@types/react-test-renderer": ">=16.9.0", - "react-error-boundary": "^3.1.0" - }, - "engines": { - "node": ">=12" - }, - "peerDependencies": { - "react": ">=16.9.0", - "react-dom": ">=16.9.0", - "react-test-renderer": ">=16.9.0" - }, - "peerDependenciesMeta": { - "react-dom": { - "optional": true - }, - "react-test-renderer": { - "optional": true - } - } - }, "node_modules/@testing-library/react/node_modules/@testing-library/dom": { "version": "9.3.4", "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.4.tgz", @@ -6015,6 +5745,7 @@ "version": "17.0.25", "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.25.tgz", "integrity": "sha512-urx7A7UxkZQmThYA4So0NelOVjx3V4rNFVJwp0WZlbIK5eM4rNJDiN3R/E9ix0MBh6kAEojk/9YL+Te6D9zHNA==", + "devOptional": true, "dependencies": { "@types/react": "^17" } @@ -6027,14 +5758,6 @@ "@types/react": "*" } }, - "node_modules/@types/react-test-renderer": { - "version": "18.0.7", - "resolved": "https://registry.npmjs.org/@types/react-test-renderer/-/react-test-renderer-18.0.7.tgz", - "integrity": "sha512-1+ANPOWc6rB3IkSnElhjv6VLlKg2dSv/OWClUyZimbLsQyBn8Js9Vtdsi3UICJ2rIQ3k2la06dkB+C92QfhKmg==", - "dependencies": { - "@types/react": "*" - } - }, "node_modules/@types/react-transition-group": { "version": "4.4.10", "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz", @@ -8502,52 +8225,6 @@ "integrity": "sha512-3Lc0sTIuX1jmY2K2RrXRJOND6KsRTX2D4v3+eu1PDptsuJZVK4LZc852eZa9I+avj0NrUKlTNgqvccNOH6mbGg==", "dev": true }, - "node_modules/compass-preferences-model": { - "version": "2.27.0", - "resolved": "https://registry.npmjs.org/compass-preferences-model/-/compass-preferences-model-2.27.0.tgz", - "integrity": "sha512-BbHSGfYqCLslalRofDLjlRIJOHTiNWwfaWROQOTMrtLmYSPYyfQ5bm6piu4j+k+/qupcqRbMYbQ3NCJViIw64w==", - "license": "SSPL", - "dependencies": { - "@mongodb-js/compass-logging": "^1.4.4", - "@mongodb-js/compass-user-data": "^0.3.4", - "@mongodb-js/devtools-proxy-support": "^0.3.6", - "bson": "^6.7.0", - "hadron-app-registry": "^9.2.3", - "hadron-ipc": "^3.2.21", - "js-yaml": "^4.1.0", - "lodash": "^4.17.21", - "react": "^17.0.2", - "yargs-parser": "^21.1.1", - "zod": "^3.22.3" - } - }, - "node_modules/compass-preferences-model/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "license": "Python-2.0" - }, - "node_modules/compass-preferences-model/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "license": "MIT", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/compass-preferences-model/node_modules/yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -8754,7 +8431,8 @@ "node_modules/crelt": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz", - "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==" + "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==", + "license": "MIT" }, "node_modules/cross-env": { "version": "7.0.3", @@ -9853,9 +9531,9 @@ } }, "node_modules/electron": { - "version": "30.4.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-30.4.0.tgz", - "integrity": "sha512-ric3KLPQ9anXYjtTDkj5NbEcXZqRUwqxrxTviIjLdMdHqd5O+hkSHEzXgbSJUOt+7uw+zZuybn9+IM9y7iEpqg==", + "version": "30.5.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-30.5.1.tgz", + "integrity": "sha512-AhL7+mZ8Lg14iaNfoYTkXQ2qee8mmsQyllKdqxlpv/zrKgfxz6jNVtcRRbQtLxtF8yzcImWdfTQROpYiPumdbw==", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -9876,9 +9554,9 @@ "integrity": "sha512-QR7/A7ZkMS8tZuoftC/jfqNkZLQO779SSW3YuZHP4eXpj3EffGLFcB/Xu9AAZQzLccTiCV+EmUo3ha4mQ9wnlA==" }, "node_modules/electron/node_modules/@types/node": { - "version": "20.16.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.1.tgz", - "integrity": "sha512-zJDo7wEadFtSyNz5QITDfRcrhqDvQI1xQNQ0VoizPjM/dVAODqqIUWbJPkvsxmTI0MYRGRikcdjMPhOssnPejQ==", + "version": "20.16.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.10.tgz", + "integrity": "sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==", "license": "MIT", "dependencies": { "undici-types": "~6.19.2" @@ -12327,9 +12005,9 @@ } }, "node_modules/hadron-app-registry": { - "version": "9.2.3", - "resolved": "https://registry.npmjs.org/hadron-app-registry/-/hadron-app-registry-9.2.3.tgz", - "integrity": "sha512-jCwc2juLH143zEnXQAbyp54PZilqNUuDsMDDpAu5P4cGs23byQkwXtuwqzJ5rYkoTgjR387u+gqc8qSGfwH81A==", + "version": "9.2.7", + "resolved": "https://registry.npmjs.org/hadron-app-registry/-/hadron-app-registry-9.2.7.tgz", + "integrity": "sha512-j9gzTlzyuRxis1ywcoDRyOUJtDRktc/ZFXjbxtxTQMuDnSJYtshbzF1D7N38fvs61gDQNQ20egRTDg9oPAhQCA==", "license": "SSPL", "dependencies": { "eventemitter3": "^4.0.0", @@ -12385,9 +12063,10 @@ } }, "node_modules/hadron-document": { - "version": "8.5.4", - "resolved": "https://registry.npmjs.org/hadron-document/-/hadron-document-8.5.4.tgz", - "integrity": "sha512-ZKgrBFAdHs21emLfJX5ZPLwAjSx7XrS9805IOHvex11UP3sdhz5G01pFwhY+FsUVUADWFbbCfW//Un7iJTUBlQ==", + "version": "8.6.3", + "resolved": "https://registry.npmjs.org/hadron-document/-/hadron-document-8.6.3.tgz", + "integrity": "sha512-r8UjIDlBEneQRXD+YiOfuqjPzzaI36jQOkiwcEAR/RDvMEThgUGgSmhjUzdheXY/DRkndvi2ZDCh31tM9TbvvQ==", + "license": "SSPL", "dependencies": { "bson": "^6.7.0", "eventemitter3": "^4.0.0", @@ -12396,13 +12075,13 @@ } }, "node_modules/hadron-ipc": { - "version": "3.2.21", - "resolved": "https://registry.npmjs.org/hadron-ipc/-/hadron-ipc-3.2.21.tgz", - "integrity": "sha512-imPMxfqUYGmHLiwvALUs05NHs+zWywYAgps1xETAQAk/etlZmw3rkisestceRVq3BmFo78IueoeMmHaB0uQF7A==", + "version": "3.2.23", + "resolved": "https://registry.npmjs.org/hadron-ipc/-/hadron-ipc-3.2.23.tgz", + "integrity": "sha512-KQLfJFVxPJtMrF378V/M8hZimrgUT8wM6//3WGF8Lx1+G5r3CV07QNyxkb9NbEii0FA9Xn3A9Yyg/mDBXNP2iQ==", "license": "SSPL", "dependencies": { "debug": "^4.3.4", - "electron": "^30.4.0", + "electron": "^30.5.1", "is-electron-renderer": "^2.0.1" } }, @@ -12410,6 +12089,7 @@ "version": "7.2.2", "resolved": "https://registry.npmjs.org/hadron-type-checker/-/hadron-type-checker-7.2.2.tgz", "integrity": "sha512-3Etm6trKNi+/xZdsoRJqrRrHMhadOeu1esZr53QvR8ZlZHmZrdbyLjeKHdFITBonk1WBHLSszuBagjXwKwRmJA==", + "license": "SSPL", "dependencies": { "bson": "^6.7.0", "lodash": "^4.17.21" @@ -12878,6 +12558,7 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, "engines": { "node": ">=0.8.19" } @@ -14897,9 +14578,10 @@ } }, "node_modules/mongodb": { - "version": "6.8.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.8.0.tgz", - "integrity": "sha512-HGQ9NWDle5WvwMnrvUxsFYPd3JEbqD3RgABHBQRuoCEND0qzhsd0iH5ypHsf1eJ+sXmvmyKpP+FLOKY8Il7jMw==", + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.9.0.tgz", + "integrity": "sha512-UMopBVx1LmEUbW/QE0Hw18u583PEDVQmUmVzzBRH0o/xtE9DBRA5ZYLOjpLIa03i8FXjzvQECJcqoMvCXftTUA==", + "license": "Apache-2.0", "dependencies": { "@mongodb-js/saslprep": "^1.1.5", "bson": "^6.7.0", @@ -14950,11 +14632,12 @@ } }, "node_modules/mongodb-client-encryption": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-6.0.1.tgz", - "integrity": "sha512-u6pKu9plR7hQH6VtsfYonC9dwWAM3HFEpi+Xy3EJIdUyoH6dlFgaxX8TnKx/Ycfi2I1cxTXq2IbhSpg157vVgg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-6.1.0.tgz", + "integrity": "sha512-Y3Hakre82nXD/pNDUzBjxfgwWSj5E1ar9ZLkqyXDfvirv4huHMbg8Q2qVO/TXlNJuf1B2bzrEDXsTqHKQSQLtw==", "devOptional": true, "hasInstallScript": true, + "license": "Apache-2.0", "dependencies": { "bindings": "^1.5.0", "node-addon-api": "^4.3.0", @@ -15032,17 +14715,16 @@ } }, "node_modules/mongodb-data-service": { - "version": "22.23.0", - "resolved": "https://registry.npmjs.org/mongodb-data-service/-/mongodb-data-service-22.23.0.tgz", - "integrity": "sha512-JYrYy3ureElrzxVzA7plT0NYL1Sei0rQYGvQm9BMgKx+DYy7EEB5/gzjUASQ1LkVfRoaBTgjUARDhlWLuCnWog==", + "version": "22.23.4", + "resolved": "https://registry.npmjs.org/mongodb-data-service/-/mongodb-data-service-22.23.4.tgz", + "integrity": "sha512-DmS915uPdFKtBXMyrPO2x0mC8bUZRMYRW0/QSV3S/dfOB992wE06NiV1iD3qyYcTpncLXuFg0xtvQKEBTmOOWg==", "license": "SSPL", "dependencies": { - "@mongodb-js/compass-logging": "^1.4.4", - "@mongodb-js/compass-utils": "^0.6.10", - "@mongodb-js/devtools-connect": "^3.2.5", - "@mongodb-js/devtools-proxy-support": "^0.3.6", + "@mongodb-js/compass-logging": "^1.4.8", + "@mongodb-js/compass-utils": "^0.6.12", + "@mongodb-js/devtools-connect": "^3.2.10", + "@mongodb-js/devtools-proxy-support": "^0.3.9", "bson": "^6.7.0", - "compass-preferences-model": "^2.27.0", "lodash": "^4.17.21", "mongodb": "^6.8.0", "mongodb-build-info": "^1.7.2", @@ -15050,33 +14732,77 @@ "mongodb-ns": "^2.4.2" }, "optionalDependencies": { - "mongodb-client-encryption": "~6.0.1" + "mongodb-client-encryption": "^6.1.0" } }, "node_modules/mongodb-data-service/node_modules/@mongodb-js/devtools-connect": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-3.2.6.tgz", - "integrity": "sha512-E5jvGDHZ13fnDkuIytnINIS2/2BR0aiC0rfXLKeOO6ongJfL8F5ACEz5dbCR+e6eJ4JCeh1Tb49CfjZK9iGhWQ==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-3.3.0.tgz", + "integrity": "sha512-stjduqOZwN51E+Rl8WmZamIM/1UT1ZLt3LxnPazJXnBzycMXEge6kvQQCeYrHk8fokYggLhRxL5xL7IgXaBdbw==", "license": "Apache-2.0", "dependencies": { - "@mongodb-js/devtools-proxy-support": "^0.3.6", - "@mongodb-js/oidc-http-server-pages": "1.1.2", + "@mongodb-js/devtools-proxy-support": "^0.4.0", + "@mongodb-js/oidc-http-server-pages": "1.1.3", "lodash.merge": "^4.6.2", "mongodb-connection-string-url": "^3.0.0", "socks": "^2.7.3" }, "optionalDependencies": { "kerberos": "^2.1.0", - "mongodb-client-encryption": "^6.0.0 || ^6.1.0-alpha.0", + "mongodb-client-encryption": "^6.1.0", "os-dns-native": "^1.2.0", "resolve-mongodb-srv": "^1.1.1" }, "peerDependencies": { "@mongodb-js/oidc-plugin": "^1.1.0", - "mongodb": "^6.8.0", + "mongodb": "^6.9.0", "mongodb-log-writer": "^1.4.2" } }, + "node_modules/mongodb-data-service/node_modules/@mongodb-js/devtools-connect/node_modules/@mongodb-js/devtools-proxy-support": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-proxy-support/-/devtools-proxy-support-0.4.0.tgz", + "integrity": "sha512-NSHo+jE1tjH0XOFoDfOrCW7IAt+5l3TOpzgvWSbmNfVO4FqT/lE/mpQKIwsFOlMeGVI6ku2GOV7Obg6664OfTw==", + "license": "Apache-2.0", + "dependencies": { + "@mongodb-js/socksv5": "^0.0.10", + "agent-base": "^7.1.1", + "debug": "^4.3.6", + "http-proxy-agent": "^7.0.2", + "https-proxy-agent": "^7.0.5", + "lru-cache": "^11.0.0", + "node-fetch": "^3.3.2", + "pac-proxy-agent": "^7.0.2", + "socks-proxy-agent": "^8.0.4", + "ssh2": "^1.15.0", + "system-ca": "^2.0.1" + } + }, + "node_modules/mongodb-data-service/node_modules/@mongodb-js/devtools-proxy-support": { + "version": "0.3.10", + "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-proxy-support/-/devtools-proxy-support-0.3.10.tgz", + "integrity": "sha512-HComoStLokruxsPLR5m3mC+A167n9THKj3jCj6lQSh7szXotJI5zm500BFEI5IpcY/lVovbK4QlRYQP6WWS+5w==", + "license": "Apache-2.0", + "dependencies": { + "@mongodb-js/socksv5": "^0.0.10", + "agent-base": "^7.1.1", + "debug": "^4.3.6", + "http-proxy-agent": "^7.0.2", + "https-proxy-agent": "^7.0.5", + "lru-cache": "^11.0.0", + "node-fetch": "^3.3.2", + "pac-proxy-agent": "^7.0.2", + "socks-proxy-agent": "^8.0.4", + "ssh2": "^1.15.0", + "system-ca": "^2.0.0" + } + }, + "node_modules/mongodb-data-service/node_modules/@mongodb-js/oidc-http-server-pages": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@mongodb-js/oidc-http-server-pages/-/oidc-http-server-pages-1.1.3.tgz", + "integrity": "sha512-I704bSQRu/SusTcCV8qqtdFVvAJf1aKZtgGM2VnYjPn2njZd5j7864k/CF9TeeR8+r0At5qqNa3N4MX9YxPnEg==", + "license": "Apache-2.0" + }, "node_modules/mongodb-data-service/node_modules/@mongodb-js/oidc-plugin": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@mongodb-js/oidc-plugin/-/oidc-plugin-1.1.1.tgz", @@ -15092,6 +14818,42 @@ "node": ">= 16.20.1" } }, + "node_modules/mongodb-data-service/node_modules/data-uri-to-buffer": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", + "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==", + "license": "MIT", + "engines": { + "node": ">= 12" + } + }, + "node_modules/mongodb-data-service/node_modules/lru-cache": { + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.1.tgz", + "integrity": "sha512-CgeuL5uom6j/ZVrg7G/+1IXqRY8JXX4Hghfy5YE0EhoYQWvndP1kufu58cmZLNIDKnRhZrXfdS9urVWx98AipQ==", + "license": "ISC", + "engines": { + "node": "20 || >=22" + } + }, + "node_modules/mongodb-data-service/node_modules/node-fetch": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz", + "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==", + "license": "MIT", + "dependencies": { + "data-uri-to-buffer": "^4.0.0", + "fetch-blob": "^3.1.4", + "formdata-polyfill": "^4.0.10" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/node-fetch" + } + }, "node_modules/mongodb-download-url": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/mongodb-download-url/-/mongodb-download-url-1.5.0.tgz", @@ -15122,15 +14884,18 @@ "integrity": "sha512-gYJjEYG4v4a1WSXgUf81OBoBRlj+Z1SlnQVO392fC/4a1CN7CLWDITajZWPFTPh/yRozYk6sHHtZwZmQhodBEA==" }, "node_modules/mongodb-query-parser": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/mongodb-query-parser/-/mongodb-query-parser-4.2.2.tgz", - "integrity": "sha512-G97DZawo9f6uTdqIcTR+79sL7cPNS4AHNIGFEyzaWlAo/6bRI2Ihd3f/fZgtrzgCgWl0CgKE9S5eywXSpuaggQ==", + "version": "4.2.5", + "resolved": "https://registry.npmjs.org/mongodb-query-parser/-/mongodb-query-parser-4.2.5.tgz", + "integrity": "sha512-K2+8bMlNCSn8JpXrbARkIB2lM8yOBo7yCR7PBgdnHnp0T2ELOsT+qBzOFTDIEVAJxY5Jc2ifJ1fne0Lqp2wzeQ==", "license": "Apache-2.0", "dependencies": { - "@mongodb-js/shell-bson-parser": "^1.1.1", + "@mongodb-js/shell-bson-parser": "^1.1.3", "debug": "^4.3.4", "javascript-stringify": "^2.1.0", "lodash": "^4.17.21" + }, + "peerDependencies": { + "bson": "^4.6.3 || ^5 || ^6" } }, "node_modules/mongodb-rag-core": { @@ -17244,21 +17009,6 @@ "loose-envify": "^1.1.0" } }, - "node_modules/react-error-boundary": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-3.1.4.tgz", - "integrity": "sha512-uM9uPzZJTF6wRQORmSrvOIgt4lJ9MC1sNgEOj2XGsDTRE4kmpWxg7ENK9EWNKJRMAOY9z0MuF4yIfl6gp4sotA==", - "dependencies": { - "@babel/runtime": "^7.12.5" - }, - "engines": { - "node": ">=10", - "npm": ">=6" - }, - "peerDependencies": { - "react": ">=16.13.1" - } - }, "node_modules/react-hotkeys-hook": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/react-hotkeys-hook/-/react-hotkeys-hook-4.4.1.tgz", @@ -17297,36 +17047,6 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, - "node_modules/react-shallow-renderer": { - "version": "16.15.0", - "resolved": "https://registry.npmjs.org/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz", - "integrity": "sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA==", - "optional": true, - "peer": true, - "dependencies": { - "object-assign": "^4.1.1", - "react-is": "^16.12.0 || ^17.0.0 || ^18.0.0" - }, - "peerDependencies": { - "react": "^16.0.0 || ^17.0.0 || ^18.0.0" - } - }, - "node_modules/react-test-renderer": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-17.0.2.tgz", - "integrity": "sha512-yaQ9cB89c17PUb0x6UfWRs7kQCorVdHlutU1boVPEsB8IDZH6n9tHxMacc3y0JoXOJUsZb/t/Mb8FUWMKaM7iQ==", - "optional": true, - "peer": true, - "dependencies": { - "object-assign": "^4.1.1", - "react-is": "^17.0.2", - "react-shallow-renderer": "^16.13.1", - "scheduler": "^0.20.2" - }, - "peerDependencies": { - "react": "17.0.2" - } - }, "node_modules/react-transition-group": { "version": "4.4.5", "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz", @@ -17356,6 +17076,16 @@ "react": "^16.6.3 || ^17.0.0" } }, + "node_modules/react-virtualized-auto-sizer": { + "version": "1.0.24", + "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.24.tgz", + "integrity": "sha512-3kCn7N9NEb3FlvJrSHWGQ4iVl+ydQObq2fHMn12i5wbtm74zHOPhz/i64OL3c1S1vi9i2GXtZqNqUJTQ+BnNfg==", + "license": "MIT", + "peerDependencies": { + "react": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0", + "react-dom": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0" + } + }, "node_modules/react-window": { "version": "1.8.10", "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.10.tgz", @@ -17885,17 +17615,6 @@ "node": ">=v12.22.7" } }, - "node_modules/scheduler": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz", - "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==", - "optional": true, - "peer": true, - "dependencies": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" - } - }, "node_modules/schema-utils": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", @@ -18930,9 +18649,10 @@ "license": "MIT" }, "node_modules/style-mod": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.0.tgz", - "integrity": "sha512-Ca5ib8HrFn+f+0n4N4ScTIA9iTOQ7MaGS1ylHcoVqW9J7w2w8PzN6g9gKmTYgGEBH8e120+RCmhpje6jC5uGWA==" + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz", + "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==", + "license": "MIT" }, "node_modules/stylis": { "version": "4.2.0", @@ -20110,7 +19830,8 @@ "node_modules/w3c-keyname": { "version": "2.2.8", "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz", - "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==" + "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==", + "license": "MIT" }, "node_modules/w3c-xmlserializer": { "version": "5.0.0", @@ -20617,31 +20338,6 @@ "node": ">=4" } }, - "node_modules/write-file-atomic": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz", - "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/write-file-atomic/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "license": "ISC", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/write/node_modules/mkdirp": { "version": "0.5.6", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", @@ -20885,6 +20581,7 @@ "version": "3.23.8", "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz", "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==", + "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/colinhacks" diff --git a/package.json b/package.json index 5d8a65ebd..9b28b842e 100644 --- a/package.json +++ b/package.json @@ -1181,9 +1181,9 @@ "@babel/core": "^7.24.6", "@babel/parser": "^7.24.6", "@babel/traverse": "^7.24.6", - "@mongodb-js/compass-components": "^1.25.0", - "@mongodb-js/connection-form": "^1.22.2", - "@mongodb-js/connection-info": "^0.1.2", + "@mongodb-js/compass-components": "^1.30.0", + "@mongodb-js/connection-form": "^1.41.1", + "@mongodb-js/connection-info": "^0.7.0", "@mongodb-js/mongodb-constants": "^0.10.2", "@mongosh/browser-runtime-electron": "^2.3.0", "@mongosh/i18n": "^2.3.0", diff --git a/src/connectionController.ts b/src/connectionController.ts index 0ca1a6b20..301db9e97 100644 --- a/src/connectionController.ts +++ b/src/connectionController.ts @@ -327,6 +327,7 @@ export default class ConnectionController { productDocsLink: LINKS.extensionDocs(), }), logger: Object.assign(log, { mongoLogId }), + proxyOptions: {}, }); this._connectionAttempt = connectionAttempt; this._connectingConnectionId = connectionId; diff --git a/src/test/suite/explorer/explorerController.test.ts b/src/test/suite/explorer/explorerController.test.ts index cadca2a99..0e47cced2 100644 --- a/src/test/suite/explorer/explorerController.test.ts +++ b/src/test/suite/explorer/explorerController.test.ts @@ -75,6 +75,7 @@ suite('Explorer Controller Test Suite', function () { testConnectionController._connectionAttempt = createConnectionAttempt({ connectFn: connect, logger: Object.assign(log, { mongoLogId }), + proxyOptions: {}, }); const connectionsItems = await treeController.getChildren(); diff --git a/src/views/webview-app/connection-form.tsx b/src/views/webview-app/connection-form.tsx index 789ff0631..638e1deb8 100644 --- a/src/views/webview-app/connection-form.tsx +++ b/src/views/webview-app/connection-form.tsx @@ -1,5 +1,4 @@ import React from 'react'; -import type { ComponentProps } from 'react'; import CompassConnectionForm from '@mongodb-js/connection-form'; import { CancelLoader, @@ -49,17 +48,16 @@ const ConnectionForm: React.FunctionComponent< open: boolean; connectionErrorMessage: string; } & Pick< - ComponentProps, - 'onConnectClicked' | 'onSaveConnectionClicked' | 'initialConnectionInfo' + Parameters[0], + 'onSaveAndConnectClicked' | 'initialConnectionInfo' > > = ({ initialConnectionInfo, connectionErrorMessage, isConnecting, onCancelConnectClicked, - onConnectClicked, onClose, - onSaveConnectionClicked, + onSaveAndConnectClicked, open, }) => { const darkMode = useDarkMode(); @@ -89,23 +87,22 @@ const ConnectionForm: React.FunctionComponent< )}
diff --git a/src/views/webview-app/overview-page.tsx b/src/views/webview-app/overview-page.tsx index 83a921a6f..1231e4b8f 100644 --- a/src/views/webview-app/overview-page.tsx +++ b/src/views/webview-app/overview-page.tsx @@ -64,19 +64,17 @@ const OverviewPage: React.FC = () => { - handleSaveConnectionClicked({ + onSaveAndConnectClicked={({ id, connectionOptions }) => { + void handleSaveConnectionClicked({ id, connectionOptions, - }) - } - onCancelConnectClicked={handleCancelConnectClicked} - onConnectClicked={({ id, connectionOptions }) => + }); handleConnectClicked({ id, connectionOptions, - }) - } + }); + }} + onCancelConnectClicked={handleCancelConnectClicked} onClose={closeConnectionForm} open={isConnectionFormOpen} connectionErrorMessage={connectionErrorMessage}