Skip to content

Commit 01f6616

Browse files
committed
Merge remote-tracking branch 'origin/main' into 1.31-releases
2 parents 51a45f3 + 4f67e36 commit 01f6616

File tree

417 files changed

+10269
-7508
lines changed

Some content is hidden

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

417 files changed

+10269
-7508
lines changed

.depcheckrc

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
ignores:
2-
# TODO: See package.json. Remove when all packages use the same version
2+
# TODO: We keep webpack-cli/serve and testing-library/dom at the root to work
3+
# around weird npm workspace hoising issues caused by outdated transient
4+
# dependencies. This can go away when we update webpack and leafygreen to the
5+
# same version everywhere.
36
- '@webpack-cli/serve'
47
- '@testing-library/dom'
8+
# TODO: To work around https://github.com/depcheck/depcheck/issues/688 we keep
9+
# some babel dependencies at the root to guarantee that their version is not
10+
# bumped higher than the version that breaks depcheck package
11+
- '@babel/core'
12+
- '@babel/parser'
13+
# npm picks up the node-gyp installation in this repository rather than the
14+
# one it ships with, so we install one of our own to get the version right
15+
# (because we need one with vscode 2022 support for github actions CI)
16+
- 'node-gyp'

.evergreen.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ variables:
4040
EVERGREEN_VERSION_ID: ${version_id}
4141
EVERGREEN_WORKDIR: ${workdir}
4242
NODE_JS_VERSION: '14.17.5'
43-
NPM_VERSION: '7'
43+
NPM_VERSION: '8.3.1'
4444
# secrets
4545
HADRON_METRICS_BUGSNAG_KEY: ${metrics_bugsnag_key}
4646
HADRON_METRICS_INTERCOM_APP_ID: ${metrics_intercom_app_id}
@@ -78,8 +78,7 @@ post:
7878
- <<: *save-diagnostic-file
7979
params:
8080
local_files_include_filter:
81-
- src/packages/compass-e2e-tests/.log/**/*.log
82-
- src/packages/compass-e2e-tests/.log/**/*.json
81+
- src/packages/compass-e2e-tests/.log/**/*
8382
- <<: *save-diagnostic-file
8483
params:
8584
local_files_include_filter:

.github/workflows/authors-and-third-party-notices.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,15 @@ jobs:
2222
- name: Install Deps Ubuntu
2323
run: sudo apt-get -y install libkrb5-dev libsecret-1-dev net-tools libstdc++6 gnome-keyring
2424

25-
- name: Install npm@7
26-
run: npm install -g npm@7
25+
- name: Install [email protected]
26+
run: |
27+
npm install -g [email protected]
28+
npx --yes rimraf $LOCALAPPDATA/node-gyp/Cache || true
2729
2830
- name: Install Dependencies
29-
run: npm ci
31+
run: |
32+
npm -v
33+
npm ci
3034
3135
- name: Set up Git
3236
run: |

.github/workflows/build.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,14 @@ jobs:
4949
node-version: ^14.17.5
5050
cache: 'npm'
5151

52-
- name: Install npm@7
53-
run: npm install -g npm@7
52+
- name: Install [email protected]
53+
run: |
54+
npm install -g [email protected]
55+
npx --yes rimraf $LOCALAPPDATA/node-gyp/Cache || true
5456
5557
- name: Install Dependencies
5658
run: |
59+
npm -v
5760
npm ci
5861
# We don't need to bootstrap anything else before running the e2e tests
5962
npx lerna run bootstrap -- --stream --scope @mongodb/webpack-config-compass

.github/workflows/check-test.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,14 @@ jobs:
4646
node-version: ^14.17.5
4747
cache: 'npm'
4848

49-
- name: Install npm@7
50-
run: npm install -g npm@7
49+
- name: Install [email protected]
50+
run: |
51+
npm install -g [email protected]
52+
npx --yes rimraf $LOCALAPPDATA/node-gyp/Cache || true
5153
5254
- name: Install Dependencies
5355
run: |
56+
npm -v
5457
npm ci
5558
# Dependencies are included when installing as npm workspaces will
5659
# hoist every package in the repo and it's important that the

