Skip to content

Commit 977accf

Browse files
committed
Merge remote-tracking branch 'origin/main' into 1943-e2e
2 parents 4ecac02 + 18a499e commit 977accf

File tree

17 files changed

+1176
-913
lines changed

17 files changed

+1176
-913
lines changed

.evergreen.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8179,17 +8179,6 @@ tasks:
81798179
mongosh_test_id: "types"
81808180
mongosh_run_only_in_package: "types"
81818181
task_name: ${task_name}
8182-
# TODO: This is an always failing test to check Foliage. Should be removed afterwards.
8183-
- name: test_always_failing
8184-
tags: ["assigned_to_jira_team_mongosh_mongosh", "unit-test"]
8185-
commands:
8186-
- command: shell.exec
8187-
type: setup
8188-
params:
8189-
working_dir: src
8190-
shell: bash
8191-
script: |
8192-
node -e "throw new Error()"
81938182

81948183
###
81958184
# INTEGRATION TESTS
@@ -15915,7 +15904,6 @@ buildvariants:
1591515904
- name: test_vscode
1591615905
- name: test_connectivity
1591715906
- name: test_apistrict
15918-
- name: test_always_failing
1591915907
- name: linux_coverage
1592015908
display_name: "Ubuntu 20.04 x64 (Coverage and Static Analysis Check)"
1592115909
run_on: ubuntu2004-small

.evergreen/evergreen.yml.in

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1161,17 +1161,6 @@ tasks:
11611161
mongosh_run_only_in_package: "<% out(packageName) %>"
11621162
task_name: ${task_name}
11631163
<% } %>
1164-
# TODO: This is an always failing test to check Foliage. Should be removed afterwards.
1165-
- name: test_always_failing
1166-
tags: ["assigned_to_jira_team_mongosh_mongosh", "unit-test"]
1167-
commands:
1168-
- command: shell.exec
1169-
type: setup
1170-
params:
1171-
working_dir: src
1172-
shell: bash
1173-
script: |
1174-
node -e "throw new Error()"
11751164

11761165
###
11771166
# INTEGRATION TESTS
@@ -1604,7 +1593,6 @@ buildvariants:
16041593
- name: test_vscode
16051594
- name: test_connectivity
16061595
- name: test_apistrict
1607-
- name: test_always_failing
16081596
- name: linux_coverage
16091597
display_name: "Ubuntu 20.04 x64 (Coverage and Static Analysis Check)"
16101598
run_on: ubuntu2004-small

THIRD_PARTY_NOTICES.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
The following third-party software is used by and included in **mongosh**.
2-
This document was automatically generated on Wed Dec 11 2024.
2+
This document was automatically generated on Fri Dec 13 2024.
33

44
## List of dependencies
55

