Skip to content

Commit 4cd6692

Browse files
committed
Merge branch 'main' of github.com:mongodb-js/mongosh into gagik/e2e-foliage
2 parents 0deb771 + fdf6b6d commit 4cd6692

File tree

16 files changed

+1150
-903
lines changed

16 files changed

+1150
-903
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
@@ -15289,7 +15278,6 @@ buildvariants:
1528915278
- name: test_vscode
1529015279
- name: test_connectivity
1529115280
- name: test_apistrict
15292-
- name: test_always_failing
1529315281
- name: linux_coverage
1529415282
display_name: "Ubuntu 20.04 x64 (Coverage and Static Analysis Check)"
1529515283
run_on: ubuntu2004-small

.evergreen/evergreen.yml.in

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1680,17 +1680,6 @@ tasks:
16801680
mongosh_run_only_in_package: "<% out(packageName) %>"
16811681
task_name: ${task_name}
16821682
<% } %>
1683-
# TODO: This is an always failing test to check Foliage. Should be removed afterwards.
1684-
- name: test_always_failing
1685-
tags: ["assigned_to_jira_team_mongosh_mongosh", "unit-test"]
1686-
commands:
1687-
- command: shell.exec
1688-
type: setup
1689-
params:
1690-
working_dir: src
1691-
shell: bash
1692-
script: |
1693-
node -e "throw new Error()"
16941683

16951684
###
16961685
# INTEGRATION TESTS
@@ -2146,7 +2135,6 @@ buildvariants:
21462135
- name: test_vscode
21472136
- name: test_connectivity
21482137
- name: test_apistrict
2149-
- name: test_always_failing
21502138
- name: linux_coverage
21512139
display_name: "Ubuntu 20.04 x64 (Coverage and Static Analysis Check)"
21522140
run_on: ubuntu2004-small

THIRD_PARTY_NOTICES.md

Lines changed: 1 addition & 1 deletion
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 Thu Dec 12 2024.
2+
This document was automatically generated on Sun Dec 15 2024.
33

44
## List of dependencies
55

package-lock.json

Lines changed: 193 additions & 0 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

packages/browser-repl/package.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
"depcheck": "depcheck",
3636
"compile": "tsc -p tsconfig.json",
3737
"prettier": "prettier",
38-
"reformat": "npm run prettier -- --write . && npm run eslint --fix"
38+
"reformat": "npm run prettier -- --write . && npm run eslint --fix",
39+
"sync-to-compass": "node scripts/sync-to-compass.js"
3940
},
4041
"config": {
4142
"unsafe-perm": true
@@ -76,6 +77,9 @@
7677
"@mongodb-js/prettier-config-devtools": "^1.0.1",
7778
"@mongodb-js/tsconfig-mongosh": "^1.0.0",
7879
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.8",
80+
"@testing-library/dom": "^8.20.1",
81+
"@testing-library/react": "^12.1.5",
82+
"@testing-library/user-event": "^13.5.0",
7983
"@types/numeral": "^2.0.2",
8084
"@types/react": "^16.9.17",
8185
"@types/react-dom": "^18.0.8",
@@ -96,6 +100,7 @@
96100
"karma-mocha-reporter": "^2.2.5",
97101
"karma-typescript": "^5.5.4",
98102
"karma-webpack": "^5.0.0",
103+
"lodash": "^4.17.21",
99104
"path-browserify": "^1.0.1",
100105
"prettier": "^2.8.8",
101106
"prop-types": "^15.7.2",

0 commit comments

Comments
 (0)