.github/workflows/connectivity-tests.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,15 @@ jobs:
7676
docker-compose -f docker/tls/docker-compose.yaml up -d
7777
docker-compose -f docker/kerberos/docker-compose.yaml up -d
7878
79-
- name: Install npm@7
80-
run: npm install -g npm@7
79+
- name: Install [email protected]
80+
run: |
81+
npm install -g [email protected]
82+
npx --yes rimraf $LOCALAPPDATA/node-gyp/Cache || true
8183
8284
- name: Install Dependencies
83-
run: npm run bootstrap-ci
85+
run: |
86+
npm -v
87+
npm run bootstrap-ci
8488
8589
- name: Docker ps
8690
run: docker ps -a --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}"

AUTHORS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,5 @@ Vladimir Isakov <[email protected]>
5959
6060
Leonardo Rossi <[email protected]>
6161
Neil Shweky <[email protected]>
62+
Rohan Antony <[email protected]>
63+

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ You'll need node `^14.17.5` and npm `7` installed on your machine to work with t
3131

3232
After bootstrap is finished, you should be able to run `npm run start` and see Compass application running locally.
3333

34-
This monorepo is powered by [`npm workspaces`](https://docs.npmjs.com/cli/v7/using-npm/workspaces) an [`lerna`](https://github.com/lerna/lerna#readme), although not necessary, it might be helpful to have a high level understanding of those tools.
34+
This monorepo is powered by [`npm workspaces`](https://docs.npmjs.com/cli/v7/using-npm/workspaces) and [`lerna`](https://github.com/lerna/lerna#readme), although not necessary, it might be helpful to have a high level understanding of those tools.
3535

3636
### Working on Plugins
3737

THIRD-PARTY-NOTICES.md

Lines changed: 7 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 **compass**.
2-
This document was automatically generated on Wed Feb 16 2022.
2+
This document was automatically generated on Fri Feb 25 2022.
33

44
## List of dependencies
55

@@ -76,8 +76,8 @@ Package|Version|License
7676
**[@leafygreen-ui/tokens](#8d64a446d42012738c5f1314d234630346cac498cc92384f3f51fe54a09d14ff)**|0.5.3|Apache-2.0
7777
**[@leafygreen-ui/tooltip](#12ce56de7f479eb8abccc40a4e9d97cd6db628c0d8fac6f752f756809cebc749)**|6.3.1|Apache-2.0
7878
**[@leafygreen-ui/typography](#6fe50b20beb48fc92d444350ce75c70bd9429803ad6acbd7192f5c2a54271861)**|8.1.0|Apache-2.0
79-
**[@mongodb-js/compass-components](#e6d9e67cfa8f17eb31243b743ae43288f13b3b55e03ce3762ce0834929e5cad7)**|0.10.0|SSPL
80-
**[@mongodb-js/compass-logging](#dffd020f53cfab0b526ad53451f3e7aadc04e0548139dcab4a427087b92fc207)**|0.7.0|SSPL
79+
**[@mongodb-js/compass-components](#dbf69cb6b34eafe964748f252289b2c6b2cf8a875152bd49ea8a6f894aab76c2)**|0.11.0|SSPL
80+
**[@mongodb-js/compass-logging](#f8e821293ed93ad8fdf611c40e4f48ac0ea3b0e62bf8e73de18d676a171dfd38)**|0.8.0|SSPL
8181
**[@mongosh/node-runtime-worker-thread](#e76b1351c660a63528d2b8a0e356450b46c4c0dbed9e8b19242e7d686a2449ab)**|1.1.9|Apache-2.0
8282
**[@react-aria/focus](#9cbdb21e880abb0ce77f98791c23a02bc3901ab41167a97fb20ed91827371b04)**|3.5.0|Apache-2.0
8383
**[@react-aria/interactions](#e9192398723deae3ba2f387ff5053bcf4806545f3996c50abd05d233c50fde8c)**|3.6.0|Apache-2.0
@@ -1578,16 +1578,16 @@ License tags: Apache-2.0
15781578
License tags: Apache-2.0
15791579

15801580

1581-
<a id="e6d9e67cfa8f17eb31243b743ae43288f13b3b55e03ce3762ce0834929e5cad7"></a>
1582-
### [@mongodb-js/compass-components](https://www.npmjs.com/package/@mongodb-js/compass-components) (version 0.10.0)
1581+
<a id="dbf69cb6b34eafe964748f252289b2c6b2cf8a875152bd49ea8a6f894aab76c2"></a>
1582+
### [@mongodb-js/compass-components](https://www.npmjs.com/package/@mongodb-js/compass-components) (version 0.11.0)
15831583
<!-- initially found at packages/compass-components -->
15841584
> React Components used in Compass
15851585

15861586
License tags: SSPL
15871587

15881588

1589-
<a id="dffd020f53cfab0b526ad53451f3e7aadc04e0548139dcab4a427087b92fc207"></a>
1590-
### [@mongodb-js/compass-logging](https://www.npmjs.com/package/@mongodb-js/compass-logging) (version 0.7.0)
1589+
<a id="f8e821293ed93ad8fdf611c40e4f48ac0ea3b0e62bf8e73de18d676a171dfd38"></a>
1590+
### [@mongodb-js/compass-logging](https://www.npmjs.com/package/@mongodb-js/compass-logging) (version 0.8.0)
15911591
<!-- initially found at packages/compass-logging -->
15921592
> Shared helpers for logging in Compass packages
15931593

configs/eslint-config-compass/index.js

Lines changed: 35 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const tsConfigurations = [
55
'plugin:@typescript-eslint/recommended',
66
'plugin:@typescript-eslint/recommended-requiring-type-checking',
77
];
8+
89
const tsRules = {
910
'@typescript-eslint/no-unused-vars': 'error',
1011
'@typescript-eslint/no-unsafe-assignment': 'off',
@@ -24,47 +25,63 @@ const reactConfigurations = [
2425
];
2526

2627
const testConfigurations = ['plugin:mocha/recommended'];
28+
2729
const testRules = {
2830
'mocha/no-exclusive-tests': 'error',
2931
'mocha/no-hooks-for-single-case': 'off',
32+
'mocha/no-setup-in-describe': 'off',
3033
'@typescript-eslint/no-explicit-any': 'off',
3134
'@typescript-eslint/no-empty-function': 'off',
3235
};
3336

37+
const javascriptParserOptions = {
38+
parser: '@babel/eslint-parser',
39+
parserOptions: {
40+
ecmaVersion: 'latest',
41+
requireConfigFile: false,
42+
babelOptions: {
43+
presets: [
44+
require.resolve('@babel/preset-env'),
45+
require.resolve('@babel/preset-react'),
46+
],
47+
},
48+
},
49+
};
50+
51+
const typescriptParserOptions = {
52+
parser: '@typescript-eslint/parser',
53+
parserOptions: {
54+
ecmaFeatures: {
55+
jsx: true,
56+
},
57+
},
58+
};
59+
3460
module.exports = {
3561
plugins: ['@typescript-eslint', 'jsx-a11y', 'mocha', 'react', 'react-hooks'],
3662
env: { node: true },
3763
overrides: [
3864
{
39-
parserOptions: {
40-
ecmaVersion: 12,
41-
},
4265
files: ['**/*.js'],
66+
...javascriptParserOptions,
4367
env: { node: true, es6: true },
4468
extends: [...jsConfigurations, 'prettier'],
4569
},
4670
{
47-
parser: '@typescript-eslint/parser',
48-
files: ['**/*.ts'],
49-
extends: [...tsConfigurations, 'prettier'],
50-
rules: { ...tsRules },
51-
},
52-
{
53-
parserOptions: {
54-
ecmaVersion: 2018,
55-
},
5671
files: ['**/*.jsx'],
72+
...javascriptParserOptions,
5773
env: { node: true, browser: true, es6: true },
5874
extends: [...jsConfigurations, ...reactConfigurations, 'prettier'],
5975
},
6076
{
61-
parser: '@typescript-eslint/parser',
62-
parserOptions: {
63-
ecmaFeatures: {
64-
jsx: true,
65-
},
66-
},
77+
files: ['**/*.ts'],
78+
...typescriptParserOptions,
79+
extends: [...tsConfigurations, 'prettier'],
80+
rules: { ...tsRules },
81+
},
82+
{
6783
files: ['**/*.tsx'],
84+
...typescriptParserOptions,
6885
env: { node: true, browser: true },
6986
extends: [...tsConfigurations, ...reactConfigurations, 'prettier'],
7087
rules: {

0 commit comments

Comments
 (0)