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

Author: mabaasit

.depalignrc.json

@@ -131,6 +131,7 @@
     "babel-loader": ["^7.1.5"],
     "@babel/core": ["7.16.0"],
     "@babel/parser": ["7.16.0"],
-    "js-yaml": ["^3.13.1"]
+    "js-yaml": ["^3.13.1"],
+    "bson": ["^4.4.1", "^5.0.0"]
   }
 }

configs/webpack-config-compass/src/loaders.ts

@@ -18,7 +18,7 @@ const cloudSupportedBrowserslistConfig =
   'last 2 Chrome versions, last 2 Safari versions, last 2 Firefox versions';
 
 export const javascriptLoader = (args: ConfigArgs, web = false) => ({
-  test: /\.(mjs|jsx?|tsx?)$/,
+  test: /\.(mjs|c?jsx?|tsx?)$/,
   exclude: [
     /\bnode_modules\b/,
     // Otherwise core-js will polyfill itself with core-js and this doesn't work

package-lock.json

@@ -11,6 +11,7 @@
   "scripts": {
     "bootstrap": "npm install && lerna run bootstrap --stream",
     "bootstrap-ci": "npm ci && lerna run bootstrap",
+    "postinstall": "node scripts/fixup-bson5-packagejson.js",
     "precheck": "npm run depcheck && npm run check-logids && npm run check-leafygreen-dependency-usage",
     "changed": "node ./scripts/changed.js",
     "check": "lerna run check --stream",

package.json

@@ -585,8 +585,8 @@ module.exports = (CodeGenerationVisitor) => class Visitor extends CodeGeneration
       Map: bson.Map,
       MaxKey: bson.MaxKey,
       MinKey: bson.MinKey,
-      ObjectID: bson.ObjectID,
-      ObjectId: bson.ObjectID,
+      ObjectID: bson.ObjectId,
+      ObjectId: bson.ObjectId,
       BSONSymbol: bson.BSONSymbol,
       Timestamp: bson.Timestamp,
       Code: function(c, s) {

packages/bson-transpilers/codegeneration/javascript/Visitor.js

@@ -29,7 +29,7 @@ module.exports = (JavascriptVisitor) => class Visitor extends JavascriptVisitor
       Map: bson.Map,
       MaxKey: bson.MaxKey,
       MinKey: bson.MinKey,
-      ObjectId: bson.ObjectID,
+      ObjectId: bson.ObjectId,
       BSONSymbol: bson.BSONSymbol,
       Timestamp: bson.Timestamp,
       Code: function(c, s) {

packages/bson-transpilers/codegeneration/shell/Visitor.js

@@ -40,8 +40,8 @@ const executeJavascript = (input) => {
     Map: bson.Map,
     MaxKey: bson.MaxKey,
     MinKey: bson.MinKey,
-    ObjectID: bson.ObjectID,
-    ObjectId: bson.ObjectID,
+    ObjectID: bson.ObjectId,
+    ObjectId: bson.ObjectId,
     BSONSymbol: bson.BSONSymbol,
     Timestamp: bson.Timestamp,
     Code: function(c, s) {

packages/bson-transpilers/test/run-yaml.test.js

@@ -2,7 +2,7 @@
   "name": "mongodb-collection-model",
   "description": "MongoDB collection model",
   "author": "Lucas Hrabovsky <[email protected]>",
-  "version": "5.4.0",
+  "version": "5.4.1",
   "bugs": {
     "url": "https://jira.mongodb.org/projects/COMPASS/issues",
     "email": "[email protected]"
@@ -34,7 +34,7 @@
     "mongodb-ns": "^2.4.0"
   },
   "peerDependencies": {
-    "mongodb-data-service": "^22.4.0"
+    "mongodb-data-service": "^22.4.1"
   },
   "devDependencies": {
     "@mongodb-js/eslint-config-compass": "^1.0.2",
@@ -43,7 +43,7 @@
     "electron-mocha": "^10.1.0",
     "eslint": "^7.25.0",
     "mocha": "^8.4.0",
-    "mongodb-data-service": "^22.4.0",
+    "mongodb-data-service": "^22.4.1",
     "xvfb-maybe": "^0.2.1"
   }
 }

packages/collection-model/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mongodb-js/compass-aggregations",
   "productName": "Aggregations plugin",
-  "version": "9.5.2",
+  "version": "9.6.0",
   "apiVersion": "3.0.0",
   "description": "Compass Aggregation Pipeline Builder",
   "main": "dist/index.js",
@@ -40,15 +40,15 @@
   "license": "SSPL",
   "peerDependencies": {
     "@mongodb-js/compass-components": "^1.5.0",
-    "@mongodb-js/compass-crud": "^13.5.2",
+    "@mongodb-js/compass-crud": "^13.5.3",
     "@mongodb-js/compass-editor": "^0.4.2",
     "@mongodb-js/compass-logging": "^1.1.2",
-    "@mongodb-js/compass-utils": "^0.2.0",
+    "@mongodb-js/compass-utils": "^0.2.1",
     "@mongodb-js/explain-plan-helper": "^1.0.2",
-    "@mongodb-js/mongodb-constants": "^0.1.5",
+    "@mongodb-js/mongodb-constants": "^0.2.1",
     "@mongodb-js/mongodb-redux-common": "^2.0.4",
-    "bson": "^4.4.1",
-    "compass-preferences-model": "^2.5.0",
+    "bson": "^5.0.0",
+    "compass-preferences-model": "^2.5.1",
     "hadron-document": "^8.1.0",
     "react": "^17.0.2"
   },
@@ -72,17 +72,17 @@
     "chai": "^4.3.6",
     "debug": "^4.2.0",
     "depcheck": "^1.4.1",
-    "ejson-shell-parser": "^1.2.0",
+    "ejson-shell-parser": "^1.2.1",
     "electron": "^22.0.2",
     "enzyme": "^3.11.0",
     "eslint": "^7.25.0",
     "hadron-app-registry": "^9.0.3",
     "lodash": "^4.17.21",
     "mocha": "^8.4.0",
-    "mongodb": "^4.13.0",
-    "mongodb-data-service": "^22.4.0",
+    "mongodb": "^5.0.0",
+    "mongodb-data-service": "^22.4.1",
     "mongodb-ns": "^2.4.0",
-    "mongodb-query-parser": "^2.4.6",
+    "mongodb-query-parser": "^2.4.8",
     "nyc": "^15.1.0",
     "prettier": "^2.7.1",
     "prop-types": "^15.7.2",
@@ -95,19 +95,20 @@
     "rimraf": "^3.0.0",
     "semver": "^5.7.1",
     "sinon": "^9.2.3",
-    "xvfb-maybe": "^0.2.1"
+    "xvfb-maybe": "^0.2.1",
+    "react-intersection-observer": "^8.34.0"
   },
   "dependencies": {
     "@mongodb-js/compass-components": "^1.5.0",
-    "@mongodb-js/compass-crud": "^13.5.2",
+    "@mongodb-js/compass-crud": "^13.5.3",
     "@mongodb-js/compass-editor": "^0.4.2",
     "@mongodb-js/compass-logging": "^1.1.2",
-    "@mongodb-js/compass-utils": "^0.2.0",
+    "@mongodb-js/compass-utils": "^0.2.1",
     "@mongodb-js/explain-plan-helper": "^1.0.2",
-    "@mongodb-js/mongodb-constants": "^0.1.5",
+    "@mongodb-js/mongodb-constants": "^0.2.1",
     "@mongodb-js/mongodb-redux-common": "^2.0.4",
-    "bson": "^4.4.1",
-    "compass-preferences-model": "^2.5.0",
+    "bson": "^5.0.0",
+    "compass-preferences-model": "^2.5.1",
     "hadron-document": "^8.1.0"
   },
   "homepage": "https://github.com/mongodb-js/compass",

packages/compass-aggregations/package.json

@@ -7,6 +7,7 @@ import {
   spacing,
   Link,
 } from '@mongodb-js/compass-components';
+import { PIPELINE_HELP_URI } from '../../constants';
 
 const iconContainerStyles = css({
   textAlign: 'center',
@@ -59,7 +60,7 @@ export const AddStage = ({ onAddStage, variant }: AddStageProps) => {
       </Button>
 
       <div className={linkContainerStyles}>
-        <Link href="https://www.mongodb.com/docs/manual/reference/operator/aggregation-pipeline/">
+        <Link href={PIPELINE_HELP_URI}>
           Learn more about aggregation pipeline stages
         </Link>
       </div>