Skip to content

Commit 10baa36

Browse files
committed
Merge branch 'main' of github.com:mongodb-js/mongosh into gagik/e2e-foliage
2 parents c650f8e + c154e17 commit 10baa36

File tree

11 files changed

+5745
-9985
lines changed

11 files changed

+5745
-9985
lines changed

.evergreen.yml

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

.evergreen/InstallNode.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ Get-ChildItem -Path $PSScriptRoot
2020
Set-Location -Path $node_dir
2121
Remove-Item .\npm
2222
Remove-Item .\npm.cmd
23+
if (Test-Path .\npm.ps1) { Remove-Item .\npm.ps1 }
2324
Remove-Item .\npx
2425
Remove-Item .\npx.cmd
26+
if (Test-Path .\npx.ps1) { Remove-Item .\npx.ps1 }
2527
Move-Item .\node_modules\npm -Destination .\node_modules\npm2
2628
.\node.exe .\node_modules\npm2\bin\npm-cli.js i -g npm@6

.evergreen/evergreen.yml.in

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
const path = require('path');
33

44
const NODE_JS_VERSION_20 = require('./node-20-latest.json').version;
5-
const NODE_JS_VERSION_16 = require('./node-16-latest.json').version;
65

76
const MONGODB_VERSIONS = [
87
{ shortName: '42xc', versionSpec: '4.2.x' },
@@ -20,8 +19,7 @@ const MONGODB_VERSIONS = [
2019
{ shortName: 'latest', versionSpec: 'latest-alpha-enterprise' }
2120
];
2221
const NODE_VERSIONS = [
23-
{ shortName: '20', versionSpec: NODE_JS_VERSION_20, skipNodeVersionCheck: '' },
24-
{ shortName: '16', versionSpec: NODE_JS_VERSION_16, skipNodeVersionCheck: '' }
22+
{ shortName: '20', versionSpec: NODE_JS_VERSION_20, skipNodeVersionCheck: '' }
2523
];
2624

2725
const pathToPackages = path.join(__dirname, '..', 'packages');
@@ -1143,7 +1141,7 @@ tasks:
11431141

11441142
###
11451143
# UNIT TESTS
1146-
# E.g. test_m60xc_n16 stands for mongod 6.0.x, community edition, Node.js 16
1144+
# E.g. test_m60xc_n20 stands for mongod 6.0.x, community edition, Node.js 20
11471145
###
11481146
<% for (const { id, packageName } of UNIT_TESTS) { %>
11491147
- name: test_<% out(id) %>

.evergreen/install-node.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ set -e
22
set -x
33
export BASEDIR="$PWD/.evergreen"
44

5-
if echo $NODE_JS_VERSION | grep -q ^16 ; then
6-
NPM_VERSION=9.9.2 # 9.9.3 does not install well on Windows
7-
else
8-
NPM_VERSION=10.8.3 # 10.9.0 does not install well on Windows
9-
fi
5+
NPM_VERSION=10.8.3 # 10.9.0 does not install well on Windows
106

117
if [ "$OS" == "Windows_NT" ]; then
128
powershell "$(cygpath -w "$BASEDIR")"/InstallNode.ps1

.evergreen/node-16-latest.json

Lines changed: 0 additions & 43 deletions
This file was deleted.

.github/workflows/cron-tasks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ jobs:
3535

3636
- uses: actions/setup-node@v4
3737
with:
38-
node-version: ^16.x
38+
node-version: ^20.x
3939
cache: "npm"
4040

4141
- name: Install npm@8
4242
run: |
43-
npm install -g npm@8
43+
npm install -g npm@10
4444
4545
- name: Install Dependencies and Compile
4646
run: |

THIRD_PARTY_NOTICES.md

Lines changed: 204 additions & 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 Mon Dec 16 2024.
2+
This document was automatically generated on Tue Dec 17 2024.
33

44
## List of dependencies
55

@@ -261,6 +261,7 @@ Package|Version|License
261261
**[get-stream](#8d24427d88f4f3193411b16e6dbdfc05d0edc3ce08460a1c73ec55718470e28c)**|6.0.1|MIT
262262
**[get-uri](#4ae602658ce541126b57c19a2c8c47ed82d62e55c642d49f59f14e841ddc1db6)**|6.0.3|MIT
263263
**[github-from-package](#8cba969ea116f44491f4fbb8b391c0ab40408fc2e5380f81bc8e8e42b55fff8b)**|0.0.0|MIT
264+
**[glibc-version](#7c3eb62c2d736e357df661728b0d6ce55b9b25b3ec0dec8848d5ea42f55c3392)**|1.0.0|Apache-2.0
264265
**[glob](#bfb95bb18e863a1c0675aab9ed67620a29ec5488a2c69667870d20e4bb3dd08c)**|10.4.5|ISC
265266
**[globals](#749052b146da20b19c298de835e7cacd7f6d1f0a87a8422e538ccdfeaa69b0a5)**|11.12.0|MIT
266267
**[gopd](#e51829c607e5861ddbe69decfaab45dbffb62e23d40af7d1f746c5bce8d05859)**|1.0.1|MIT
@@ -23516,6 +23517,208 @@ License files:
2351623517

2351723518

2351823519

23520+
<a id="7c3eb62c2d736e357df661728b0d6ce55b9b25b3ec0dec8848d5ea42f55c3392"></a>
23521+
### [glibc-version](https://www.npmjs.com/package/glibc-version) (version 1.0.0)
23522+
License tags: Apache-2.0
23523+
23524+
License files:
23525+
* LICENSE:
23526+
23527+
23528+
Apache License
23529+
Version 2.0, January 2004
23530+
http://www.apache.org/licenses/
23531+
23532+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
23533+
23534+
1. Definitions.
23535+
23536+
"License" shall mean the terms and conditions for use, reproduction,
23537+
and distribution as defined by Sections 1 through 9 of this document.
23538+
23539+
"Licensor" shall mean the copyright owner or entity authorized by
23540+
the copyright owner that is granting the License.
23541+
23542+
"Legal Entity" shall mean the union of the acting entity and all
23543+
other entities that control, are controlled by, or are under common
23544+
control with that entity. For the purposes of this definition,
23545+
"control" means (i) the power, direct or indirect, to cause the
23546+
direction or management of such entity, whether by contract or
23547+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
23548+
outstanding shares, or (iii) beneficial ownership of such entity.
23549+
23550+
"You" (or "Your") shall mean an individual or Legal Entity
23551+
exercising permissions granted by this License.
23552+
23553+
"Source" form shall mean the preferred form for making modifications,
23554+
including but not limited to software source code, documentation
23555+
source, and configuration files.
23556+
23557+
"Object" form shall mean any form resulting from mechanical
23558+
transformation or translation of a Source form, including but
23559+
not limited to compiled object code, generated documentation,
23560+
and conversions to other media types.
23561+
23562+
"Work" shall mean the work of authorship, whether in Source or
23563+
Object form, made available under the License, as indicated by a
23564+
copyright notice that is included in or attached to the work
23565+
(an example is provided in the Appendix below).
23566+
23567+
"Derivative Works" shall mean any work, whether in Source or Object
23568+
form, that is based on (or derived from) the Work and for which the
23569+
editorial revisions, annotations, elaborations, or other modifications
23570+
represent, as a whole, an original work of authorship. For the purposes
23571+
of this License, Derivative Works shall not include works that remain
23572+
separable from, or merely link (or bind by name) to the interfaces of,
23573+
the Work and Derivative Works thereof.
23574+
23575+
"Contribution" shall mean any work of authorship, including
23576+
the original version of the Work and any modifications or additions
23577+
to that Work or Derivative Works thereof, that is intentionally
23578+
submitted to Licensor for inclusion in the Work by the copyright owner
23579+
or by an individual or Legal Entity authorized to submit on behalf of
23580+
the copyright owner. For the purposes of this definition, "submitted"
23581+
means any form of electronic, verbal, or written communication sent
23582+
to the Licensor or its representatives, including but not limited to
23583+
communication on electronic mailing lists, source code control systems,
23584+
and issue tracking systems that are managed by, or on behalf of, the
23585+
Licensor for the purpose of discussing and improving the Work, but
23586+
excluding communication that is conspicuously marked or otherwise
23587+
designated in writing by the copyright owner as "Not a Contribution."
23588+
23589+
"Contributor" shall mean Licensor and any individual or Legal Entity
23590+
on behalf of whom a Contribution has been received by Licensor and
23591+
subsequently incorporated within the Work.
23592+
23593+
2. Grant of Copyright License. Subject to the terms and conditions of
23594+
this License, each Contributor hereby grants to You a perpetual,
23595+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
23596+
copyright license to reproduce, prepare Derivative Works of,
23597+
publicly display, publicly perform, sublicense, and distribute the
23598+
Work and such Derivative Works in Source or Object form.
23599+
23600+
3. Grant of Patent License. Subject to the terms and conditions of
23601+
this License, each Contributor hereby grants to You a perpetual,
23602+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
23603+
(except as stated in this section) patent license to make, have made,
23604+
use, offer to sell, sell, import, and otherwise transfer the Work,
23605+
where such license applies only to those patent claims licensable
23606+
by such Contributor that are necessarily infringed by their
23607+
Contribution(s) alone or by combination of their Contribution(s)
23608+
with the Work to which such Contribution(s) was submitted. If You
23609+
institute patent litigation against any entity (including a
23610+
cross-claim or counterclaim in a lawsuit) alleging that the Work
23611+
or a Contribution incorporated within the Work constitutes direct
23612+
or contributory patent infringement, then any patent licenses
23613+
granted to You under this License for that Work shall terminate
23614+
as of the date such litigation is filed.
23615+
23616+
4. Redistribution. You may reproduce and distribute copies of the
23617+
Work or Derivative Works thereof in any medium, with or without
23618+
modifications, and in Source or Object form, provided that You
23619+
meet the following conditions:
23620+
23621+
(a) You must give any other recipients of the Work or
23622+
Derivative Works a copy of this License; and
23623+
23624+
(b) You must cause any modified files to carry prominent notices
23625+
stating that You changed the files; and
23626+
23627+
(c) You must retain, in the Source form of any Derivative Works
23628+
that You distribute, all copyright, patent, trademark, and
23629+
attribution notices from the Source form of the Work,
23630+
excluding those notices that do not pertain to any part of
23631+
the Derivative Works; and
23632+
23633+
(d) If the Work includes a "NOTICE" text file as part of its
23634+
distribution, then any Derivative Works that You distribute must
23635+
include a readable copy of the attribution notices contained
23636+
within such NOTICE file, excluding those notices that do not
23637+
pertain to any part of the Derivative Works, in at least one
23638+
of the following places: within a NOTICE text file distributed
23639+
as part of the Derivative Works; within the Source form or
23640+
documentation, if provided along with the Derivative Works; or,
23641+
within a display generated by the Derivative Works, if and
23642+
wherever such third-party notices normally appear. The contents
23643+
of the NOTICE file are for informational purposes only and
23644+
do not modify the License. You may add Your own attribution
23645+
notices within Derivative Works that You distribute, alongside
23646+
or as an addendum to the NOTICE text from the Work, provided
23647+
that such additional attribution notices cannot be construed
23648+
as modifying the License.
23649+
23650+
You may add Your own copyright statement to Your modifications and
23651+
may provide additional or different license terms and conditions
23652+
for use, reproduction, or distribution of Your modifications, or
23653+
for any such Derivative Works as a whole, provided Your use,
23654+
reproduction, and distribution of the Work otherwise complies with
23655+
the conditions stated in this License.
23656+
23657+
5. Submission of Contributions. Unless You explicitly state otherwise,
23658+
any Contribution intentionally submitted for inclusion in the Work
23659+
by You to the Licensor shall be under the terms and conditions of
23660+
this License, without any additional terms or conditions.
23661+
Notwithstanding the above, nothing herein shall supersede or modify
23662+
the terms of any separate license agreement you may have executed
23663+
with Licensor regarding such Contributions.
23664+
23665+
6. Trademarks. This License does not grant permission to use the trade
23666+
names, trademarks, service marks, or product names of the Licensor,
23667+
except as required for reasonable and customary use in describing the
23668+
origin of the Work and reproducing the content of the NOTICE file.
23669+
23670+
7. Disclaimer of Warranty. Unless required by applicable law or
23671+
agreed to in writing, Licensor provides the Work (and each
23672+
Contributor provides its Contributions) on an "AS IS" BASIS,
23673+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
23674+
implied, including, without limitation, any warranties or conditions
23675+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
23676+
PARTICULAR PURPOSE. You are solely responsible for determining the
23677+
appropriateness of using or redistributing the Work and assume any
23678+
risks associated with Your exercise of permissions under this License.
23679+
23680+
8. Limitation of Liability. In no event and under no legal theory,
23681+
whether in tort (including negligence), contract, or otherwise,
23682+
unless required by applicable law (such as deliberate and grossly
23683+
negligent acts) or agreed to in writing, shall any Contributor be
23684+
liable to You for damages, including any direct, indirect, special,
23685+
incidental, or consequential damages of any character arising as a
23686+
result of this License or out of the use or inability to use the
23687+
Work (including but not limited to damages for loss of goodwill,
23688+
work stoppage, computer failure or malfunction, or any and all
23689+
other commercial damages or losses), even if such Contributor
23690+
has been advised of the possibility of such damages.
23691+
23692+
9. Accepting Warranty or Additional Liability. While redistributing
23693+
the Work or Derivative Works thereof, You may choose to offer,
23694+
and charge a fee for, acceptance of support, warranty, indemnity,
23695+
or other liability obligations and/or rights consistent with this
23696+
License. However, in accepting such obligations, You may act only
23697+
on Your own behalf and on Your sole responsibility, not on behalf
23698+
of any other Contributor, and only if You agree to indemnify,
23699+
defend, and hold each Contributor harmless for any liability
23700+
incurred by, or claims asserted against, such Contributor by reason
23701+
of your accepting any such warranty or additional liability.
23702+
23703+
END OF TERMS AND CONDITIONS
23704+
23705+
Copyright 2020 MongoDB Inc.
23706+
23707+
Licensed under the Apache License, Version 2.0 (the "License");
23708+
you may not use this file except in compliance with the License.
23709+
You may obtain a copy of the License at
23710+
23711+
http://www.apache.org/licenses/LICENSE-2.0
23712+
23713+
Unless required by applicable law or agreed to in writing, software
23714+
distributed under the License is distributed on an "AS IS" BASIS,
23715+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
23716+
See the License for the specific language governing permissions and
23717+
limitations under the License.
23718+
23719+
23720+
23721+
2351923722
<a id="bfb95bb18e863a1c0675aab9ed67620a29ec5488a2c69667870d20e4bb3dd08c"></a>
2352023723
### [glob](https://www.npmjs.com/package/glob) (version 10.4.5)
2352123724
License tags: ISC

package-lock.json

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"create-purls-file": "node scripts/create-purls.js .sbom/dependencies.json .sbom/node-js-dep.json > .sbom/purls.txt",
5454
"preupdate-third-party-notices": "npm run create-dependency-sbom-lists",
5555
"update-third-party-notices": "mongodb-sbom-tools generate-3rd-party-notices --product='mongosh' --dependencies=.sbom/dependencies.json > THIRD_PARTY_NOTICES.md",
56-
"update-node-js-versions": "npx @pkgjs/nv ls v20 > .evergreen/node-20-latest.json && npx @pkgjs/nv ls v16 > .evergreen/node-16-latest.json",
56+
"update-node-js-versions": "npx @pkgjs/nv ls v20 > .evergreen/node-20-latest.json",
5757
"update-evergreen-config": "npm run test-evergreen-expansions && node .evergreen/generate-evergreen-yml.js .evergreen/evergreen.yml.in > .evergreen.yml",
5858
"update-cli-usage-text": "node scripts/update-cli-usage-text.js",
5959
"update-security-test-summary": "ts-node scripts/generate-security-test-summary.ts > docs/security-test-summary.md",
@@ -107,7 +107,6 @@
107107
"@types/which": "^1.3.2",
108108
"chai": "^4.2.0",
109109
"cross-env": "^6.0.3",
110-
"depcheck": "^1.4.7",
111110
"duplexpair": "^1.0.2",
112111
"find-up": "^5.0.0",
113112
"glob": "^10.3.12",
@@ -131,7 +130,9 @@
131130
"webpack-bundle-analyzer": "^4.7.0",
132131
"webpack-cli": "^4.3.1",
133132
"which": "^2.0.2",
134-
"yaml": "^1.10.0"
133+
"yaml": "^1.10.0",
134+
"depcheck": "^1.4.7",
135+
"@pkgjs/nv": "^0.2.2"
135136
},
136137
"optionalDependencies": {
137138
"lerna": "^8.1.8"

0 commit comments

Comments
 (0)