Skip to content

Commit 2ae3846

Browse files
committed
Merge branch 'main' into 1.31-releases
2 parents 4fd3a19 + 617205f commit 2ae3846

File tree

249 files changed

+12158
-4640
lines changed

Some content is hidden

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

249 files changed

+12158
-4640
lines changed

.github/workflows/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ jobs:
102102
packages/compass/dist/*.tar.gz
103103
packages/compass/dist/*.json
104104
105-
- name: Upload Spectron Logs
105+
- name: Upload Webdriverio Logs
106106
uses: actions/upload-artifact@v2
107107
# even if tests succeeded you might still want to examine logs
108108
if: always()
109109
with:
110-
name: Spectron Debug Files ${{ github.workflow }} ${{ runner.os }}
110+
name: Webdriverio Debug Files ${{ github.workflow }} ${{ runner.os }}
111111
path: packages/compass-e2e-tests/.log/**/*

.github/workflows/check-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
check-and-test:
1717
name: Check and Test
1818

19-
timeout-minutes: 45
19+
timeout-minutes: 60
2020

2121
strategy:
2222
matrix:

.vscode/extentions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"recommendations": [
33
"dbaeumer.vscode-eslint",
44
"esbenp.prettier-vscode",
5-
"mike-lischke.vscode-antlr4"
5+
"mike-lischke.vscode-antlr4",
6+
"ryanluker.vscode-coverage-gutters"
67
]
78
}

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,4 @@ Grimmer <[email protected]>
5858
Vladimir Isakov <[email protected]>
5959
6060
Leonardo Rossi <[email protected]>
61+
Neil Shweky <[email protected]>

THIRD-PARTY-NOTICES.md

Lines changed: 55 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
The following third-party software is used by and included in **compass**.
2-
This document was automatically generated on Mon Jan 17 2022.
2+
This document was automatically generated on Wed Jan 26 2022.
33

44
## List of dependencies
55

