Skip to content

Commit 02e70c7

Browse files
committed
Merge remote-tracking branch 'origin/main' into print-output-full
2 parents caaa723 + da26658 commit 02e70c7

File tree

80 files changed

+3483
-7222
lines changed

Some content is hidden

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

80 files changed

+3483
-7222
lines changed

.evergreen.yml

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

.evergreen/build-variants/unit-tests-build-variants.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export type UnitTestsBuildVariant = {
1010
nShort: string;
1111
nVersion: string;
1212
skipNodeVersionCheck: boolean;
13+
disable: boolean;
1314
};
1415

1516
export const UNIT_TESTS_BUILD_VARIANTS: UnitTestsBuildVariant[];

.evergreen/node-20-latest.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
{
2-
"version": "20.19.5",
2+
"version": "20.19.6",
33
"major": 20,
44
"minor": 19,
5-
"patch": 5,
5+
"patch": 6,
66
"tag": "",
77
"codename": "iron",
88
"versionName": "v20",
99
"start": "2023-04-18T00:00:00.000Z",
1010
"lts": "2023-10-24T00:00:00.000Z",
1111
"maintenance": "2024-10-22T00:00:00.000Z",
1212
"end": "2026-04-30T00:00:00.000Z",
13-
"releaseDate": "2025-09-03T00:00:00.000Z",
13+
"releaseDate": "2025-11-25T00:00:00.000Z",
1414
"isLts": true,
15+
"isSupported": true,
16+
"isMaintenance": true,
17+
"isSecurity": false,
18+
"modules": "115",
1519
"files": [
1620
"aix-ppc64",
1721
"headers",
@@ -40,6 +44,6 @@
4044
"v8": "11.3.244.8",
4145
"uv": "1.46.0",
4246
"zlib": "1.3.1",
43-
"openssl": "3.0.16"
47+
"openssl": "3.0.17"
4448
}
4549
}

.evergreen/node-24-latest.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
"end": "2028-04-30T00:00:00.000Z",
1313
"releaseDate": "2025-11-11T00:00:00.000Z",
1414
"isLts": true,
15+
"isSupported": true,
16+
"isMaintenance": false,
17+
"isSecurity": false,
18+
"modules": "137",
1519
"files": [
1620
"aix-ppc64",
1721
"headers",

.evergreen/tasks/unit-tests.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ for (let variant of UNIT_TESTS_BUILD_VARIANTS) {
4444
for (let unitTest of UNIT_TESTS.filter(
4545
(t) =>
4646
t.variants.includes(variant.platform) &&
47-
(!t.unitTestsOnly || (t.unitTestsOnly && variant.runWithUnitTestsOnly))
47+
(!t.unitTestsOnly || variant.runWithUnitTestsOnly) &&
48+
!variant.disable
4849
)) {
4950
UNIT_TESTS_WITH_BUILD_VARIANTS.push([unitTest, variant]);
5051
}

.mocharc.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"spec": ["testing/dummy.spec.ts"],
3+
"exclude": ["packages/**", "node_modules/**"],
4+
"node-option": ["no-experimental-strip-types=true"]
5+
}

CONTRIBUTING.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ MongoDB welcomes community contributions! If you’re interested in making a con
1515
1. Add comments around your new code that explain what's happening
1616
1. Commit and push your changes to your branch then submit a pull request
1717

18+
## Running Tests on VSCode
19+
You can use the `mongosh.code-workspace` file along with the [Mocha Test Explorer](https://marketplace.visualstudio.com/items?itemName=hbenl.vscode-mocha-test-adapter) to run and debug tests in VSCode UI.
20+
1821
## Bugs
1922

2023
You can report new bugs by

configs/tsconfig-mongosh/tsconfig.common.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"removeComments": true,
1515
"target": "es2018",
1616
"lib": ["es2019"],
17-
"module": "commonjs",
18-
"moduleResolution": "node"
17+
"module": "nodenext",
18+
"moduleResolution": "nodenext"
1919
}
2020
}

