Skip to content

Commit a2071d2

Browse files
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents aad2d1e + 27a6b47 commit a2071d2

Some content is hidden

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

41 files changed

+7731
-7111
lines changed

.snyk

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,17 @@ version: v1.25.0
44
ignore:
55
SNYK-JS-SEMVER-3247795:
66
- '*':
7-
reason: "Security patches released for semver 5.x (5.7.2) and 6.x (6.3.1) are not yet known to Snyk which is why we would like to ignore this vulnerability until the mentioned expiry."
7+
reason: >-
8+
Security patches released for semver 5.x (5.7.2) and 6.x (6.3.1) are
9+
not yet known to Snyk which is why we would like to ignore this
10+
vulnerability until the mentioned expiry.
811
expires: 2023-08-11T09:00:55.553Z
912
created: 2023-07-12T09:00:55.557Z
13+
SNYK-JS-AGGRIDCOMMUNITY-1932011:
14+
- '*':
15+
reason: None Given
16+
expires: 2023-08-18T09:51:32.172Z
17+
created: 2023-07-19T09:51:32.175Z
1018
# patches apply the minimum changes required to fix a vulnerability
1119
patch:
1220
'npm:ms:20170412':

THIRD-PARTY-NOTICES.md

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

configs/mocha-config-compass/register/resolve-from-source-register.js

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const workspaces = fs
1919

2020
const sourcePaths = Object.fromEntries(
2121
workspaces
22-
.map((workspacePath) => {
22+
.flatMap((workspacePath) => {
2323
let packageJson = {};
2424
try {
2525
packageJson = require(path.join(workspacePath, 'package.json'));
@@ -28,13 +28,25 @@ const sourcePaths = Object.fromEntries(
2828
`\x1b[33mWarning: Directory at path "${workspacePath}" is not a workspace. Did you forget to clean up?\x1b[0m`
2929
);
3030
}
31-
if (packageJson['compass:main'] || packageJson['compass:exports']) {
31+
if (packageJson['compass:exports']) {
32+
return Object.entries(packageJson['compass:exports']).map(
33+
([submodule, subpath]) => {
34+
return [
35+
path
36+
.join(packageJson.name, submodule)
37+
// Handle windows case where join will convert `/` to `\`
38+
.replace(/\\/g, '/'),
39+
path.join(workspacePath, subpath),
40+
];
41+
}
42+
);
43+
}
44+
if (packageJson['compass:main']) {
3245
return [
33-
packageJson.name,
34-
path.join(
35-
workspacePath,
36-
packageJson['compass:exports']?.['.'] ?? packageJson['compass:main']
37-
),
46+
[
47+
packageJson.name,
48+
path.join(workspacePath, packageJson['compass:main']),
49+
],
3850
];
3951
}
4052
return false;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.js"
2+
"extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json"
33
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"extends": "@mongodb-js/tsconfig-devtools/tsconfig.react.js"
2+
"extends": "@mongodb-js/tsconfig-devtools/tsconfig.react.json"
33
}

package-lock.json

Lines changed: 2137 additions & 1977 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/atlas-service/.depcheckrc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
ignores:
2+
- '@mongodb-js/prettier-config-compass'
3+
- '@mongodb-js/tsconfig-compass'
4+
- '@types/chai'
5+
- '@types/sinon-chai'
6+
- 'sinon'
7+
ignore-patterns:
8+
- 'dist'
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.nyc-output
2+
dist
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
module.exports = {
2+
root: true,
3+
extends: ['@mongodb-js/eslint-config-compass'],
4+
parserOptions: {
5+
tsconfigRootDir: __dirname,
6+
project: ['./tsconfig-lint.json'],
7+
},
8+
};

packages/atlas-service/.mocharc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require('@mongodb-js/mocha-config-compass');

0 commit comments

Comments
 (0)