Skip to content

chore(deps): bump driver to 4.2.1 COMPASS-5340 #1168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 2, 2021
Merged

chore(deps): bump driver to 4.2.1 COMPASS-5340 #1168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6c5dd2
chore(deps): bump driver to 4.2.1 COMPASS-5340
addaleax Dec 1, 2021
b625e24
fixup: adjust types to account for webpack TS problem
addaleax Dec 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
"karma-typescript": "^5.5.1",
"lerna": "^4.0.0",
"mocha": "^7.1.2",
"mongodb": "^4.1.4",
"mongodb": "^4.2.1",
"mongodb-download-url": "^1.1.2",
"mongodb-js-precommit": "^2.0.0",
"nock": "^13.0.11",
Expand Down
6 changes: 3 additions & 3 deletions packages/node-runtime-worker-thread/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/node-runtime-worker-thread/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@mongosh/service-provider-core": "0.0.0-dev.0",
"@mongosh/service-provider-server": "0.0.0-dev.0",
"@mongosh/types": "0.0.0-dev.0",
"bson": "^4.5.4",
"bson": "^4.6.0",
"mocha": "^7.1.2",
"postmsg-rpc": "^2.4.0",
"terser-webpack-plugin": "^4.2.3",
Expand Down
12 changes: 10 additions & 2 deletions packages/node-runtime-worker-thread/src/worker-runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,21 @@ const workerRuntime: WorkerRuntime = {
driverOptions: MongoClientOptions = {},
cliOptions: { nodb?: boolean } = {}
) {
provider = await CompassServiceProvider.connect(
// XXX The types here work out fine, and tsc accepts this code
// without 'as any'. However, since a change to the driver's
// .find() method signature (https://github.com/mongodb/node-mongodb-native/commit/307d623ea597c5d89c548b6731bd692fec7a8047)
// the webpack integration build fails with:
// [tsl] ERROR in /home/addaleax/src/mongosh/packages/node-runtime-worker-thread/src/worker-runtime.ts(88,5)
// TS2589: Type instantiation is excessively deep and possibly infinite.
// I could not figure out why exactly that was the case, so 'as any'
// will have to do for now.
provider = await (CompassServiceProvider as any).connect(
uri,
driverOptions,
cliOptions,
messageBus
);
runtime = new ElectronRuntime(provider, messageBus);
runtime = new ElectronRuntime(provider as ServiceProvider, messageBus);
runtime.setEvaluationListener(evaluationListener);
},

Expand Down
49 changes: 8 additions & 41 deletions packages/service-provider-core/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/service-provider-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"dependencies": {
"@mongosh/errors": "0.0.0-dev.0",
"@mongosh/i18n": "0.0.0-dev.0",
"bson": "^4.5.4",
"mongodb": "^4.1.4",
"bson": "^4.6.0",
"mongodb": "^4.2.1",
"mongodb-build-info": "^1.2.0",
"mongodb-connection-string-url": "^2.2.0"
},
Expand Down
38 changes: 11 additions & 27 deletions packages/service-provider-server/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/service-provider-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@mongosh/types": "0.0.0-dev.0",
"@types/sinon-chai": "^3.2.3",
"aws4": "^1.11.0",
"mongodb": "^4.1.4",
"mongodb": "^4.2.1",
"mongodb-connection-string-url": "^2.2.0",
"saslprep": "mongodb-js/saslprep#v1.0.4"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/shell-api/src/change-stream-cursor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export default class ChangeStreamCursor extends ShellApiWithMongoClass {

@returnsPromise
@deprecated
async hasNext(): Promise<void> {
async hasNext(): Promise<boolean> {
await this._instanceState.printWarning(
'If there are no documents in the batch, hasNext will block. Use tryNext if you want to check if there ' +
'are any documents without waiting.'
Expand Down
6 changes: 3 additions & 3 deletions packages/snippet-manager/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/snippet-manager/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@mongosh/errors": "0.0.0-dev.0",
"@mongosh/shell-api": "0.0.0-dev.0",
"@mongosh/types": "0.0.0-dev.0",
"bson": "^4.5.4",
"bson": "^4.6.0",
"cross-spawn": "^7.0.3",
"escape-string-regexp": "^4.0.0",
"joi": "^17.4.0",
Expand Down