Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into beta-releases
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Sep 17, 2024
2 parents 4cfadd5 + 465663a commit 0645375
Show file tree
Hide file tree
Showing 163 changed files with 3,803 additions and 5,778 deletions.
14 changes: 4 additions & 10 deletions .depcheckrc
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
ignores:
- '@mongodb-js/bump-monorepo-packages'
- '@mongodb-js/sbom-tools'
# TODO: We keep webpack-cli/serve and testing-library/dom at the root to work
# around weird npm workspace hoising issues caused by outdated transient
# dependencies. This can go away when we update webpack and leafygreen to the
# same version everywhere.
# TODO: We keep testing-library/dom at the root to work around weird npm
# workspace hoising issues caused by outdated transient dependencies. This can
# go away when we update all our usage of @testing-library packages to the
# version matching what @leafygreen is using
- '@testing-library/dom'
# TODO: To work around https://github.com/depcheck/depcheck/issues/688 we keep
# some babel dependencies at the root to guarantee that their version is not
# bumped higher than the version that breaks depcheck package
- '@babel/core'
- '@babel/parser'
- 'babel-loader'
# npm picks up the node-gyp installation in this repository rather than the
# one it ships with, so we install one of our own to get the version right
# (because we need one with vscode 2022 support for github actions CI)
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: Bug Reports
url: https://jira.mongodb.org/projects/COMPASS/issues/
about: Report a bug via Jira.
url: https://jira.mongodb.org/
about: Report a bug to the COMPASS project in Jira.
- name: Feature Request
url: https://feedback.mongodb.com/forums/924283-compass
about: Request a new feature or enhancement via the MongoDB Feedback Engine.
Expand Down
11 changes: 10 additions & 1 deletion .snyk
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,18 @@ ignore:
created: 2023-10-30T10:18:43.435Z
SNYK-JS-ELECTRON-7443355:
- '*':
reason: Not applicable as we do not open / allow opening random webpages in our Electron app.
reason: >-
Not applicable as we do not open / allow opening random webpages in
our Electron app.
expires: 2024-07-25T12:41:36.996Z
created: 2024-07-19T12:41:36.999Z
SNYK-JS-AGGRIDCOMMUNITY-7414157:
- '*':
reason: >-
Not applicable as we don't use ag-grid utils and the library never
passes user input directly to the merge function
expires: 2025-09-17T13:05:57.065Z
created: 2024-09-17T13:05:57.071Z
# patches apply the minimum changes required to fix a vulnerability
patch:
'npm:ms:20170412':
Expand Down
387 changes: 42 additions & 345 deletions THIRD-PARTY-NOTICES.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions configs/eslint-config-compass/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mongodb-js/eslint-config-compass",
"version": "1.1.6",
"version": "1.1.7",
"description": "Shared Compass eslint configuration",
"license": "SSPL",
"main": "index.js",
Expand All @@ -16,7 +16,7 @@
"@babel/core": "^7.21.4",
"@babel/eslint-parser": "^7.14.3",
"@mongodb-js/eslint-config-devtools": "^0.9.9",
"@mongodb-js/eslint-plugin-compass": "^1.0.20",
"@mongodb-js/eslint-plugin-compass": "^1.0.21",
"@typescript-eslint/eslint-plugin": "^5.59.0",
"@typescript-eslint/parser": "^5.59.0",
"eslint-config-prettier": "^8.3.0",
Expand Down
4 changes: 2 additions & 2 deletions configs/eslint-plugin-compass/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"email": "[email protected]"
},
"homepage": "https://github.com/mongodb-js/compass",
"version": "1.0.20",
"version": "1.0.21",
"repository": {
"type": "git",
"url": "https://github.com/mongodb-js/compass.git"
Expand All @@ -37,7 +37,7 @@
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
},
"devDependencies": {
"@mongodb-js/mocha-config-compass": "^1.4.1",
"@mongodb-js/mocha-config-compass": "^1.4.2",
"@mongodb-js/prettier-config-compass": "^1.0.2",
"depcheck": "^1.4.1",
"eslint": "^7.25.0",
Expand Down
2 changes: 1 addition & 1 deletion configs/mocha-config-compass/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mongodb-js/mocha-config-compass",
"version": "1.4.1",
"version": "1.4.2",
"description": "Shared mocha mocha configuration for Compass packages",
"license": "SSPL",
"main": "index.js",
Expand Down
8 changes: 4 additions & 4 deletions configs/testing-library-compass/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"email": "[email protected]"
},
"homepage": "https://github.com/mongodb-js/compass",
"version": "1.0.0",
"version": "1.0.1",
"repository": {
"type": "git",
"url": "https://github.com/mongodb-js/compass.git"
Expand Down Expand Up @@ -45,10 +45,10 @@
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
},
"devDependencies": {
"@mongodb-js/eslint-config-compass": "^1.1.6",
"@mongodb-js/mocha-config-compass": "^1.4.1",
"@mongodb-js/eslint-config-compass": "^1.1.7",
"@mongodb-js/mocha-config-compass": "^1.4.2",
"@mongodb-js/prettier-config-compass": "^1.0.2",
"@mongodb-js/tsconfig-compass": "^1.0.4",
"@mongodb-js/tsconfig-compass": "^1.0.5",
"@types/chai": "^4.2.21",
"@types/mocha": "^9.0.0",
"@types/sinon-chai": "^3.2.5",
Expand Down
27 changes: 21 additions & 6 deletions configs/testing-library-compass/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ import {
import { TelemetryProvider } from '@mongodb-js/compass-telemetry/provider';
import { CompassComponentsProvider } from '@mongodb-js/compass-components';
import {
TestEnvCurrentConnectionContext,
ConnectionInfoProvider,
TEST_CONNECTION_INFO,
} from '@mongodb-js/compass-connections/src/connection-info-provider';
import type { State } from '@mongodb-js/compass-connections/src/stores/connections-store-redux';
import { createDefaultConnectionInfo } from '@mongodb-js/compass-connections/src/stores/connections-store-redux';
Expand Down Expand Up @@ -231,6 +231,17 @@ const EmptyWrapper = ({ children }: { children: React.ReactElement }) => {
return <>{children}</>;
};

const TEST_ENV_CURRENT_CONNECTION = {
info: {
id: 'TEST',
connectionOptions: {
connectionString: 'mongodb://localhost:27020',
},
},
status: 'connected' as const,
error: null,
};

function createWrapper(
options: TestConnectionsOptions,
// When using renderHook, anything that will try to call createPortal will
Expand Down Expand Up @@ -331,9 +342,13 @@ function createWrapper(
preloadStorageConnectionInfos={options.connections}
>
<StoreGetter>
<TestingLibraryWrapper {...props}>
{children}
</TestingLibraryWrapper>
<TestEnvCurrentConnectionContext.Provider
value={TEST_ENV_CURRENT_CONNECTION}
>
<TestingLibraryWrapper {...props}>
{children}
</TestingLibraryWrapper>
</TestEnvCurrentConnectionContext.Provider>
</StoreGetter>
</CompassConnections>
</ConnectFnProvider>
Expand Down Expand Up @@ -461,7 +476,7 @@ function createConnectionInfoWrapper(

async function renderWithActiveConnection(
ui: React.ReactElement,
connectionInfo: ConnectionInfo = TEST_CONNECTION_INFO,
connectionInfo: ConnectionInfo = TEST_ENV_CURRENT_CONNECTION.info,
{
connections,
wrapper: Wrapper = EmptyWrapper,
Expand All @@ -483,7 +498,7 @@ async function renderWithActiveConnection(

async function renderHookWithActiveConnection<HookProps, HookResult>(
cb: (props: HookProps) => HookResult,
connectionInfo: ConnectionInfo = TEST_CONNECTION_INFO,
connectionInfo: ConnectionInfo = TEST_ENV_CURRENT_CONNECTION.info,
{
connections,
wrapper: Wrapper = EmptyWrapper,
Expand Down
2 changes: 1 addition & 1 deletion configs/tsconfig-compass/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mongodb-js/tsconfig-compass",
"version": "1.0.4",
"version": "1.0.5",
"description": "Shared Compass Typescript configuration",
"license": "SSPL",
"files": [
Expand Down
6 changes: 3 additions & 3 deletions configs/webpack-config-compass/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"email": "[email protected]"
},
"homepage": "https://github.com/mongodb-js/compass",
"version": "1.4.1",
"version": "1.4.2",
"repository": {
"type": "git",
"url": "https://github.com/mongodb-js/compass.git"
Expand Down Expand Up @@ -45,9 +45,9 @@
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
},
"devDependencies": {
"@mongodb-js/eslint-config-compass": "^1.1.6",
"@mongodb-js/eslint-config-compass": "^1.1.7",
"@mongodb-js/prettier-config-compass": "^1.0.2",
"@mongodb-js/tsconfig-compass": "^1.0.4",
"@mongodb-js/tsconfig-compass": "^1.0.5",
"@types/cli-progress": "^3.9.2",
"@types/html-webpack-plugin": "^3.2.9",
"@types/webpack-bundle-analyzer": "^4.7.0",
Expand Down
2 changes: 1 addition & 1 deletion docs/tracking-plan.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# Compass Tracking Plan

Generated on Mon, Sep 16, 2024 at 01:21 PM
Generated on Tue, Sep 17, 2024 at 03:34 PM

## Table of Contents

Expand Down
Loading

0 comments on commit 0645375

Please sign in to comment.