Skip to content

Commit b5ead3e

Browse files
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents bc43189 + f21edd3 commit b5ead3e

File tree

239 files changed

+9457
-5541
lines changed

Some content is hidden

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

239 files changed

+9457
-5541
lines changed

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,4 @@ Mingjun Yin <[email protected]>
8888
Ben Radcliffe <[email protected]>
8989
Betsy Button <[email protected]>
9090
Vivian Xiao <[email protected]>
91+
admin-token-bot <[email protected]>

THIRD-PARTY-NOTICES.md

Lines changed: 1201 additions & 245 deletions
Large diffs are not rendered by default.

configs/eslint-config-compass/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mongodb-js/eslint-config-compass",
3-
"version": "1.1.3",
3+
"version": "1.1.4",
44
"description": "Shared Compass eslint configuration",
55
"license": "SSPL",
66
"main": "index.js",
@@ -16,7 +16,7 @@
1616
"@babel/core": "^7.21.4",
1717
"@babel/eslint-parser": "^7.14.3",
1818
"@mongodb-js/eslint-config-devtools": "^0.9.9",
19-
"@mongodb-js/eslint-plugin-compass": "^1.0.17",
19+
"@mongodb-js/eslint-plugin-compass": "^1.0.18",
2020
"@typescript-eslint/eslint-plugin": "^5.59.0",
2121
"@typescript-eslint/parser": "^5.59.0",
2222
"eslint-config-prettier": "^8.3.0",

configs/eslint-plugin-compass/package.json

Lines changed: 2 additions & 2 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.0.17",
16+
"version": "1.0.18",
1717
"repository": {
1818
"type": "git",
1919
"url": "https://github.com/mongodb-js/compass.git"
@@ -37,7 +37,7 @@
3737
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
3838
},
3939
"devDependencies": {
40-
"@mongodb-js/mocha-config-compass": "^1.3.9",
40+
"@mongodb-js/mocha-config-compass": "^1.3.10",
4141
"@mongodb-js/prettier-config-compass": "^1.0.2",
4242
"depcheck": "^1.4.1",
4343
"eslint": "^7.25.0",

configs/mocha-config-compass/main-process.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22
const { initialize, enable } = require('@electron/remote/main');
3-
const { app } = require('electron');
3+
const { app, safeStorage } = require('electron');
44
app.on('web-contents-created', function (_, webContents) {
55
enable(webContents);
66
});
@@ -14,4 +14,4 @@ initialize();
1414
process.env.COMPASS_TEST_USE_PREFERENCES_SANDBOX =
1515
process.env.COMPASS_TEST_USE_PREFERENCES_SANDBOX ?? 'true';
1616
// NB: Not adding this as a dep in package.json to avoid circular dependency
17-
require('compass-preferences-model').setupPreferences();
17+
require('compass-preferences-model').setupPreferences(undefined, safeStorage);

configs/mocha-config-compass/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/mocha-config-compass",
3-
"version": "1.3.9",
3+
"version": "1.3.10",
44
"description": "Shared mocha mocha configuration for Compass packages",
55
"license": "SSPL",
66
"main": "index.js",

configs/webpack-config-compass/package.json

Lines changed: 2 additions & 2 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.3.14",
16+
"version": "1.3.15",
1717
"repository": {
1818
"type": "git",
1919
"url": "https://github.com/mongodb-js/compass.git"
@@ -45,7 +45,7 @@
4545
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
4646
},
4747
"devDependencies": {
48-
"@mongodb-js/eslint-config-compass": "^1.1.3",
48+
"@mongodb-js/eslint-config-compass": "^1.1.4",
4949
"@mongodb-js/prettier-config-compass": "^1.0.2",
5050
"@mongodb-js/tsconfig-compass": "^1.0.4",
5151
"@types/cli-progress": "^3.9.2",

0 commit comments

Comments
 (0)