Skip to content

Commit ebaec8e

Browse files
gribnoysupgribnoysup
committed
Merge remote-tracking branch 'origin/main' into 1.38-releases
2 parents 26d9b0b + b0f8c25 commit ebaec8e

File tree

98 files changed

+7152
-3781
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+7152
-3781
lines changed

‎.evergreen/functions.yml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,8 +569,10 @@ functions:
569569
# Load environment variables
570570
eval $(.evergreen/print-compass-env.sh)
571571
572-
# Can only fail if is not a patch, including release branches:
573-
npm run generate-vulnerability-report || { [ "$EVERGREEN_IS_PATCH" == "true" ] && exit 0; } || exit 1
572+
set +e
573+
npm run generate-vulnerability-report
574+
return_code=$?
575+
set -e
574576
575577
# Runs for all the commits on main, including nightly builds:
576578
if [[ "$EVERGREEN_IS_PATCH" != "true" ]] && [[ "${project}" == "10gen-compass-main" ]]; then
@@ -579,6 +581,13 @@ functions:
579581
export JIRA_VULNERABILITY_BUILD_INFO="- [Evergreen task|$EVERGREEN_TASK_URL]"
580582
581583
npm run create-vulnerability-tickets
584+
else
585+
cat .sbom/vulnerability-report.md
586+
fi
587+
588+
# Fails if the report failed and is not a patch, including release branches:
589+
if [[ "$EVERGREEN_IS_PATCH" != "true" ]]; then
590+
exit $return_code
582591
fi
583592
- command: s3.put
584593
params:

‎THIRD-PARTY-NOTICES.md‎

Lines changed: 4167 additions & 430 deletions
Large diffs are not rendered by default.

‎package-lock.json‎

Lines changed: 1673 additions & 1908 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/collection-model/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "mongodb-collection-model",
33
"description": "MongoDB collection model",
44
"author": "Lucas Hrabovsky <[email protected]>",
5-
"version": "5.7.0",
5+
"version": "5.8.0",
66
"bugs": {
77
"url": "https://jira.mongodb.org/projects/COMPASS/issues",
88
"email": "[email protected]"
@@ -34,7 +34,7 @@
3434
"mongodb-ns": "^2.4.0"
3535
},
3636
"peerDependencies": {
37-
"mongodb-data-service": "^22.7.0"
37+
"mongodb-data-service": "^22.8.0"
3838
},
3939
"devDependencies": {
4040
"@mongodb-js/eslint-config-compass": "^1.0.6",
@@ -43,7 +43,7 @@
4343
"electron-mocha": "^10.1.0",
4444
"eslint": "^7.25.0",
4545
"mocha": "^10.2.0",
46-
"mongodb-data-service": "^22.7.0",
46+
"mongodb-data-service": "^22.8.0",
4747
"xvfb-maybe": "^0.2.1"
4848
}
4949
}

‎packages/compass-aggregations/package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@mongodb-js/compass-aggregations",
33
"productName": "Aggregations plugin",
4-
"version": "9.10.0",
4+
"version": "9.11.0",
55
"apiVersion": "3.0.0",
66
"description": "Compass Aggregation Pipeline Builder",
77
"main": "dist/index.js",
@@ -38,15 +38,15 @@
3838
},
3939
"license": "SSPL",
4040
"peerDependencies": {
41-
"@mongodb-js/compass-components": "^1.9.0",
42-
"@mongodb-js/compass-crud": "^13.9.0",
43-
"@mongodb-js/compass-editor": "^0.8.0",
41+
"@mongodb-js/compass-components": "^1.10.0",
42+
"@mongodb-js/compass-crud": "^13.10.0",
43+
"@mongodb-js/compass-editor": "^0.9.0",
4444
"@mongodb-js/compass-logging": "^1.1.6",
4545
"@mongodb-js/compass-utils": "^0.3.1",
4646
"@mongodb-js/mongodb-constants": "^0.6.0",
4747
"@mongodb-js/mongodb-redux-common": "^2.0.8",
4848
"bson": "^5.2.0",
49-
"compass-preferences-model": "^2.9.0",
49+
"compass-preferences-model": "^2.10.0",
5050
"hadron-type-checker": "^7.0.3",
5151
"hadron-document": "^8.2.1",
5252
"react": "^17.0.2"
@@ -79,7 +79,7 @@
7979
"lodash": "^4.17.21",
8080
"mocha": "^10.2.0",
8181
"mongodb": "^5.5.0",
82-
"mongodb-data-service": "^22.7.0",
82+
"mongodb-data-service": "^22.8.0",
8383
"mongodb-ns": "^2.4.0",
8484
"mongodb-query-parser": "^2.5.0",
8585
"nyc": "^15.1.0",
@@ -97,15 +97,15 @@
9797
"react-intersection-observer": "^8.34.0"
9898
},
9999
"dependencies": {
100-
"@mongodb-js/compass-components": "^1.9.0",
101-
"@mongodb-js/compass-crud": "^13.9.0",
102-
"@mongodb-js/compass-editor": "^0.8.0",
100+
"@mongodb-js/compass-components": "^1.10.0",
101+
"@mongodb-js/compass-crud": "^13.10.0",
102+
"@mongodb-js/compass-editor": "^0.9.0",
103103
"@mongodb-js/compass-logging": "^1.1.6",
104104
"@mongodb-js/compass-utils": "^0.3.1",
105105
"@mongodb-js/mongodb-constants": "^0.6.0",
106106
"@mongodb-js/mongodb-redux-common": "^2.0.8",
107107
"bson": "^5.2.0",
108-
"compass-preferences-model": "^2.9.0",
108+
"compass-preferences-model": "^2.10.0",
109109
"hadron-type-checker": "^7.0.3",
110110
"hadron-document": "^8.2.1"
111111
},

