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

Author: mabaasit

THIRD-PARTY-NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **compass**.
-This document was automatically generated on Wed Jan 05 2022.
+This document was automatically generated on Mon Jan 10 2022.
 
 ## List of dependencies
 

configs/mocha-config-compass/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongodb-js/mocha-config-compass",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Shared mocha mocha configuration for Compass packages",
   "license": "SSPL",
   "main": "index.js",

package-lock.json

@@ -38,7 +38,7 @@
     "test-packages-version": "lerna version --no-push --no-private -m \"tmp(release): Test release\"",
     "update-authors": "node scripts/generate-authors.js",
     "update-third-party-notices": "node scripts/gather-licenses.js packages/compass/ > THIRD-PARTY-NOTICES.md",
-    "version": "node ./scripts/bump-private-dependencies.js --no-commit",
+    "version": "node ./scripts/align-monorepo-dependencies.js --no-commit",
     "where": "node ./scripts/monorepo/where.js",
     "create-workspace": "node ./scripts/create-workspace.js"
   },

package.json

@@ -1,7 +1,7 @@
 {
   "name": "app-migrations",
   "description": "Helper for application schema migrations.",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "scripts": {
     "check": "npm run lint && npm run depcheck",
     "test": "mocha",
@@ -25,7 +25,7 @@
     "require": "./index.js"
   },
   "dependencies": {
-    "@mongodb-js/compass-logging": "^0.5.0",
+    "@mongodb-js/compass-logging": "^0.6.0",
     "async": "^3.2.0",
     "debug": "4.3.0",
     "lodash": "4.17.15",

packages/app-migrations/package.json

@@ -2,7 +2,7 @@
   "name": "mongodb-collection-model",
   "description": "MongoDB collection model.",
   "author": "Lucas Hrabovsky <[email protected]>",
-  "version": "4.16.0",
+  "version": "4.17.0",
   "bugs": {
     "url": "https://jira.mongodb.org/projects/COMPASS/issues",
     "email": "[email protected]"
@@ -35,7 +35,7 @@
     "mongodb-ns": "^2.2.0"
   },
   "peerDependencies": {
-    "mongodb-data-service": "*"
+    "mongodb-data-service": "^21.15.0"
   },
   "devDependencies": {
     "@mongodb-js/eslint-config-compass": "^0.5.0",
@@ -44,7 +44,7 @@
     "electron-mocha": "^10.1.0",
     "eslint": "^7.25.0",
     "mocha": "^8.4.0",
-    "mongodb-data-service": "^21.14.0",
+    "mongodb-data-service": "^21.15.0",
     "xvfb-maybe": "^0.2.1"
   }
 }

packages/collection-model/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mongodb-js/compass-aggregations",
   "productName": "Aggregations plugin",
-  "version": "8.17.0",
+  "version": "8.18.0",
   "apiVersion": "3.0.0",
   "description": "Compass Aggregation Pipeline Builder",
   "main": "lib/index.js",
@@ -32,22 +32,22 @@
   },
   "license": "SSPL",
   "peerDependencies": {
-    "@mongodb-js/compass-components": "^0.8.0",
-    "@mongodb-js/compass-crud": "*",
-    "@mongodb-js/compass-export-to-language": "*",
-    "@mongodb-js/compass-field-store": "*",
+    "@mongodb-js/compass-components": "^0.9.0",
+    "@mongodb-js/compass-crud": "^12.18.0",
+    "@mongodb-js/compass-export-to-language": "^7.17.0",
+    "@mongodb-js/compass-field-store": "^7.17.0",
     "ace-builds": "^1.4.3",
     "async": "^3.2.0",
     "bson": "*",
     "electron": "^13.5.1",
-    "hadron-react-bson": "*",
-    "hadron-react-buttons": "*",
-    "hadron-react-components": "*",
+    "hadron-react-bson": "^5.7.0",
+    "hadron-react-buttons": "^5.6.0",
+    "hadron-react-components": "^5.9.0",
     "mongodb-ace-autocompleter": "*",
-    "mongodb-ace-mode": "*",
-    "mongodb-ace-theme": "*",
-    "mongodb-data-service": "*",
-    "mongodb-js-metrics": "*",
+    "mongodb-ace-mode": "^1.5.0",
+    "mongodb-ace-theme": "^1.5.0",
+    "mongodb-data-service": "^21.15.0",
+    "mongodb-js-metrics": "^7.6.0",
     "mongodb-query-parser": "^2.4.3",
     "prop-types": "^15.7.2",
     "react": "^16.14.0",
@@ -64,10 +64,10 @@
     "@babel/preset-react": "^7.13.13",
     "@babel/register": "^7.13.16",
     "@hot-loader/react-dom": "^16.9.0",
-    "@mongodb-js/compass-components": "^0.8.0",
-    "@mongodb-js/compass-crud": "^12.17.0",
-    "@mongodb-js/compass-export-to-language": "^7.16.0",
-    "@mongodb-js/compass-field-store": "^7.16.0",
+    "@mongodb-js/compass-components": "^0.9.0",
+    "@mongodb-js/compass-crud": "^12.18.0",
+    "@mongodb-js/compass-export-to-language": "^7.17.0",
+    "@mongodb-js/compass-field-store": "^7.17.0",
     "ace-builds": "^1.4.3",
     "async": "^3.2.0",
     "autoprefixer": "^9.4.10",
@@ -90,12 +90,12 @@
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "file-loader": "^5.1.0",
     "font-awesome": "^4.7.0",
-    "hadron-app": "^4.16.0",
-    "hadron-app-registry": "^8.6.0",
+    "hadron-app": "^4.17.0",
+    "hadron-app-registry": "^8.7.0",
     "hadron-document": "^7.7.0",
     "hadron-react-bson": "^5.7.0",
     "hadron-react-buttons": "^5.6.0",
-    "hadron-react-components": "^5.8.0",
+    "hadron-react-components": "^5.9.0",
     "html-webpack-plugin": "^3.2.0",
     "ignore-loader": "^0.1.2",
     "istanbul-instrumenter-loader": "^3.0.1",
@@ -118,8 +118,8 @@
     "mongodb-ace-autocompleter": "^0.10.0",
     "mongodb-ace-mode": "^1.5.0",
     "mongodb-ace-theme": "^1.5.0",
-    "mongodb-connection-model": "^21.10.0",
-    "mongodb-data-service": "^21.14.0",
+    "mongodb-connection-model": "^21.11.0",
+    "mongodb-data-service": "^21.15.0",
     "mongodb-js-metrics": "^7.6.0",
     "mongodb-query-parser": "^2.4.3",
     "mongodb-reflux-store": "^0.0.1",
@@ -152,8 +152,8 @@
     "webpack-node-externals": "^3.0.0"
   },
   "dependencies": {
-    "@mongodb-js/compass-logging": "^0.5.0",
-    "@mongodb-js/mongodb-redux-common": "^1.6.0",
+    "@mongodb-js/compass-logging": "^0.6.0",
+    "@mongodb-js/mongodb-redux-common": "^1.7.0",
     "acorn-loose": "^8.0.2",
     "astring": "^1.7.0",
     "bson": "*",

packages/compass-aggregations/package.json

@@ -30,7 +30,8 @@ const OPTIONS = {
   minLines: 10,
   maxLines: Infinity,
   showGutter: true,
-  useWorker: false
+  useWorker: false,
+  mode: 'ace/mode/mongodb'
 };
 
 /**
@@ -84,7 +85,7 @@ class ImportPipeline extends PureComponent {
         </div>
         <div className={styles['import-pipeline-editor']}>
           <AceEditor
-            mode="mongodb"
+            mode="javascript" // will be set to mongodb as part of OPTIONS
             theme="mongodb"
             width="100%"
             value={this.props.text}

packages/compass-aggregations/src/components/pipeline/modals/import-pipeline.jsx

@@ -23,7 +23,8 @@ const OPTIONS = {
   minLines: 5,
   maxLines: Infinity,
   showGutter: true,
-  useWorker: false
+  useWorker: false,
+  mode: 'ace/mode/mongodb'
 };
 
 /**
@@ -204,7 +205,7 @@ class StageEditor extends Component {
       <div className={styles['stage-editor-container']}>
         <div className={styles['stage-editor']}>
           <AceEditor
-            mode="mongodb"
+            mode="javascript" // will be set to mongodb as part of OPTIONS
             theme="mongodb"
             width="100%"
             // readOnly={this.props.stageOperator === null}

packages/compass-aggregations/src/components/stage-editor/stage-editor.jsx

@@ -96,6 +96,10 @@ export const STAGE_SPRINKLE_MAPPINGS = {
     link: 'https://docs.mongodb.com/manual/reference/operator/aggregation/facet/#pipe._S_facet',
     tooltip: 'Allows for multiple parellel aggregations to be specified.'
   },
+  $documents: {
+    link: 'https://docs.mongodb.com/v5.1/reference/operator/aggregation/documents/#mongodb-pipeline-pipe.-documents',
+    tooltip: 'Returns literal documents from input values.'
+  },
   $geoNear: {
     link: 'https://docs.mongodb.com/manual/reference/operator/aggregation/geoNear/#pipe._S_geoNear',
     tooltip: 'Returns documents based on proximity to a geospatial point.'