Skip to content

Commit 626c518

Browse files
authored
Merge branch 'main' into mark-features-released
2 parents 130372e + a1fdabb commit 626c518

File tree

142 files changed

+4221
-1902
lines changed

Some content is hidden

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

142 files changed

+4221
-1902
lines changed

.github/workflows/test-installers.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ jobs:
112112
hadron-platform: linux
113113
distro-id: rhel80
114114
post-checkout-command: |
115+
dnf clean all && dnf update -y --refresh
115116
dnf install -y gcc gcc-c++ make git nss dbus xorg-x11-server-Xvfb yum-utils
116117
# Enable the devel repo to install compat-openssl11 (bringing libcrupto.so.1.1 to run mongod)
117118
dnf config-manager --set-enabled devel

THIRD-PARTY-NOTICES.md

Lines changed: 101 additions & 35 deletions
Large diffs are not rendered by default.

configs/eslint-config-compass/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
"@babel/eslint-parser": "^7.14.3",
1919
"@mongodb-js/eslint-config-devtools": "^0.9.9",
2020
"@mongodb-js/eslint-plugin-compass": "^1.2.9",
21-
"@typescript-eslint/eslint-plugin": "^8.34.0",
22-
"@typescript-eslint/parser": "^8.34.0",
21+
"@typescript-eslint/eslint-plugin": "^8.35.1",
22+
"@typescript-eslint/parser": "^8.35.1",
2323
"eslint": "^8.57.1",
2424
"eslint-config-prettier": "^8.3.0",
2525
"eslint-plugin-chai-friendly": "^1.1.0",
2626
"eslint-plugin-filename-rules": "^1.2.0",
2727
"eslint-plugin-jsx-a11y": "^6.10.2",
2828
"eslint-plugin-mocha": "^8.0.0",
2929
"eslint-plugin-react": "^7.37.5",
30-
"eslint-plugin-react-hooks": "^4.6.2"
30+
"eslint-plugin-react-hooks": "^5.2.0"
3131
},
3232
"scripts": {
3333
"prettier": "prettier-compass",

configs/mocha-config-compass/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"identity-obj-proxy": "^3.0.0",
3434
"react-16-node-hanging-test-fix": "^1.0.0",
3535
"sinon-chai": "^3.7.0",
36-
"ts-node": "^10.9.1",
36+
"ts-node": "^10.9.2",
3737
"why-is-node-running": "^2.2.2"
3838
}
3939
}

configs/testing-library-compass/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"depcheck": "^1.4.1",
5757
"mocha": "^10.2.0",
5858
"nyc": "^15.1.0",
59-
"typescript": "^5.0.4"
59+
"typescript": "^5.8.3"
6060
},
6161
"dependencies": {
6262
"@testing-library/react": "^12.1.5",

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,9 @@ function createWrapper(
283283
const wrapperState = {
284284
globalAppRegistry: new AppRegistry(),
285285
localAppRegistry: new AppRegistry(),
286-
preferences: new InMemoryPreferencesAccess(options.preferences),
286+
preferences: new InMemoryPreferencesAccess(
287+
options.preferences
288+
) as PreferencesAccess,
287289
track: Sinon.stub(),
288290
logger: createNoopLogger(),
289291
connectionStorage:
@@ -585,6 +587,12 @@ function createPluginWrapper<
585587
return { ref, Wrapper: ComponentWithProvider };
586588
}
587589

590+
export type RenderPluginWithConnectionsResult<
591+
T extends CompassPluginComponent<any, any, any>
592+
> = RenderWithConnectionsResult & {
593+
plugin: ReturnType<T['useActivate']>;
594+
};
595+
588596
function createPluginTestHelpers<
589597
Props,
590598
ServiceLocators extends Record<string, () => unknown>,

configs/tsconfig-compass/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"tsconfig.react.json"
99
],
1010
"peerDependencies": {
11-
"typescript": "^5.0.4"
11+
"typescript": "^5.8.3"
1212
},
1313
"devDependencies": {
1414
"@mongodb-js/prettier-config-compass": "^1.2.8"

configs/tsconfig-compass/tsconfig.common.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json",
33
"compilerOptions": {
44
"removeComments": false,
5-
"moduleResolution": "node16"
5+
"moduleResolution": "node16",
6+
"module": "node16"
67
}
78
}
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"extends": "@mongodb-js/tsconfig-devtools/tsconfig.react.json",
33
"compilerOptions": {
4-
"removeComments": false
4+
"removeComments": false,
5+
"moduleResolution": "node16",
6+
"module": "node16"
57
}
68
}

configs/webpack-config-compass/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"@types/html-webpack-plugin": "^3.2.9",
5353
"@types/webpack-bundle-analyzer": "^4.7.0",
5454
"depcheck": "^1.4.1",
55-
"typescript": "^5.0.4"
55+
"typescript": "^5.8.3"
5656
},
5757
"dependencies": {
5858
"@babel/core": "^7.21.4",

0 commit comments

Comments
 (0)