Skip to content

Commit 91c9c86

Browse files
github-actions[bot]github-actions[bot]
committed
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents 6179cb7 + daaf192 commit 91c9c86

File tree

121 files changed

+5193
-3854
lines changed

Some content is hidden

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

121 files changed

+5193
-3854
lines changed

‎.evergreen/buildvariants-and-tasks.in.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ const MAINTAINED_SERVER_VERSIONS = [
110110
{ name: '60x-enterprise', version: '6.0.x-enterprise' },
111111
{ name: '70x-community', version: '7.0.x' },
112112
{ name: '70x-enterprise', version: '7.0.x-enterprise' },
113-
{ name: '80x-community', version: '>= 8.0.0-rc4' },
114-
{ name: '80x-enterprise', version: '>= 8.0.0-rc4-enterprise' },
113+
{ name: '80x-community', version: '8.0.0-rc18' },
114+
{ name: '80x-enterprise', version: '8.0.0-rc18-enterprise' },
115115
];
116116
117117
const TEST_LATEST_ALPHA_SERVER_VERSION = { name: 'latest-alpha', version: 'latest-alpha-enterprise' };

‎.evergreen/buildvariants-and-tasks.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1291,7 +1291,7 @@ tasks:
12911291
compass_distribution: compass
12921292
- func: test-packaged-app
12931293
vars:
1294-
mongodb_version: '>= 8.0.0-rc4'
1294+
mongodb_version: 8.0.0-rc18
12951295
compass_distribution: compass
12961296
e2e_test_groups: 3
12971297
e2e_test_group: 1
@@ -1314,7 +1314,7 @@ tasks:
13141314
compass_distribution: compass
13151315
- func: test-packaged-app
13161316
vars:
1317-
mongodb_version: '>= 8.0.0-rc4'
1317+
mongodb_version: 8.0.0-rc18
13181318
compass_distribution: compass
13191319
e2e_test_groups: 3
13201320
e2e_test_group: 2
@@ -1337,7 +1337,7 @@ tasks:
13371337
compass_distribution: compass
13381338
- func: test-packaged-app
13391339
vars:
1340-
mongodb_version: '>= 8.0.0-rc4'
1340+
mongodb_version: 8.0.0-rc18
13411341
compass_distribution: compass
13421342
e2e_test_groups: 3
13431343
e2e_test_group: 3
@@ -1360,7 +1360,7 @@ tasks:
13601360
compass_distribution: compass
13611361
- func: test-packaged-app
13621362
vars:
1363-
mongodb_version: '>= 8.0.0-rc4-enterprise'
1363+
mongodb_version: 8.0.0-rc18-enterprise
13641364
compass_distribution: compass
13651365
e2e_test_groups: 3
13661366
e2e_test_group: 1
@@ -1383,7 +1383,7 @@ tasks:
13831383
compass_distribution: compass
13841384
- func: test-packaged-app
13851385
vars:
1386-
mongodb_version: '>= 8.0.0-rc4-enterprise'
1386+
mongodb_version: 8.0.0-rc18-enterprise
13871387
compass_distribution: compass
13881388
e2e_test_groups: 3
13891389
e2e_test_group: 2
@@ -1406,7 +1406,7 @@ tasks:
14061406
compass_distribution: compass
14071407
- func: test-packaged-app
14081408
vars:
1409-
mongodb_version: '>= 8.0.0-rc4-enterprise'
1409+
mongodb_version: 8.0.0-rc18-enterprise
14101410
compass_distribution: compass
14111411
e2e_test_groups: 3
14121412
e2e_test_group: 3

‎.evergreen/functions.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ functions:
695695
eval $(.evergreen/print-compass-env.sh)
696696
rm -rf mongodb-crypt && mkdir -p mongodb-crypt
697697
(cd mongodb-crypt && \
698-
curl -sSfL $(npx -y mongodb-download-url --enterprise --crypt_shared --version '>= 7.0.0-rc0') | \
698+
curl -sSfL $(npx -y mongodb-download-url --enterprise --crypt_shared --version '>= 8.0.0-rc18') | \
699699
tar -xvz)
700700
export COMPASS_CRYPT_LIBRARY_PATH=$(echo $PWD/mongodb-crypt/lib/mongo_*_v1.*)
701701
npm run test-csfle --workspace mongodb-data-service