‎packages/compass-app-stores/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"email": "[email protected]"
1313
},
1414
"homepage": "https://github.com/mongodb-js/compass",
15-
"version": "0.3.0",
15+
"version": "0.4.0",
1616
"repository": {
1717
"type": "git",
1818
"url": "https://github.com/mongodb-js/compass.git"
@@ -77,9 +77,9 @@
7777
"xvfb-maybe": "^0.2.1"
7878
},
7979
"dependencies": {
80-
"mongodb-instance-model": "^12.7.0"
80+
"mongodb-instance-model": "^12.8.0"
8181
},
8282
"peerDependencies": {
83-
"mongodb-instance-model": "^12.7.0"
83+
"mongodb-instance-model": "^12.8.0"
8484
}
8585
}

‎packages/compass-collection/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"email": "[email protected]"
1515
},
1616
"homepage": "https://github.com/mongodb-js/compass",
17-
"version": "4.9.0",
17+
"version": "4.10.0",
1818
"apiVersion": "3.0.0",
1919
"repository": {
2020
"type": "git",
@@ -56,19 +56,19 @@
5656
"reformat": "npm run prettier -- --write . && npm run eslint . --fix"
5757
},
5858
"peerDependencies": {
59-
"@mongodb-js/compass-components": "^1.9.0",
59+
"@mongodb-js/compass-components": "^1.10.0",
6060
"@mongodb-js/compass-logging": "^1.1.6",
6161
"bson": "^5.2.0",
62-
"compass-preferences-model": "^2.8.0",
62+
"compass-preferences-model": "^2.10.0",
6363
"hadron-app-registry": "^9.0.6",
6464
"hadron-ipc": "^3.1.2",
6565
"react": "^17.0.2"
6666
},
6767
"dependencies": {
68-
"@mongodb-js/compass-components": "^1.9.0",
68+
"@mongodb-js/compass-components": "^1.10.0",
6969
"@mongodb-js/compass-logging": "^1.1.6",
7070
"bson": "^5.2.0",
71-
"compass-preferences-model": "^2.8.0",
71+
"compass-preferences-model": "^2.10.0",
7272
"hadron-app-registry": "^9.0.6",
7373
"hadron-ipc": "^3.1.2"
7474
},
@@ -93,8 +93,8 @@
9393
"lodash": "^4.17.21",
9494
"mocha": "^10.2.0",
9595
"mongodb": "^5.5.0",
96-
"mongodb-collection-model": "^5.7.0",
97-
"mongodb-data-service": "^22.7.0",
96+
"mongodb-collection-model": "^5.8.0",
97+
"mongodb-data-service": "^22.8.0",
9898
"mongodb-ns": "^2.4.0",
9999
"numeral": "^2.0.6",
100100
"nyc": "^15.1.0",

‎packages/compass-components/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mongodb-js/compass-components",
3-
"version": "1.9.0",
3+
"version": "1.10.0",
44
"description": "React Components used in Compass",
55
"license": "SSPL",
66
"main": "lib/index.js",

