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

Author: github-actions[bot]

.evergreen/functions.yml

@@ -169,6 +169,14 @@ functions:
           set -e
           eval $(.evergreen/print-compass-env.sh)
 
+          # Pre-built binaries for keytar do not support older RHEL versions.
+          # Since we have started importing keytar from top-level scripts in packages,
+          # re-built keytar before the bootstrap process so that it is always usable.
+          if [[ "$IS_RHEL" == "true" ]]; then
+            echo "Rebuilding packages for rhel"
+            npm run node-rebuild
+          fi
+
           # Prepare workspaces in provided scope
           npx lerna run bootstrap \
             --stream \
@@ -549,7 +557,7 @@ functions:
             npm config list
             echo "Publishing packages as $(npm whoami)"
             git update-index --assume-unchanged .npmrc
-            npm run publish-packages-next
+            bash ".evergreen/retry-with-backoff.sh" npm run publish-packages-next
           fi
 
   generate-vulnerability-report:

CONTRIBUTING.md

@@ -138,6 +138,6 @@ The root cause is native modules compiled for a different version of the runtime
 1. Modules have to be recompiled for the runtime they will be used in
 1. Due to npm workspaces hoisting all shared dependencies to the very root of the monorepo, all packages use the same modules imported from the same location
 
-This means that if you e.g., start Compass application locally it will recompile all native modules to work in Electron runtime, if you would try to run tests for `mongodb-connection-model` library right after that, tests would fail due to `keytar` library not being compatible with Node.js environment that the tests are running in.
+This means that if you e.g., start Compass application locally it will recompile all native modules to work in Electron runtime, if you would try to run tests for `@mongodb-js/connection-storage` library right after that, tests would fail due to `keytar` library not being compatible with Node.js environment that the tests are running in.
 
 If you run into this issue, make sure that native modules are rebuilt for whatever runtime you are planning to use at the moment. To help with that we provide two npm scripts: `npm run electron-rebuild` will recompile native modules to work with Electron and `npm run node-rebuild` will recompile them to work with Node.js.

README.md

@@ -72,7 +72,6 @@ Is there anything else you’d like to see in Compass? Let us know by submitting
 - [**hadron-reflux-store**](packages/reflux-store): Hadron Reflux Stores
 - [**hadron-type-checker**](packages/hadron-type-checker): Hadron Type Checker
 - [**mongodb-collection-model**](packages/collection-model): MongoDB collection model
-- [**mongodb-connection-model**](packages/connection-model): MongoDB connection model
 - [**mongodb-data-service**](packages/data-service): MongoDB Data Service
 - [**mongodb-database-model**](packages/database-model): MongoDB database model
 - [**mongodb-explain-compat**](packages/mongodb-explain-compat): Convert mongodb SBE explain output to 4.4 explain output

THIRD-PARTY-NOTICES.md

@@ -74,7 +74,7 @@
     "cli-progress": "^3.9.1",
     "core-js": "^3.17.3",
     "css-loader": "^4.3.0",
-    "electron": "^23.3.9",
+    "electron": "^23.3.10",
     "html-webpack-plugin": "^5.3.2",
     "less-loader": "^10.0.1",
     "mini-css-extract-plugin": "^2.3.0",

configs/webpack-config-compass/package.json

@@ -43,7 +43,7 @@
     "where": "monorepo-where",
     "create-workspace": "node ./scripts/create-workspace.js",
     "update-evergreen-config": "node .evergreen/template-yml.js",
-    "publish-packages-next": "npx lerna publish \"0.0.0-next-$(git rev-parse HEAD)\" --force-publish --exact --no-git-tag-version --no-private --dist-tag next --pre-dist-tag next --no-verify-access --no-git-reset --yes",
+    "publish-packages-next": "npx lerna publish from-package \"0.0.0-next-$(git rev-parse HEAD)\" --force-publish --exact --no-git-tag-version --no-private --dist-tag next --pre-dist-tag next --no-verify-access --no-git-reset --yes",
     "prepare": "husky install",
     "snyk-test": "node scripts/snyk-test.js",
     "pregenerate-vulnerability-report": "npm run compile -w packages/compass && npm run snyk-test",

package-lock.json

@@ -1 +1 @@
-module.exports = require('@mongodb-js/mocha-config-compass');
+module.exports = require('@mongodb-js/mocha-config-compass/react');

package.json

@@ -67,9 +67,14 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
+    "@mongodb-js/compass-components": "^1.10.0",
     "@mongodb-js/devtools-connect": "^2.4.0",
     "@mongodb-js/oidc-plugin": "^0.3.0",
-    "electron": "^23.3.9",
-    "node-fetch": "^2.6.7"
+    "electron": "^23.3.10",
+    "node-fetch": "^2.6.7",
+    "react": "^17.0.2",
+    "react-redux": "^8.0.5",
+    "redux": "^4.2.1",
+    "redux-thunk": "^2.4.1"
   }
 }