Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions configs/mocha-config-devtools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
"devDependencies": {
"@mongodb-js/prettier-config-devtools": "^1.0.2",
"prettier": "^3.5.3",
"react": ">=16"
"react": "^17.0.2"
},
"peerDependencies": {
"react": ">=16"
"react": "^17.0.2"
},
"dependencies": {
"@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
Expand Down
2 changes: 2 additions & 0 deletions configs/mocha-config-devtools/register/tsnode-register.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ require('ts-node').register({
compilerOptions: {
allowJs: true,
jsx: 'react',
module: 'NodeNext',
moduleResolution: 'NodeNext',
},
});

Expand Down
2 changes: 1 addition & 1 deletion configs/tsconfig-devtools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"tsconfig.react.json"
],
"peerDependencies": {
"typescript": "^5.0.4"
"typescript": "^5.8.2"
},
"devDependencies": {
"@mongodb-js/prettier-config-devtools": "^1.0.2",
Expand Down
69,804 changes: 22,868 additions & 46,936 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"request-npm-token": "request-npm-token"
},
"dependencies": {
"@mongodb-js/monorepo-tools": "^1.1.18"
"@mongodb-js/monorepo-tools": "^1.2.3"
},
"devDependencies": {
"@babel/core": "^7.22.8",
Expand Down
4 changes: 2 additions & 2 deletions packages/device-id/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@
"@types/sinon-chai": "^3.2.5",
"chai": "^4.5.0",
"depcheck": "^1.4.7",
"eslint": "^7.25.0",
"eslint": "^7.25.0 || ^8.0.0",
"gen-esm-wrapper": "^1.1.3",
"mocha": "^8.4.0",
"nyc": "^15.1.0",
"prettier": "^3.5.3",
"sinon": "^9.2.3",
"typescript": "^5.0.4"
"typescript": "^5.8.2"
}
}
14 changes: 7 additions & 7 deletions packages/devtools-connect/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@
"@mongodb-js/oidc-http-server-pages": "1.1.8",
"@mongodb-js/devtools-proxy-support": "^0.5.5",
"lodash.merge": "^4.6.2",
"mongodb-connection-string-url": "^3.0.0",
"mongodb-connection-string-url": "^3.0.1 || ^7.0.0",
"socks": "^2.7.3"
},
"peerDependencies": {
"@mongodb-js/oidc-plugin": "^2.0.0",
"mongodb": "^6.9.0",
"mongodb": "^6.9.0 || ^7.0.0",
"mongodb-log-writer": "^2.4.4"
},
"devDependencies": {
Expand All @@ -67,28 +67,28 @@
"@typescript-eslint/eslint-plugin": "^5.59.0",
"@typescript-eslint/parser": "^5.59.0",
"chai": "^4.5.0",
"eslint": "^7.25.0",
"eslint": "^7.25.0 || ^8.0.0",
"eslint-config-semistandard": "^17.0.0",
"eslint-config-standard": "^17.1.0",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-promise": "^6.1.1",
"gen-esm-wrapper": "^1.1.3",
"mocha": "^8.4.0",
"mongodb": "^6.9.0",
"mongodb": "^6.9.0 || ^7.0.0",
"mongodb-log-writer": "^2.4.4",
"nyc": "^15.1.0",
"os-dns-native": "^1.2.0",
"resolve-mongodb-srv": "^1.1.1",
"sinon-chai": "^3.7.0",
"ts-node": "^10.9.2",
"ts-sinon": "^2.0.1",
"typescript": "^5.0.4",
"typescript": "^5.8.2",
"prettier": "^3.5.3"
},
"optionalDependencies": {
"kerberos": "^2.1.0",
"mongodb-client-encryption": "^6.1.0",
"kerberos": "^2.1.0 || ^7.0.0",
"mongodb-client-encryption": "^6.1.0 || ^7.0.0",
"os-dns-native": "^1.2.0",
"resolve-mongodb-srv": "^1.1.1"
}
Expand Down
8 changes: 7 additions & 1 deletion packages/devtools-connect/src/connect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,13 @@ async function connectWithFailFast(
let failEarlyClosePromise: Promise<void> | null = null;
logger.emit('devtools-connect:connect-attempt-initialized', {
uri,
driver: client.options.metadata.driver,
driver: {
// metadata is hidden and driverInfo is deprecated and nullable
// because this is just informational, do our best effort to get that info
name: client.options.driverInfo?.name ?? 'mongodb-js',
version: client.options.driverInfo?.version ?? '<unk>',
},

// eslint-disable-next-line @typescript-eslint/no-var-requires
devtoolsConnectVersion: require('../package.json').version,
host: client.options.srvHost ?? client.options.hosts.join(','),
Expand Down
3 changes: 1 addition & 2 deletions packages/devtools-connect/src/log-hook.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ import {
} from '@mongodb-js/devtools-proxy-support';

export interface MongoLogWriter
extends OIDCMongoLogWriter,
ProxyMongoLogWriter {}
extends OIDCMongoLogWriter, ProxyMongoLogWriter {}

export function hookLogger(
emitter: ConnectLogEmitter,
Expand Down
3 changes: 1 addition & 2 deletions packages/devtools-connect/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,7 @@ export interface ConnectRetryAfterTLSErrorEvent {
}

export interface ConnectEventMap
extends MongoDBOIDCLogEventsMap,
ProxyEventMap {
extends MongoDBOIDCLogEventsMap, ProxyEventMap {
/** Signals that a connection attempt is about to be performed. */
'devtools-connect:connect-attempt-initialized': (
ev: ConnectAttemptInitializedEvent,
Expand Down
6 changes: 3 additions & 3 deletions packages/devtools-proxy-support/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"http-proxy-agent": "^7.0.2",
"https-proxy-agent": "^7.0.5",
"socks-proxy-agent": "^8.0.4",
"ssh2": "^1.15.0",
"ssh2": "^1.17.0",
"system-ca": "^2.0.1"
},
"devDependencies": {
Expand All @@ -89,13 +89,13 @@
"depcheck": "^1.4.7",
"duplexpair": "^1.0.2",
"electron": "^31.2.1",
"eslint": "^7.25.0",
"eslint": "^7.25.0 || ^8.0.0",
"gen-esm-wrapper": "^1.1.3",
"mocha": "^8.4.0",
"nyc": "^15.1.0",
"prettier": "^3.5.3",
"sinon": "^9.2.3",
"typescript": "^5.0.4",
"typescript": "^5.8.2",
"xvfb-maybe": "^0.2.1"
}
}
4 changes: 2 additions & 2 deletions packages/dl-center/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@
"json-schema-to-typescript": "^13.0.2",
"chai": "^4.5.0",
"depcheck": "^1.4.7",
"eslint": "^7.25.0",
"eslint": "^7.25.0 || ^8.0.0",
"gen-esm-wrapper": "^1.1.3",
"mocha": "^8.4.0",
"nock": "^13.3.1",
"nyc": "^15.1.0",
"prettier": "^3.5.3",
"s3rver": "^3.7.1",
"sinon": "^9.2.3",
"typescript": "^5.0.4"
"typescript": "^5.8.2"
},
"dependencies": {
"ajv": "^6.12.5",
Expand Down
4 changes: 2 additions & 2 deletions packages/download-url/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@
"@types/mocha": "^9.1.1",
"@types/node": "^22.15.30",
"depcheck": "^1.4.7",
"eslint": "^7.25.0",
"eslint": "^7.25.0 || ^8.0.0",
"gen-esm-wrapper": "^1.1.3",
"mocha": "^8.4.0",
"nyc": "^15.1.0",
"prettier": "^3.5.3",
"sinon": "^9.2.3",
"typescript": "^5.0.4",
"typescript": "^5.8.2",
"ts-node": "^10.9.2"
},
"keywords": [
Expand Down
4 changes: 2 additions & 2 deletions packages/get-os-info/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@
"@types/sinon-chai": "^3.2.5",
"chai": "^4.5.0",
"depcheck": "^1.4.7",
"eslint": "^7.25.0",
"eslint": "^7.25.0 || ^8.0.0",
"gen-esm-wrapper": "^1.1.3",
"mocha": "^8.4.0",
"nyc": "^15.1.0",
"prettier": "^3.5.3",
"sinon": "^9.2.3",
"typescript": "^5.0.4"
"typescript": "^5.8.2"
}
}
6 changes: 3 additions & 3 deletions packages/mongodb-build-info/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@
"@types/mocha": "^9.1.1",
"chai": "^4.5.0",
"depcheck": "^1.4.7",
"eslint": "^7.25.0",
"eslint": "^7.25.0 || ^8.0.0",
"mocha": "^8.4.0",
"nyc": "^15.1.0",
"typescript": "^5.0.4"
"typescript": "^5.8.2"
},
"dependencies": {
"debug": "^4.4.0",
"mongodb-connection-string-url": "^3.0.0"
"mongodb-connection-string-url": "^3.0.1 || ^7.0.0"
}
}
4 changes: 2 additions & 2 deletions packages/mongodb-cloud-info/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"chai": "^4.5.0",
"cheerio": "^1.0.0-rc.12",
"depcheck": "^1.4.7",
"eslint": "^7.25.0",
"eslint": "^7.25.0 || ^8.0.0",
"gce-ips": "^1.0.2",
"gen-esm-wrapper": "^1.1.3",
"mocha": "^8.4.0",
Expand All @@ -77,6 +77,6 @@
"prettier": "^3.5.3",
"sinon": "^9.2.3",
"ts-node": "^10.9.2",
"typescript": "^5.0.4"
"typescript": "^5.8.2"
}
}
8 changes: 4 additions & 4 deletions packages/mongodb-constants/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"reformat": "npm run prettier -- --write ."
},
"peerDependencies": {
"bson": "^6.10.3"
"bson": "^4.6.3 || ^5 || ^6.10.3 || ^7.0.0"
},
"devDependencies": {
"@mongodb-js/eslint-config-devtools": "0.9.12",
Expand All @@ -63,17 +63,17 @@
"@types/mocha": "^9.1.1",
"@types/semver": "^7.7.0",
"@types/sinon-chai": "^3.2.5",
"bson": "^6.10.3",
"bson": "^4.6.3 || ^5 || ^6.10.3 || ^7.0.0",
"acorn": "^8.14.1",
"chai": "^4.5.0",
"depcheck": "^1.4.7",
"eslint": "^7.25.0",
"eslint": "^7.25.0 || ^8.0.0",
"gen-esm-wrapper": "^1.1.3",
"mocha": "^8.4.0",
"nyc": "^15.1.0",
"prettier": "^3.5.3",
"sinon": "^9.2.3",
"typescript": "^5.0.4"
"typescript": "^5.8.2"
},
"dependencies": {
"semver": "^7.7.1"
Expand Down
10 changes: 3 additions & 7 deletions packages/mongodb-constants/src/stage-operators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1279,17 +1279,13 @@ const STAGE_OPERATORS = [
*/
const STAGE_OPERATOR_NAMES = STAGE_OPERATORS.map((op) => op.name);

const OUT_STAGES = STAGE_OPERATORS.filter(
(stage) => stage.outputStage,
) as Extract<(typeof STAGE_OPERATORS)[number], { outputStage: true }>[];
const OUT_STAGES = STAGE_OPERATORS.filter((stage) => stage.outputStage);

const FULL_SCAN_STAGES = STAGE_OPERATORS.filter(
(stage) => stage.fullScan,
) as Extract<(typeof STAGE_OPERATORS)[number], { fullScan: true }>[];
const FULL_SCAN_STAGES = STAGE_OPERATORS.filter((stage) => stage.fullScan);

const REQUIRED_AS_FIRST_STAGE = STAGE_OPERATORS.filter(
(stage) => stage.firstStage,
) as Extract<(typeof STAGE_OPERATORS)[number], { firstStage: true }>[];
);

export {
STAGE_OPERATORS,
Expand Down
4 changes: 2 additions & 2 deletions packages/mongodb-downloader/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@
"@types/tar": "^6.1.5",
"chai": "^4.5.0",
"depcheck": "^1.4.7",
"eslint": "^7.25.0",
"eslint": "^7.25.0 || ^8.0.0",
"gen-esm-wrapper": "^1.1.3",
"mocha": "^8.4.0",
"nyc": "^15.1.0",
"prettier": "^3.5.3",
"sinon": "^9.2.3",
"sinon-chai": "^3.7.0",
"typescript": "^5.0.4"
"typescript": "^5.8.2"
}
}
6 changes: 3 additions & 3 deletions packages/mongodb-log-writer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"heap-js": "^2.3.0"
},
"peerDependencies": {
"bson": "6.x"
"bson": "^4.6.3 || ^5 || ^6.10.3 || ^7.0.0"
},
"devDependencies": {
"@mongodb-js/eslint-config-devtools": "0.9.12",
Expand All @@ -80,12 +80,12 @@
"acorn": "^8.14.1",
"chai": "^4.5.0",
"depcheck": "^1.4.7",
"eslint": "^7.25.0",
"eslint": "^7.25.0 || ^8.0.0",
"gen-esm-wrapper": "^1.1.3",
"mocha": "^8.4.0",
"nyc": "^15.1.0",
"prettier": "^3.5.3",
"sinon": "^9.2.3",
"typescript": "^5.0.4"
"typescript": "^5.8.2"
}
}
2 changes: 1 addition & 1 deletion packages/mongodb-ns/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"@types/mocha": "^9.1.1",
"@types/sinon-chai": "^3.2.5",
"depcheck": "^1.4.7",
"eslint": "^7.25.0",
"eslint": "^7.25.0 || ^8.0.0",
"gen-esm-wrapper": "^1.1.3",
"mocha": "^8.4.0",
"nyc": "^15.1.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/mongodb-redact/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@
"@types/sinon-chai": "^3.2.5",
"chai": "^4.5.0",
"depcheck": "^1.4.7",
"eslint": "^7.25.0",
"eslint": "^7.25.0 || ^8.0.0",
"gen-esm-wrapper": "^1.1.3",
"mocha": "^8.4.0",
"nyc": "^15.1.0",
"prettier": "^3.5.3",
"sinon": "^9.2.3",
"typescript": "^5.0.4"
"typescript": "^5.8.2"
},
"dependencies": {
"regexp.escape": "^2.0.1",
Expand Down
8 changes: 4 additions & 4 deletions packages/mongodb-runner/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
"@mongodb-js/oidc-mock-provider": "^0.12.0",
"@mongodb-js/saslprep": "^1.3.2",
"debug": "^4.4.0",
"mongodb": "^6.9.0",
"mongodb-connection-string-url": "^3.0.0",
"mongodb": "^6.9.0 || ^7.0.0",
"mongodb-connection-string-url": "^3.0.1 || ^7.0.0",
"yargs": "^17.7.2"
},
"devDependencies": {
Expand All @@ -77,12 +77,12 @@
"@types/yargs": "^17.0.24",
"chai": "^4.5.0",
"depcheck": "^1.4.7",
"eslint": "^7.25.0",
"eslint": "^7.25.0 || ^8.0.0",
"gen-esm-wrapper": "^1.1.3",
"mocha": "^8.4.0",
"nyc": "^15.1.0",
"prettier": "^3.5.3",
"sinon": "^9.2.3",
"typescript": "^5.0.4"
"typescript": "^5.8.2"
}
}
Loading
Loading