‎packages/compass-connection-import-export/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"email": "[email protected]"
1515
},
1616
"homepage": "https://github.com/mongodb-js/compass",
17-
"version": "0.7.0",
17+
"version": "0.8.0",
1818
"repository": {
1919
"type": "git",
2020
"url": "https://github.com/mongodb-js/compass.git"
@@ -51,16 +51,16 @@
5151
"reformat": "npm run prettier -- --write . && npm run eslint . --fix"
5252
},
5353
"peerDependencies": {
54-
"@mongodb-js/compass-components": "^1.9.0",
54+
"@mongodb-js/compass-components": "^1.10.0",
5555
"hadron-ipc": "^3.1.3",
56-
"mongodb-data-service": "^22.7.0",
56+
"mongodb-data-service": "^22.8.0",
5757
"react": "^17.0.2"
5858
},
5959
"dependencies": {
6060
"@electron/remote": "^2.0.9",
61-
"@mongodb-js/compass-components": "^1.9.0",
61+
"@mongodb-js/compass-components": "^1.10.0",
6262
"hadron-ipc": "^3.1.3",
63-
"mongodb-data-service": "^22.7.0"
63+
"mongodb-data-service": "^22.8.0"
6464
},
6565
"devDependencies": {
6666
"@mongodb-js/eslint-config-compass": "^1.0.6",
@@ -76,7 +76,7 @@
7676
"@types/react-dom": "^17.0.10",
7777
"@types/sinon-chai": "^3.2.5",
7878
"chai": "^4.3.6",
79-
"compass-preferences-model": "^2.9.0",
79+
"compass-preferences-model": "^2.10.0",
8080
"depcheck": "^1.4.1",
8181
"eslint": "^7.25.0",
8282
"gen-esm-wrapper": "^1.1.0",

‎packages/compass-connections/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"email": "[email protected]"
1414
},
1515
"homepage": "https://github.com/mongodb-js/compass",
16-
"version": "1.10.0",
16+
"version": "1.11.0",
1717
"repository": {
1818
"type": "git",
1919
"url": "https://github.com/mongodb-js/compass.git"
@@ -48,24 +48,24 @@
4848
"reformat": "npm run prettier -- --write . && npm run eslint . --fix"
4949
},
5050
"peerDependencies": {
51-
"@mongodb-js/compass-components": "^1.9.0",
51+
"@mongodb-js/compass-components": "^1.10.0",
5252
"hadron-ipc": "^3.1.3",
53-
"mongodb-data-service": "^22.7.0",
53+
"mongodb-data-service": "^22.8.0",
5454
"react": "^17.0.2"
5555
},
5656
"dependencies": {
57-
"@mongodb-js/compass-connection-import-export": "^0.7.0",
57+
"@mongodb-js/compass-connection-import-export": "^0.8.0",
5858
"@mongodb-js/compass-logging": "^1.1.6",
5959
"@mongodb-js/compass-utils": "^0.3.1",
60-
"@mongodb-js/connection-form": "^1.9.0",
60+
"@mongodb-js/connection-form": "^1.10.0",
6161
"hadron-ipc": "^3.1.3",
6262
"lodash": "^4.17.21",
6363
"mongodb": "^5.5.0",
6464
"uuid": "^8.2.0"
6565
},
6666
"devDependencies": {
67-
"@mongodb-js/compass-components": "^1.9.0",
68-
"@mongodb-js/compass-maybe-protect-connection-string": "^0.7.0",
67+
"@mongodb-js/compass-components": "^1.10.0",
68+
"@mongodb-js/compass-maybe-protect-connection-string": "^0.8.0",
6969
"@mongodb-js/eslint-config-compass": "^1.0.6",
7070
"@mongodb-js/mocha-config-compass": "^1.2.0",
7171
"@mongodb-js/prettier-config-compass": "^1.0.0",
@@ -87,7 +87,7 @@
8787
"mongodb-build-info": "^1.5.0",
8888
"mongodb-cloud-info": "^1.1.4",
8989
"mongodb-connection-string-url": "^2.6.0",
90-
"mongodb-data-service": "^22.7.0",
90+
"mongodb-data-service": "^22.8.0",
9191
"nyc": "^15.1.0",
9292
"prettier": "^2.7.1",
9393
"react": "^17.0.2",

0 commit comments

Comments
 (0)