Skip to content

Commit 0645375

Browse files
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents 4cfadd5 + 465663a commit 0645375

File tree

163 files changed

+3803
-5778
lines changed

Some content is hidden

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

163 files changed

+3803
-5778
lines changed

.depcheckrc

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
ignores:
22
- '@mongodb-js/bump-monorepo-packages'
33
- '@mongodb-js/sbom-tools'
4-
# TODO: We keep webpack-cli/serve and testing-library/dom at the root to work
5-
# around weird npm workspace hoising issues caused by outdated transient
6-
# dependencies. This can go away when we update webpack and leafygreen to the
7-
# same version everywhere.
4+
# TODO: We keep testing-library/dom at the root to work around weird npm
5+
# workspace hoising issues caused by outdated transient dependencies. This can
6+
# go away when we update all our usage of @testing-library packages to the
7+
# version matching what @leafygreen is using
88
- '@testing-library/dom'
9-
# TODO: To work around https://github.com/depcheck/depcheck/issues/688 we keep
10-
# some babel dependencies at the root to guarantee that their version is not
11-
# bumped higher than the version that breaks depcheck package
12-
- '@babel/core'
13-
- '@babel/parser'
14-
- 'babel-loader'
159
# npm picks up the node-gyp installation in this repository rather than the
1610
# one it ships with, so we install one of our own to get the version right
1711
# (because we need one with vscode 2022 support for github actions CI)

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
blank_issues_enabled: false
22
contact_links:
33
- name: Bug Reports
4-
url: https://jira.mongodb.org/projects/COMPASS/issues/
5-
about: Report a bug via Jira.
4+
url: https://jira.mongodb.org/
5+
about: Report a bug to the COMPASS project in Jira.
66
- name: Feature Request
77
url: https://feedback.mongodb.com/forums/924283-compass
88
about: Request a new feature or enhancement via the MongoDB Feedback Engine.

.snyk

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,18 @@ ignore:
1616
created: 2023-10-30T10:18:43.435Z
1717
SNYK-JS-ELECTRON-7443355:
1818
- '*':
19-
reason: Not applicable as we do not open / allow opening random webpages in our Electron app.
19+
reason: >-
20+
Not applicable as we do not open / allow opening random webpages in
21+
our Electron app.
2022
expires: 2024-07-25T12:41:36.996Z
2123
created: 2024-07-19T12:41:36.999Z
24+
SNYK-JS-AGGRIDCOMMUNITY-7414157:
25+
- '*':
26+
reason: >-
27+
Not applicable as we don't use ag-grid utils and the library never
28+
passes user input directly to the merge function
29+
expires: 2025-09-17T13:05:57.065Z
30+
created: 2024-09-17T13:05:57.071Z
2231
# patches apply the minimum changes required to fix a vulnerability
2332
patch:
2433
'npm:ms:20170412':

THIRD-PARTY-NOTICES.md

Lines changed: 42 additions & 345 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.6",
3+
"version": "1.1.7",
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.20",
19+
"@mongodb-js/eslint-plugin-compass": "^1.0.21",
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.20",
16+
"version": "1.0.21",
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.1",
40+
"@mongodb-js/mocha-config-compass": "^1.4.2",
4141
"@mongodb-js/prettier-config-compass": "^1.0.2",
4242
"depcheck": "^1.4.1",
4343
"eslint": "^7.25.0",

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.4.1",
3+
"version": "1.4.2",
44
"description": "Shared mocha mocha configuration for Compass packages",
55
"license": "SSPL",
66
"main": "index.js",