mongosh.code-workspace

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
{
2+
"folders": [
3+
{
4+
"name": "mongosh",
5+
"path": "."
6+
},
7+
{
8+
"name": "📦 @mongodb-js/eslint-config-mongosh",
9+
"path": "configs/eslint-config-mongosh"
10+
},
11+
{
12+
"name": "📦 @mongodb-js/tsconfig-mongosh",
13+
"path": "configs/tsconfig-mongosh"
14+
},
15+
{
16+
"name": "📦 @mongosh/docker-build-scripts",
17+
"path": "scripts/docker"
18+
},
19+
{
20+
"name": "📦 @mongosh/async-rewriter2",
21+
"path": "packages/async-rewriter2"
22+
},
23+
{
24+
"name": "📦 @mongosh/build",
25+
"path": "packages/build"
26+
},
27+
{
28+
"name": "📦 @mongosh/errors",
29+
"path": "packages/errors"
30+
},
31+
{
32+
"name": "📦 @mongosh/history",
33+
"path": "packages/history"
34+
},
35+
{
36+
"name": "📦 @mongosh/java-shell",
37+
"path": "packages/java-shell"
38+
},
39+
{
40+
"name": "📦 @mongosh/js-multiline-to-singleline",
41+
"path": "packages/js-multiline-to-singleline"
42+
},
43+
{
44+
"name": "📦 @mongosh/types",
45+
"path": "packages/types"
46+
},
47+
{
48+
"name": "📦 @mongosh/i18n",
49+
"path": "packages/i18n"
50+
},
51+
{
52+
"name": "📦 @mongosh/logging",
53+
"path": "packages/logging"
54+
},
55+
{
56+
"name": "📦 @mongosh/shell-bson",
57+
"path": "packages/shell-bson"
58+
},
59+
{
60+
"name": "📦 @mongosh/arg-parser",
61+
"path": "packages/arg-parser"
62+
},
63+
{
64+
"name": "📦 @mongosh/service-provider-core",
65+
"path": "packages/service-provider-core"
66+
},
67+
{
68+
"name": "📦 @mongosh/service-provider-node-driver",
69+
"path": "packages/service-provider-node-driver"
70+
},
71+
{
72+
"name": "📦 @mongosh/shell-api",
73+
"path": "packages/shell-api"
74+
},
75+
{
76+
"name": "📦 @mongosh/autocomplete",
77+
"path": "packages/autocomplete"
78+
},
79+
{
80+
"name": "📦 @mongosh/shell-evaluator",
81+
"path": "packages/shell-evaluator"
82+
},
83+
{
84+
"name": "📦 @mongosh/snippet-manager",
85+
"path": "packages/snippet-manager"
86+
},
87+
{
88+
"name": "📦 @mongosh/browser-runtime-core",
89+
"path": "packages/browser-runtime-core"
90+
},
91+
{
92+
"name": "📦 @mongosh/editor",
93+
"path": "packages/editor"
94+
},
95+
{
96+
"name": "📦 @mongosh/browser-runtime-electron",
97+
"path": "packages/browser-runtime-electron"
98+
},
99+
{
100+
"name": "📦 @mongosh/cli-repl",
101+
"path": "packages/cli-repl"
102+
},
103+
{
104+
"name": "📦 @mongosh/e2e-tests",
105+
"path": "packages/e2e-tests"
106+
},
107+
{
108+
"name": "📦 mongosh",
109+
"path": "packages/mongosh"
110+
},
111+
{
112+
"name": "📦 @mongosh/node-runtime-worker-thread",
113+
"path": "packages/node-runtime-worker-thread"
114+
},
115+
{
116+
"name": "📦 @mongosh/browser-repl",
117+
"path": "packages/browser-repl"
118+
},
119+
{
120+
"name": "📦 @mongosh/connectivity-tests",
121+
"path": "packages/connectivity-tests"
122+
}
123+
],
124+
"settings": {
125+
"typescript.tsdk": "node_modules/typescript/lib",
126+
"mochaExplorer.configFile": ".mocharc.json",
127+
"mochaExplorer.timeout": 60000,
128+
"mochaExplorer.files": "",
129+
"mochaExplorer.ui": "bdd",
130+
"mochaExplorer.esmLoader": false,
131+
"mochaExplorer.monkeyPatch": true,
132+
"mochaExplorer.autoload": true,
133+
"testExplorer.codeLens": true,
134+
"testExplorer.gutterDecoration": true
135+
},
136+
"extensions": {
137+
"recommendations": [
138+
"hbenl.vscode-mocha-test-adapter"
139+
]
140+
}
141+
}

0 commit comments

Comments
 (0)