Skip to content

Commit 6eb90f6

Browse files
committed
Merge branch 'main' of github.com:mongodb-js/mongosh into gagik/options
2 parents 26c79bc + 80d3e53 commit 6eb90f6

File tree

72 files changed

+2521
-6402
lines changed

Some content is hidden

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

72 files changed

+2521
-6402
lines changed

.evergreen.yml

Lines changed: 1373 additions & 5725 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/evergreen.yml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1166,6 +1166,7 @@ tasks:
11661166
- func: install
11671167
vars:
11681168
node_js_version: ${node_js_version}
1169+
puppeteer_skip_download: "<% out(usePuppeteer ? "false" : "true") %>"
11691170
- func: test
11701171
vars:
11711172
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -1174,7 +1175,6 @@ tasks:
11741175
mongosh_test_id: "<% out(id) %>"
11751176
mongosh_run_only_in_package: "<% out(packageName) %>"
11761177
task_name: ${task_name}
1177-
puppeteer_skip_download: "<% out(usePuppeteer ? "false" : "true") %>"
11781178
<% } %>
11791179

11801180
###

.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

mongosh.code-workspace

Lines changed: 61 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -5,49 +5,25 @@
55
"path": "."
66
},
77
{
8-
"name": "📦 @mongosh/arg-parser",
9-
"path": "packages/arg-parser"
8+
"name": "📦 @mongodb-js/eslint-config-mongosh",
9+
"path": "configs/eslint-config-mongosh"
1010
},
1111
{
12-
"name": "📦 @mongosh/async-rewriter2",
13-
"path": "packages/async-rewriter2"
12+
"name": "📦 @mongodb-js/tsconfig-mongosh",
13+
"path": "configs/tsconfig-mongosh"
1414
},
1515
{
16-
"name": "📦 @mongosh/autocomplete",
17-
"path": "packages/autocomplete"
16+
"name": "📦 @mongosh/docker-build-scripts",
17+
"path": "scripts/docker"
1818
},
19-
// {
20-
// "name": "📦 @mongosh/browser-repl",
21-
// "path": "packages/browser-repl"
22-
// },
2319
{
24-
"name": "📦 @mongosh/browser-runtime-core",
25-
"path": "packages/browser-runtime-core"
26-
},
27-
{
28-
"name": "📦 @mongosh/browser-runtime-electron",
29-
"path": "packages/browser-runtime-electron"
20+
"name": "📦 @mongosh/async-rewriter2",
21+
"path": "packages/async-rewriter2"
3022
},
3123
{
3224
"name": "📦 @mongosh/build",
3325
"path": "packages/build"
3426
},
35-
{
36-
"name": "📦 @mongosh/cli-repl",
37-
"path": "packages/cli-repl"
38-
},
39-
{
40-
"name": "📦 @mongosh/connectivity-tests",
41-
"path": "packages/connectivity-tests"
42-
},
43-
{
44-
"name": "📦 @mongosh/e2e-tests",
45-
"path": "packages/e2e-tests"
46-
},
47-
{
48-
"name": "📦 @mongosh/editor",
49-
"path": "packages/editor"
50-
},
5127
{
5228
"name": "📦 @mongosh/errors",
5329
"path": "packages/errors"
@@ -56,10 +32,6 @@
5632
"name": "📦 @mongosh/history",
5733
"path": "packages/history"
5834
},
59-
{
60-
"name": "📦 @mongosh/i18n",
61-
"path": "packages/i18n"
62-
},
6335
{
6436
"name": "📦 @mongosh/java-shell",
6537
"path": "packages/java-shell"
@@ -68,13 +40,25 @@
6840
"name": "📦 @mongosh/js-multiline-to-singleline",
6941
"path": "packages/js-multiline-to-singleline"
7042
},
43+
{
44+
"name": "📦 @mongosh/types",
45+
"path": "packages/types"
46+
},
47+
{
48+
"name": "📦 @mongosh/i18n",
49+
"path": "packages/i18n"
50+
},
7151
{
7252
"name": "📦 @mongosh/logging",
7353
"path": "packages/logging"
7454
},
7555
{
76-
"name": "📦 @mongosh/node-runtime-worker-thread",
77-
"path": "packages/node-runtime-worker-thread"
56+
"name": "📦 @mongosh/shell-bson",
57+
"path": "packages/shell-bson"
58+
},
59+
{
60+
"name": "📦 @mongosh/arg-parser",
61+
"path": "packages/arg-parser"
7862
},
7963
{
8064
"name": "📦 @mongosh/service-provider-core",
@@ -89,8 +73,8 @@
8973
"path": "packages/shell-api"
9074
},
9175
{
92-
"name": "📦 @mongosh/shell-bson",
93-
"path": "packages/shell-bson"
76+
"name": "📦 @mongosh/autocomplete",
77+
"path": "packages/autocomplete"
9478
},
9579
{
9680
"name": "📦 @mongosh/shell-evaluator",
@@ -101,27 +85,55 @@
10185
"path": "packages/snippet-manager"
10286
},
10387
{
104-
"name": "📦 @mongosh/testing",
105-
"path": "packages/testing"
88+
"name": "📦 @mongosh/browser-runtime-core",
89+
"path": "packages/browser-runtime-core"
10690
},
10791
{
108-
"name": "📦 @mongosh/types",
109-
"path": "packages/types"
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"
110122
}
111123
],
112124
"settings": {
113125
"typescript.tsdk": "node_modules/typescript/lib",
114-
"mochaExplorer.files": "./{src,lib}/**/*.spec.ts",
115-
"mochaExplorer.require": [
116-
"../../scripts/import-expansions.js",
117-
"ts-node/register"
118-
],
126+
"mochaExplorer.configFile": ".mocharc.json",
119127
"mochaExplorer.timeout": 60000,
128+
"mochaExplorer.files": "",
120129
"mochaExplorer.ui": "bdd",
121130
"mochaExplorer.esmLoader": false,
122131
"mochaExplorer.monkeyPatch": true,
123132
"mochaExplorer.autoload": true,
124133
"testExplorer.codeLens": true,
125134
"testExplorer.gutterDecoration": true
135+
},
136+
"extensions": {
137+
"recommendations": ["hbenl.vscode-mocha-test-adapter"]
126138
}
127139
}

0 commit comments

Comments
 (0)