66
Package|Version|License
77
-------|-------|-------
8-
**[@mongosh/node-runtime-worker-thread](#d11756cc34bb1e4ff8b25e0ba2e5687f96fd1eaf9906a375ff7b4f4c221ec722)**|1.1.8|Apache-2.0
8+
**[@mongosh/node-runtime-worker-thread](#e76b1351c660a63528d2b8a0e356450b46c4c0dbed9e8b19242e7d686a2449ab)**|1.1.9|Apache-2.0
99
**[ansi-regex](#945d39147a145d6a28d87154006fa731c2e69d2a19e76cc7012624a1109f9317)**|2.1.1|MIT
1010
**[ansi-regex](#f4a8a360dfe3cdd0cbb8fcfa0cff23bb22eafa4225343577912ddf831d670411)**|3.0.0|MIT
1111
**[aproba](#b8b30f42274956b772cec4ea9f13cebaa5900724e514eaf0098a3ad6f1f7f16e)**|1.2.0|ISC
@@ -30,6 +30,7 @@ Package|Version|License
3030
**[inherits](#3eafa9bfb872baf192e837ab771da2e95e983ee682371a2b1c579e518e96f7b4)**|2.0.4|ISC
3131
**[ini](#2269ab4bd2e1fa90571f520780ab5499f6d49da3b7daee9b9dfdad9e93c33a18)**|1.3.8|ISC
3232
**[interruptor](#d6fd68c71b18a07f39270565100f4a6c1351ecdeca77766cde73da8315ff695a)**|1.0.1|Apache-2.0
33+
**[ipv6-normalize](#7a4346dbf206011966449898fcd37178a9be89acf6dff120b676d4c4d0dec203)**|1.0.1|MIT
3334
**[is-fullwidth-code-point](#4b36fcbed647fcfb1016159ad5d4b5399c52c3fe258134e06275ab22ed10ceb9)**|1.0.0|MIT
3435
**[is-fullwidth-code-point](#37e66573b7442d1313698f6e836d77c2b42ea4625ea9f6da41c091c6e5a8f30d)**|2.0.0|MIT
3536
**[isarray](#dd5060a7691a8157c413dadfba4ff4c1de7480dcfd6d34af69a9696558358cec)**|1.0.0|MIT
@@ -48,6 +49,7 @@ Package|Version|License
4849
**[number-is-nan](#044063cb59ac16c3146a6aa01521f5bd00ae1e6c7a197f31df253f357faf9f75)**|1.0.1|MIT
4950
**[object-assign](#598e372231bb5bef26b7d61105282eb20e14ade430143052d064d2d406769b95)**|4.1.1|MIT
5051
**[once](#d0d1303998dfae04e4f898f477380aac35568f4d6679f4ea913c2441cf9ebb0b)**|1.4.0|ISC
52+
**[os-dns-native](#ba8dc45d4ba1cab6cd3a45e6be7d62e9a77da5e07fa33324e930bdeabafd5718)**|1.1.1|MIT
5153
**[prebuild-install](#a9493a602227065e2247bd0f1087615024e9e96d36d1bd1e70b8db5292f7bdda)**|6.1.2|MIT
5254
**[process-nextick-args](#449a33b1fb1386db92b40df9073f48703b67ff05c4da5043d007fdb90ed76aca)**|2.0.1|MIT
5355
**[pump](#147f1bd3a6380306e696f0574feda0b1490121a1d12e4500e91ffb6e888ffa3a)**|3.0.0|MIT
@@ -75,8 +77,8 @@ Package|Version|License
7577

7678
## Package details
7779

78-
<a id="d11756cc34bb1e4ff8b25e0ba2e5687f96fd1eaf9906a375ff7b4f4c221ec722"></a>
79-
### [@mongosh/node-runtime-worker-thread](https://www.npmjs.com/package/@mongosh/node-runtime-worker-thread) (version 1.1.8)
80+
<a id="e76b1351c660a63528d2b8a0e356450b46c4c0dbed9e8b19242e7d686a2449ab"></a>
81+
### [@mongosh/node-runtime-worker-thread](https://www.npmjs.com/package/@mongosh/node-runtime-worker-thread) (version 1.1.9)
8082
<!-- initially found at node_modules/@mongosh/node-runtime-worker-thread -->
8183
> MongoDB shell runtime that lives in a worker thread
8284
@@ -1411,6 +1413,17 @@ Authors:
14111413
* Anna Henningsen <[email protected]>
14121414

14131415

1416+
<a id="7a4346dbf206011966449898fcd37178a9be89acf6dff120b676d4c4d0dec203"></a>
1417+
### [ipv6-normalize](https://www.npmjs.com/package/ipv6-normalize) (version 1.0.1)
1418+
<!-- initially found at node_modules/ipv6-normalize -->
1419+
> ipv6-normalize
1420+
1421+
License tags: MIT
1422+
1423+
Authors:
1424+
* Po-Ying Chen <[email protected]> (陳柏穎)
1425+
1426+
14141427
<a id="4b36fcbed647fcfb1016159ad5d4b5399c52c3fe258134e06275ab22ed10ceb9"></a>
14151428
### [is-fullwidth-code-point](https://www.npmjs.com/package/is-fullwidth-code-point) (version 1.0.0)
14161429
<!-- initially found at node_modules/gauge/node_modules/is-fullwidth-code-point -->
@@ -2843,6 +2856,44 @@ Authors:
28432856
* Isaac Z. Schlueter <[email protected]> (http://blog.izs.me/)
28442857

28452858

2859+
<a id="ba8dc45d4ba1cab6cd3a45e6be7d62e9a77da5e07fa33324e930bdeabafd5718"></a>
2860+
### [os-dns-native](https://www.npmjs.com/package/os-dns-native) (version 1.1.1)
2861+
<!-- initially found at node_modules/os-dns-native -->
2862+
> Perform DNS queries using OS APIs
2863+
2864+
License tags: MIT
2865+
2866+
License files:
2867+
* LICENSE:
2868+
2869+
The MIT License (MIT)
2870+
2871+
Copyright (c) 2021 MongoDB, Inc.
2872+
2873+
Permission is hereby granted, free of charge, to any person obtaining a copy
2874+
of this software and associated documentation files (the "Software"), to deal
2875+
in the Software without restriction, including without limitation the rights
2876+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
2877+
copies of the Software, and to permit persons to whom the Software is
2878+
furnished to do so, subject to the following conditions:
2879+
2880+
The above copyright notice and this permission notice shall be included in all
2881+
copies or substantial portions of the Software.
2882+
2883+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
2884+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
2885+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
2886+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
2887+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2888+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2889+
SOFTWARE.
2890+
2891+
2892+
2893+
Authors:
2894+
* Anna Henningsen <[email protected]>
2895+
2896+
28462897
<a id="a9493a602227065e2247bd0f1087615024e9e96d36d1bd1e70b8db5292f7bdda"></a>
28472898
### [prebuild-install](https://www.npmjs.com/package/prebuild-install) (version 6.1.2)
28482899
<!-- initially found at node_modules/prebuild-install -->

configs/eslint-config-compass/index.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ const testRules = {
2424
'mocha/no-exclusive-tests': 'error',
2525
'mocha/no-hooks-for-single-case': 'off',
2626
'@typescript-eslint/no-explicit-any': 'off',
27+
'@typescript-eslint/no-empty-function': 'off',
2728
};
2829

2930
module.exports = {
@@ -62,7 +63,11 @@ module.exports = {
6263
files: ['**/*.tsx'],
6364
env: { node: true, browser: true },
6465
extends: [...tsConfigurations, ...reactConfigurations, 'prettier'],
65-
rules: { ...tsRules },
66+
rules: {
67+
...tsRules,
68+
// No reason to have propTypes if your components are strictly typed
69+
'react/prop-types': 'off',
70+
},
6671
},
6772
{
6873
files: [
@@ -71,6 +76,8 @@ module.exports = {
7176
'**/*.spec.ts',
7277
'**/*.spec.tsx',
7378
'**/*.test.js',
79+
'**/*.test.tsx',
80+
'**/*.test.ts',
7481
],
7582
env: { mocha: true },
7683
extends: [...testConfigurations],

configs/mocha-config-compass/compass-plugin.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ module.exports = {
55
// electron-mocha config options (ignored when run with just mocha)
66
// https://github.com/jprichardson/electron-mocha
77
renderer: true,
8-
windowConfig: path.resolve(__dirname, 'window-config.json'),
8+
'window-config': path.resolve(__dirname, 'window-config.json'),
9+
'no-sandbox': true,
910
};

configs/tsconfig-compass/tsconfig.common.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"esModuleInterop": true,
55
"downlevelIteration": true,
66
"declaration": true,
7+
"declarationMap": true,
78
"forceConsistentCasingInFileNames": true,
89
"lib": ["dom", "es2018"],
910
"module": "commonjs",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export const sharedExternals: string[] = [
77
'keytar',
88
'kerberos',
99
'interruptor',
10+
'os-dns-native',
1011
// MongoDB Node.js Driver stuff that is optional, but fails webpack builds
1112
// with "missing dependency" if not installed due to how driver imports those
1213
'bson-ext',

0 commit comments

Comments
 (0)