‎THIRD-PARTY-NOTICES.md‎

Lines changed: 39 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
The following third-party software is used by and included in **Mongodb Compass**.
2-
This document was automatically generated on Sun Sep 01 2024.
2+
This document was automatically generated on Wed Sep 04 2024.
33

44
## List of dependencies
55

@@ -220,6 +220,7 @@ This document was automatically generated on Sun Sep 01 2024.
220220
| **[crelt](#9eba7acaba2af9d27a0a18fcf40d1f133ffa888d85321e4633e7dac58cab2db9)** | 1.0.5 | MIT |
221221
| **[cross-fetch](#2cd4375069c47bf89a4b399cd21cd9573086803b2cb9fc56c29df5a598e051e5)** | 3.1.8 | MIT |
222222
| **[cross-spawn](#67de3a765808182ee1018c35bc07d7a023a8d645e98cc32814dcac2fc2c427ff)** | 7.0.3 | MIT |
223+
| **[css-loader](#36a5fb6f554559a2f884527f4dd7aa81131ccc3b1aee899472cfec2eda765798)** | 4.3.0 | MIT |
223224
| **[d3-flextree](#d4848a862048d0f4733db2a8631b802f3b5f86f2d4a1efb77fc8b8cf9a06bf73)** | 2.1.2 | WTFPL |
224225
| **[d3-hierarchy](#e718643319205524a77c56ca75dcbf37e3975cc5e187760d1eef01cdd94a7d74)** | 1.1.9 | BSD-3-Clause |
225226
| **[d3-timer](#8d462b04307bb707afc68fb60de32526091852b278fc753ebd023aee6ac2faac)** | 1.0.3 | BSD-3-Clause |
@@ -463,7 +464,7 @@ This document was automatically generated on Sun Sep 01 2024.
463464
| **[modify-filename](#7153be07939379ccf0072006c519fba2bdf5ab79ca8bb59bc5273f87a7bacbf6)** | 1.1.0 | MIT |
464465
| **[moment](#94975b5423311209f3beed9c2c6bb6157f622312a3f8563d507b52e804bf6285)** | 2.29.4 | MIT |
465466
| **[mongodb-build-info](#f0a98c22ae0766702726f79e058ac6dc4e4bead8557b67b816f40bd13fb54170)** | 1.7.2 | Apache-2.0 |
466-
| **[mongodb-client-encryption](#42ba122fc0db7791e33e6160aff7213f42c4a34a8e891e78cd07c606555c2bb9)** | 6.0.1 | Apache-2.0 |
467+
| **[mongodb-client-encryption](#01c104ff07b0715f77217b6b7adfc9a0056f35ffd976182ffbf409f69b3a0df3)** | 6.1.0 | Apache-2.0 |
467468
| **[mongodb-cloud-info](#a784f3b401cf51746f49964e044db933529b3e3791e557702715730f5a3f1e46)** | 2.1.2 | Apache-2.0 |
468469
| **[mongodb-connection-string-url](#2e1146256a89ebd24e3398881e03807fe363d58444e6b7952ea50bd6108707bc)** | 3.0.1 | Apache-2.0 |
469470
| **[mongodb-log-writer](#c4945018f8490fc8e56e1414e262fcf1b802800e05cd15f2bd6b7a9d0b94af85)** | 1.4.2 | Apache-2.0 |
@@ -628,7 +629,7 @@ This document was automatically generated on Sun Sep 01 2024.
628629
| **[web-vitals](#66d3585417e14f352ce331e44fe42a97c4d03073d014efd601538735085f84fe)** | 2.1.2 | Apache-2.0 |
629630
| **[webidl-conversions](#3604b2bfa479706fe7bd8068257240d32158704a3bffae30b414963343027aa1)** | 3.0.1 | BSD-2-Clause |
630631
| **[webidl-conversions](#cb7c681998e7ee3c598e6e37432bcf448946924eefe816636c3cb122bae46e1c)** | 7.0.0 | BSD-2-Clause |
631-
| **[webpack](#8dbc54dc0141efcafedd2d56c323beabf51695eec4089fa9e1c23fb1085ce9d2)** | 5.86.0 | MIT |
632+
| **[webpack](#bd55cdb69f5b1b336d12c3f00d849ccb1f2c39987c257c89027d6a790f947496)** | 5.94.0 | MIT |
632633
| **[whatwg-url](#5d2cdcc7276796013d4573d401d239ff04971bb5a44fbb0e1bc62cae6f5ca911)** | 11.0.0 | MIT |
633634
| **[whatwg-url](#3a968d9d3fed498fc1edf2f65459cc89b6a2fea277b5c9b5c3f3a0b41390835a)** | 13.0.0 | MIT |
634635
| **[whatwg-url](#cd3f81c4a0fd856ab1d9c9fc99c1d7eaf2c12c4867b218e9901e5020a1ffcd85)** | 5.0.0 | MIT |
@@ -18305,6 +18306,37 @@ License files:
1830518306
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
1830618307
THE SOFTWARE.
1830718308

18309+
<a id="36a5fb6f554559a2f884527f4dd7aa81131ccc3b1aee899472cfec2eda765798"></a>
18310+
18311+
### [css-loader](https://www.npmjs.com/package/css-loader) (version 4.3.0)
18312+
18313+
License tags: MIT
18314+
18315+
License files:
18316+
18317+
- LICENSE:
18318+
18319+
Copyright JS Foundation and other contributors
18320+
18321+
Permission is hereby granted, free of charge, to any person obtaining
18322+
a copy of this software and associated documentation files (the
18323+
'Software'), to deal in the Software without restriction, including
18324+
without limitation the rights to use, copy, modify, merge, publish,
18325+
distribute, sublicense, and/or sell copies of the Software, and to
18326+
permit persons to whom the Software is furnished to do so, subject to
18327+
the following conditions:
18328+
18329+
The above copyright notice and this permission notice shall be
18330+
included in all copies or substantial portions of the Software.
18331+
18332+
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
18333+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18334+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
18335+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
18336+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
18337+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
18338+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
18339+
1830818340
<a id="d4848a862048d0f4733db2a8631b802f3b5f86f2d4a1efb77fc8b8cf9a06bf73"></a>
1830918341

1831018342
### [d3-flextree](https://www.npmjs.com/package/d3-flextree) (version 2.1.2)
@@ -27416,9 +27448,9 @@ License files:
2741627448
See the License for the specific language governing permissions and
2741727449
limitations under the License.
2741827450

27419-
<a id="42ba122fc0db7791e33e6160aff7213f42c4a34a8e891e78cd07c606555c2bb9"></a>
27451+
<a id="01c104ff07b0715f77217b6b7adfc9a0056f35ffd976182ffbf409f69b3a0df3"></a>
2742027452

27421-
### [mongodb-client-encryption](https://www.npmjs.com/package/mongodb-client-encryption) (version 6.0.1)
27453+
### [mongodb-client-encryption](https://www.npmjs.com/package/mongodb-client-encryption) (version 6.1.0)
2742227454

2742327455
License tags: Apache-2.0
2742427456

@@ -40653,9 +40685,9 @@ License files:
4065340685

4065440686
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4065540687

40656-
<a id="8dbc54dc0141efcafedd2d56c323beabf51695eec4089fa9e1c23fb1085ce9d2"></a>
40688+
<a id="bd55cdb69f5b1b336d12c3f00d849ccb1f2c39987c257c89027d6a790f947496"></a>
4065740689

40658-
### [webpack](https://www.npmjs.com/package/webpack) (version 5.86.0)
40690+
### [webpack](https://www.npmjs.com/package/webpack) (version 5.94.0)
4065940691

4066040692
License tags: MIT
4066140693

‎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.5",
3+
"version": "1.1.6",
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.19",
19+
"@mongodb-js/eslint-plugin-compass": "^1.0.20",
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.19",
16+
"version": "1.0.20",
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.4.0",
40+
"@mongodb-js/mocha-config-compass": "^1.4.1",
4141
"@mongodb-js/prettier-config-compass": "^1.0.2",
4242
"depcheck": "^1.4.1",
4343
"eslint": "^7.25.0",

‎configs/mocha-config-compass/index.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
const path = require('path');
44
const base = require('@mongodb-js/mocha-config-devtools');
55

6-
const fs = require('fs');
7-
86
module.exports = {
97
...base,
108
reporter: path.resolve(__dirname, 'reporter.js'),
119
require: [
10+
path.resolve(__dirname, 'register', 'mute-console-warnings-register.js'),
1211
...base.require,
1312
path.resolve(__dirname, 'register', 'resolve-from-source-register.js'),
1413
path.resolve(__dirname, 'register', 'node-env-register.js'),

‎configs/mocha-config-compass/package.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mongodb-js/mocha-config-compass",
3-
"version": "1.4.0",
3+
"version": "1.4.1",
44
"description": "Shared mocha mocha configuration for Compass packages",
55
"license": "SSPL",
66
"main": "index.js",
@@ -24,15 +24,13 @@
2424
"access": "public"
2525
},
2626
"dependencies": {
27-
"@mongodb-js/mocha-config-devtools": "^1.0.0",
2827
"@electron/remote": "^2.1.2",
28+
"@mongodb-js/mocha-config-devtools": "^1.0.4",
2929
"@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
3030
"chai": "^4.3.4",
3131
"chai-dom": "^1.9.0",
3232
"chai-enzyme": "^1.0.0-beta.1",
3333
"enzyme": "^3.11.0",
34-
"global-jsdom": "^8.3.0",
35-
"jsdom": "^21.1.0",
3634
"identity-obj-proxy": "^3.0.0",
3735
"react-16-node-hanging-test-fix": "^1.0.0",
3836
"sinon-chai": "^3.7.0",

‎configs/mocha-config-compass/react.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ const base = require('@mongodb-js/mocha-config-devtools/react');
66
module.exports = {
77
...base,
88
require: [
9+
path.resolve(__dirname, 'register', 'mute-console-warnings-register.js'),
910
...base.require,
1011
path.resolve(__dirname, 'register', 'resolve-from-source-register.js'),
1112
path.resolve(__dirname, 'register', 'jsdom-extra-mocks-register.js'),

‎configs/mocha-config-compass/register/mute-console-warnings-register.js‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
// A bunch of leafygreen / React messages that only generate noise in tests
2+
// without being meaningfully actionable for us
3+
const ignoreLeafygreenWarnings = [
4+
/validateDOMNesting\(/,
5+
/Failed (prop|%s) type/,
6+
/recommend using the Leafygreen/,
7+
/The property `aria-controls` is required/,
8+
/For screen-reader accessibility, label or aria-labelledby/,
9+
[
10+
/Can't perform a React state update/,
11+
/./,
12+
/@leafygreen-ui\/(tooltip|toast)/,
13+
],
14+
/react-16-node-hanging-test-fix/,
15+
];
16+
17+
const console = globalThis.console;
18+
19+
for (const method of ['warn', 'error']) {
20+
/* eslint-disable no-console */
21+
const fn = console[method];
22+
console[method] = function (...args) {
23+
if (typeof args[0] === 'string') {
24+
if (
25+
ignoreLeafygreenWarnings.some((regex) => {
26+
return Array.isArray(regex)
27+
? regex.every((r, index) => {
28+
return r.test(args[index]);
29+
})
30+
: regex.test(args[0]);
31+
})
32+
) {
33+
return;
34+
}
35+
}
36+
return fn.apply(this, args);
37+
};
38+
/* eslint-enable no-console */
39+
}

0 commit comments

Comments
 (0)