configs/testing-library-compass/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"email": "[email protected]"
1212
},
1313
"homepage": "https://github.com/mongodb-js/compass",
14-
"version": "1.0.0",
14+
"version": "1.0.1",
1515
"repository": {
1616
"type": "git",
1717
"url": "https://github.com/mongodb-js/compass.git"
@@ -45,10 +45,10 @@
4545
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
4646
},
4747
"devDependencies": {
48-
"@mongodb-js/eslint-config-compass": "^1.1.6",
49-
"@mongodb-js/mocha-config-compass": "^1.4.1",
48+
"@mongodb-js/eslint-config-compass": "^1.1.7",
49+
"@mongodb-js/mocha-config-compass": "^1.4.2",
5050
"@mongodb-js/prettier-config-compass": "^1.0.2",
51-
"@mongodb-js/tsconfig-compass": "^1.0.4",
51+
"@mongodb-js/tsconfig-compass": "^1.0.5",
5252
"@types/chai": "^4.2.21",
5353
"@types/mocha": "^9.0.0",
5454
"@types/sinon-chai": "^3.2.5",

configs/testing-library-compass/src/index.tsx

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ import {
4747
import { TelemetryProvider } from '@mongodb-js/compass-telemetry/provider';
4848
import { CompassComponentsProvider } from '@mongodb-js/compass-components';
4949
import {
50+
TestEnvCurrentConnectionContext,
5051
ConnectionInfoProvider,
51-
TEST_CONNECTION_INFO,
5252
} from '@mongodb-js/compass-connections/src/connection-info-provider';
5353
import type { State } from '@mongodb-js/compass-connections/src/stores/connections-store-redux';
5454
import { createDefaultConnectionInfo } from '@mongodb-js/compass-connections/src/stores/connections-store-redux';
@@ -231,6 +231,17 @@ const EmptyWrapper = ({ children }: { children: React.ReactElement }) => {
231231
return <>{children}</>;
232232
};
233233

234+
const TEST_ENV_CURRENT_CONNECTION = {
235+
info: {
236+
id: 'TEST',
237+
connectionOptions: {
238+
connectionString: 'mongodb://localhost:27020',
239+
},
240+
},
241+
status: 'connected' as const,
242+
error: null,
243+
};
244+
234245
function createWrapper(
235246
options: TestConnectionsOptions,
236247
// When using renderHook, anything that will try to call createPortal will
@@ -331,9 +342,13 @@ function createWrapper(
331342
preloadStorageConnectionInfos={options.connections}
332343
>
333344
<StoreGetter>
334-
<TestingLibraryWrapper {...props}>
335-
{children}
336-
</TestingLibraryWrapper>
345+
<TestEnvCurrentConnectionContext.Provider
346+
value={TEST_ENV_CURRENT_CONNECTION}
347+
>
348+
<TestingLibraryWrapper {...props}>
349+
{children}
350+
</TestingLibraryWrapper>
351+
</TestEnvCurrentConnectionContext.Provider>
337352
</StoreGetter>
338353
</CompassConnections>
339354
</ConnectFnProvider>
@@ -461,7 +476,7 @@ function createConnectionInfoWrapper(
461476

462477
async function renderWithActiveConnection(
463478
ui: React.ReactElement,
464-
connectionInfo: ConnectionInfo = TEST_CONNECTION_INFO,
479+
connectionInfo: ConnectionInfo = TEST_ENV_CURRENT_CONNECTION.info,
465480
{
466481
connections,
467482
wrapper: Wrapper = EmptyWrapper,
@@ -483,7 +498,7 @@ async function renderWithActiveConnection(
483498

484499
async function renderHookWithActiveConnection<HookProps, HookResult>(
485500
cb: (props: HookProps) => HookResult,
486-
connectionInfo: ConnectionInfo = TEST_CONNECTION_INFO,
501+
connectionInfo: ConnectionInfo = TEST_ENV_CURRENT_CONNECTION.info,
487502
{
488503
connections,
489504
wrapper: Wrapper = EmptyWrapper,

configs/tsconfig-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/tsconfig-compass",
3-
"version": "1.0.4",
3+
"version": "1.0.5",
44
"description": "Shared Compass Typescript configuration",
55
"license": "SSPL",
66
"files": [

0 commit comments

Comments
 (0)