@@ -241,7 +241,7 @@ Package|Version|License
241241
**[execa](#a0c2c672c3fccddd8bd85ffff34f8f18d893b9f136946e6225b9abc9a8fae10e)**|5.0.0|MIT
242242
**[execa](#099ba5f976333854bfd5aa2237fd12d883c4477af76007a7963109833edef012)**|7.2.0|MIT
243243
**[expand-template](#46d3e73ca0d4a8c14e99252386f0a5c1a4fd8b2747331373d7b4da97105c15bb)**|2.0.3|(MIT OR WTFPL)
244-
**[express](#96b5945aa9b5ba9189eb3e9f50f6522e976d90a93dc42f2f3aa13cbcffb434a2)**|4.21.1|MIT
244+
**[express](#4d2041a77bd4922bcebeb1bb80240f087b10510d23d4a3142db7206a9feb739a)**|4.21.2|MIT
245245
**[fast-xml-parser](#ebbe8cacbca0e6da2c884ade309dddffc2df1cf8f3532ffda03e31aa6d3a9a3b)**|4.4.1|MIT
246246
**[fault](#387740fc7544e813d0a9ad480550d0bb536270783b1ce8c1ee83cd7d18b1472e)**|1.0.4|MIT
247247
**[fetch-blob](#9a40c73e2482c1cc651991133722a6fedd12dc752d2858a21da24395e6fc8461)**|3.2.0|MIT
@@ -375,7 +375,7 @@ Package|Version|License
375375
**[parseurl](#c3fdd1b6fb725cb30e8fed82cf929953b46129d347d8404a4a51b633389fbae8)**|1.3.3|MIT
376376
**[path-key](#e1a2a032096ace66b422351e00b11b0229e42e4b49c2146f439f8fe442218451)**|3.1.1|MIT
377377
**[path-key](#8e0734b8abb76579df2174822606e692914e985fc58363a78e6ad4b2a4a5831f)**|4.0.0|MIT
378-
**[path-to-regexp](#96d230365f414cce8d80ceb9d99d855685dfa922f931b49ea01952a1efe64266)**|0.1.10|MIT
378+
**[path-to-regexp](#a36c8f7aea129a341c589b7722e2c873fab8a2d01a0c3e2e426f5b28ba793621)**|0.1.12|MIT
379379
**[path-to-regexp](#571cfd74ecd5ea999273383b83a44bf35d4a62383c67a63fef169cc42eb2d859)**|1.9.0|MIT
380380
**[picocolors](#f964752f1f8cfd947506fd51ce1c148469ecf3b6f531d826511b720670e556f1)**|1.1.0|ISC
381381
**[prebuild-install](#93d13a9b3a51a6a802fcd35aa031d3ae7369aa6fd47d3a89f28a6d31ea3c9dc5)**|7.1.2|MIT
@@ -22956,8 +22956,8 @@ License files:
2295622956
THE SOFTWARE.
2295722957

2295822958

22959-
<a id="96b5945aa9b5ba9189eb3e9f50f6522e976d90a93dc42f2f3aa13cbcffb434a2"></a>
22960-
### [express](https://www.npmjs.com/package/express) (version 4.21.1)
22959+
<a id="4d2041a77bd4922bcebeb1bb80240f087b10510d23d4a3142db7206a9feb739a"></a>
22960+
### [express](https://www.npmjs.com/package/express) (version 4.21.2)
2296122961
License tags: MIT
2296222962

2296322963
License files:
@@ -28860,8 +28860,8 @@ License files:
2886028860

2886128861

2886228862

28863-
<a id="96d230365f414cce8d80ceb9d99d855685dfa922f931b49ea01952a1efe64266"></a>
28864-
### [path-to-regexp](https://www.npmjs.com/package/path-to-regexp) (version 0.1.10)
28863+
<a id="a36c8f7aea129a341c589b7722e2c873fab8a2d01a0c3e2e426f5b28ba793621"></a>
28864+
### [path-to-regexp](https://www.npmjs.com/package/path-to-regexp) (version 0.1.12)
2886528865
License tags: MIT
2886628866

2886728867
License files:

package-lock.json

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

packages/browser-repl/README.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,20 @@ const runtime = new IframeRuntime(serviceProvider);
3131
Shell is a React component with the following properties:
3232

3333
- `runtime: Runtime`: The runtime used to evaluate code.
34-
- `onOutputChanged?: (output: readonly ShellOutputEntry[]) => void`: A function called each time the output changes with an array of `ShellOutputEntryes`.
35-
- `onHistoryChanged?: (history: readonly string[]) => void`: A function called each time the history changes with an array of history entries ordered from the most recent to the oldest entry.
34+
- `onOutputChanged?: (output: ShellOutputEntry[]) => void`: A function called each time the output changes with an array of `ShellOutputEntries`.
35+
- `onHistoryChanged?: (history: string[]) => void`: A function called each time the history changes with an array of history entries ordered from the most recent to the oldest entry.
36+
- `onEditorChanged?: (editor: EditorRef | null) => void`: A function called each time the editor ref changes. Can be used to call editor methods.
37+
- `onOperationStarted?: () => void`: A function called when an operation has begun.
38+
- `onOperationEnd?: () => void`: A function called when an operation has completed (both error and success).
3639
- `redactInfo?: boolean`: If set, the shell will omit or redact entries containing sensitive info from history. Defaults to `false`.
3740
- `maxOutputLength?: number`: The maxiumum number of lines to keep in the output. Defaults to `1000`.
3841
- `maxHistoryLength?: number`: The maxiumum number of lines to keep in the history. Defaults to `1000`.
39-
- `initialOutput?: readonly ShellOutputEntry[]`: An array of entries to be displayed in the output area. Can be used to restore the output between sessions, or to setup a greeting message. **Note**: new entries will not be appended to the array.
40-
- `initialHistory?: readonly string[]`: An array of history entries to prepopulate the history.
42+
- `initialEvaluate?: string|string[]`: A set of input strings to evaluate right after shell is mounted.
43+
- `initialText?: string`: The initial text for the input field.
44+
- `output?: ShellOutputEntry[]`: An array of entries to be displayed in the output area. Can be used to restore the output between sessions, or to setup a greeting message. **Note**: new entries will not be appended to the array.
45+
- `history?: readonly string[]`: An array of history entries to prepopulate the history.
4146
Can be used to restore the history between sessions. Entries must be ordered from the most recent to the oldest. Note: new entries will not be appended to the array.
47+
- `isOperationInProgress?: boolean`: Can be used to restore the value between sessions.
4248

4349
### `ShellOutputEntry`
4450

0 commit comments

Comments
 (0)