From c5a07b1c93965f26348a98786d4bb6ba71d032b0 Mon Sep 17 00:00:00 2001 From: gagik Date: Tue, 25 Feb 2025 12:29:57 +0100 Subject: [PATCH 1/5] chore(compass-shell): update mongosh logging --- .../src/modules/worker-runtime.ts | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/packages/compass-shell/src/modules/worker-runtime.ts b/packages/compass-shell/src/modules/worker-runtime.ts index 33dcdb535b1..d0e8d6f8ba0 100644 --- a/packages/compass-shell/src/modules/worker-runtime.ts +++ b/packages/compass-shell/src/modules/worker-runtime.ts @@ -4,7 +4,7 @@ import type { } from '@mongodb-js/compass-connections/provider'; import type { MongoLogWriter } from '@mongodb-js/compass-logging/provider'; import type { TrackFunction } from '@mongodb-js/compass-telemetry/provider'; -import { setupLoggerAndTelemetry } from '@mongosh/logging'; +import { setupLoggingAndTelemetry } from '@mongosh/logging'; import { EventEmitter } from 'events'; declare const __webpack_require__: typeof require; @@ -52,10 +52,9 @@ export function createWorkerRuntime( ): typeof WorkerRuntime['prototype'] { const emitter = new EventEmitter(); - setupLoggerAndTelemetry( - emitter, - log, - { + const loggingAndTelemetry = setupLoggingAndTelemetry({ + bus: emitter, + analytics: { identify: () => { /* not needed */ }, @@ -63,19 +62,26 @@ export function createWorkerRuntime( // We always enable telemetry here, since the track call will // already check whether Compass telemetry is enabled or not. track: ({ event, properties }) => { - return track(`Shell ${event}`, properties, connectionInfo.current); + return track( + `Shell ${event as string}`, + // eslint-disable-next-line @typescript-eslint/no-unsafe-argument + properties, + connectionInfo.current + ); }, flush: () => { return Promise.resolve(); // not needed }, }, - { + userTraits: { platform: process.platform, arch: process.arch, }, // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-var-requires - require('../../package.json').version - ); + mongoshVersion: require('../../package.json').version, + }); + + loggingAndTelemetry.attachLogger(log); // We also don't need to pass a proper user id, since that is // handled by the Compass tracking code. From b5afe21ac011d556f5dc269e138beb6e70f7254c Mon Sep 17 00:00:00 2001 From: gagik Date: Tue, 25 Feb 2025 12:57:58 +0100 Subject: [PATCH 2/5] chore(compass-shell): update mongodb-log-writer --- package-lock.json | 102 ++++++++++++++++++++++-- packages/compass-e2e-tests/package.json | 2 +- packages/compass-logging/package.json | 2 +- packages/compass/package.json | 2 +- packages/data-service/package.json | 2 +- 5 files changed, 98 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 96c1473540d..7969c11dd64 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43549,7 +43549,7 @@ "mongodb-connection-string-url": "^3.0.1", "mongodb-data-service": "^22.25.2", "mongodb-instance-model": "^12.26.2", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "mongodb-ns": "^2.4.2", "react": "^17.0.2", "react-dom": "^17.0.2", @@ -44362,7 +44362,7 @@ "mongodb": "^6.12.0", "mongodb-build-info": "^1.7.2", "mongodb-connection-string-url": "^3.0.1", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "mongodb-runner": "^5.6.3", "node-fetch": "^2.7.0", "nyc": "^15.1.0", @@ -44623,6 +44623,19 @@ "node": ">=16 || 14 >=14.17" } }, + "packages/compass-e2e-tests/node_modules/mongodb-log-writer": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", + "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "heap-js": "^2.3.0" + }, + "peerDependencies": { + "bson": "6.x" + } + }, "packages/compass-e2e-tests/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -45843,7 +45856,7 @@ "hadron-app-registry": "^9.4.2", "hadron-ipc": "^3.4.2", "is-electron-renderer": "^2.0.1", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "react": "^17.0.2" }, "devDependencies": { @@ -45865,6 +45878,18 @@ "typescript": "^5.0.4" } }, + "packages/compass-logging/node_modules/mongodb-log-writer": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", + "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", + "license": "Apache-2.0", + "dependencies": { + "heap-js": "^2.3.0" + }, + "peerDependencies": { + "bson": "6.x" + } + }, "packages/compass-logging/node_modules/sinon": { "version": "9.2.4", "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz", @@ -47862,6 +47887,19 @@ "node": ">=16 || 14 >=14.17" } }, + "packages/compass/node_modules/mongodb-log-writer": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", + "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "heap-js": "^2.3.0" + }, + "peerDependencies": { + "bson": "6.x" + } + }, "packages/compass/node_modules/node-addon-api": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", @@ -48198,7 +48236,7 @@ "eslint": "^7.25.0", "kerberos": "^2.2.0", "mocha": "^10.2.0", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "nyc": "^15.1.0", "prettier": "^2.7.1", "sinon": "^9.2.3", @@ -48283,6 +48321,19 @@ "node": ">=12.9.0" } }, + "packages/data-service/node_modules/mongodb-log-writer": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", + "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "heap-js": "^2.3.0" + }, + "peerDependencies": { + "bson": "6.x" + } + }, "packages/data-service/node_modules/node-addon-api": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", @@ -57746,7 +57797,7 @@ "hadron-ipc": "^3.4.2", "is-electron-renderer": "^2.0.1", "mocha": "^10.2.0", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "nyc": "^15.1.0", "prettier": "^2.7.1", "react": "^17.0.2", @@ -57754,6 +57805,14 @@ "typescript": "^5.0.4" }, "dependencies": { + "mongodb-log-writer": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", + "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", + "requires": { + "heap-js": "^2.3.0" + } + }, "sinon": { "version": "9.2.4", "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz", @@ -68079,7 +68138,7 @@ "mongodb": "^6.12.0", "mongodb-build-info": "^1.7.2", "mongodb-connection-string-url": "^3.0.1", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "mongodb-runner": "^5.6.3", "node-fetch": "^2.7.0", "nyc": "^15.1.0", @@ -68263,6 +68322,15 @@ "integrity": "sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w==", "dev": true }, + "mongodb-log-writer": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", + "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", + "dev": true, + "requires": { + "heap-js": "^2.3.0" + } + }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -79989,7 +80057,7 @@ "mongodb-connection-string-url": "^3.0.1", "mongodb-data-service": "^22.25.2", "mongodb-instance-model": "^12.26.2", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "mongodb-ns": "^2.4.2", "os-dns-native": "^1.2.1", "react": "^17.0.2", @@ -80109,6 +80177,15 @@ "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", "dev": true }, + "mongodb-log-writer": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", + "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", + "dev": true, + "requires": { + "heap-js": "^2.3.0" + } + }, "node-addon-api": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", @@ -80169,7 +80246,7 @@ "mongodb-build-info": "^1.7.2", "mongodb-client-encryption": "^6.1.0", "mongodb-connection-string-url": "^3.0.1", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "mongodb-ns": "^2.4.2", "nyc": "^15.1.0", "prettier": "^2.7.1", @@ -80234,6 +80311,15 @@ "prebuild-install": "^7.1.2" } }, + "mongodb-log-writer": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", + "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", + "dev": true, + "requires": { + "heap-js": "^2.3.0" + } + }, "node-addon-api": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", diff --git a/packages/compass-e2e-tests/package.json b/packages/compass-e2e-tests/package.json index 85bccacd809..e497df9714d 100644 --- a/packages/compass-e2e-tests/package.json +++ b/packages/compass-e2e-tests/package.json @@ -61,7 +61,7 @@ "mongodb": "^6.12.0", "mongodb-build-info": "^1.7.2", "mongodb-connection-string-url": "^3.0.1", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "mongodb-runner": "^5.6.3", "node-fetch": "^2.7.0", "nyc": "^15.1.0", diff --git a/packages/compass-logging/package.json b/packages/compass-logging/package.json index 9cc1173e680..3c180197209 100644 --- a/packages/compass-logging/package.json +++ b/packages/compass-logging/package.json @@ -55,7 +55,7 @@ "hadron-app-registry": "^9.4.2", "hadron-ipc": "^3.4.2", "is-electron-renderer": "^2.0.1", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "react": "^17.0.2" }, "devDependencies": { diff --git a/packages/compass/package.json b/packages/compass/package.json index c1fa22e1446..1da800c08f5 100644 --- a/packages/compass/package.json +++ b/packages/compass/package.json @@ -268,7 +268,7 @@ "mongodb-connection-string-url": "^3.0.1", "mongodb-data-service": "^22.25.2", "mongodb-instance-model": "^12.26.2", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "mongodb-ns": "^2.4.2", "react": "^17.0.2", "react-dom": "^17.0.2", diff --git a/packages/data-service/package.json b/packages/data-service/package.json index 79ea2d1abac..cbda0ce0492 100644 --- a/packages/data-service/package.json +++ b/packages/data-service/package.json @@ -78,7 +78,7 @@ "eslint": "^7.25.0", "kerberos": "^2.2.0", "mocha": "^10.2.0", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "nyc": "^15.1.0", "prettier": "^2.7.1", "sinon": "^9.2.3", From 643072339694a309cfa0b9596b8d9ccd2c855718 Mon Sep 17 00:00:00 2001 From: gagik Date: Tue, 25 Feb 2025 13:06:12 +0100 Subject: [PATCH 3/5] chore: bump logging package --- package-lock.json | 148 ++++++++++++++-------------- packages/compass-shell/package.json | 2 +- 2 files changed, 75 insertions(+), 75 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7969c11dd64..595e1bb4d81 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8798,48 +8798,6 @@ "node": ">=14.15.1" } }, - "node_modules/@mongosh/history": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-2.4.2.tgz", - "integrity": "sha512-63qaRYr5ZU/+FjC++xX4n1+Kl3PaGFoMMrgRtsJr082uBKfWsFv81Pre/aaGRdt9IqDGFtmkiAKHdMMwnOyMFQ==", - "license": "Apache-2.0", - "dependencies": { - "mongodb-connection-string-url": "^3.0.1", - "mongodb-redact": "^1.1.5" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/logging": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-3.2.0.tgz", - "integrity": "sha512-aX7+aR8et+tiS0e69vQwSTbvdHrdoI8IW+LoAAvxiwPp33pFKqoyDU1osnmJ6TgygB+Hxt3aOqygCWi/hqNypg==", - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/devtools-connect": "^3.4.1", - "@mongosh/errors": "2.4.0", - "@mongosh/history": "2.4.2", - "@mongosh/types": "3.2.0", - "mongodb-log-writer": "^2.1.0", - "mongodb-redact": "^1.1.5" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/types": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-3.2.0.tgz", - "integrity": "sha512-tExVfsxH6NDFq8Tldc2k04t1xN5IWKqR8QffeKmNNdOmERGRi7IHMrGWV993AE1eqK0in8dbZoHbgzD6+Ql8hQ==", - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/devtools-connect": "^3.4.1" - }, - "engines": { - "node": ">=14.15.1" - } - }, "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": { "version": "5.1.1-v1", "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz", @@ -31757,6 +31715,7 @@ "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.1.0.tgz", "integrity": "sha512-ZlNts/L9fs6gQNRuqLcB0+yjjfeyapbxjdkDpeb2bEYOUUThG0iOEhzIFejv0g3TX1SSAsdrT2aGYnFqoQILgQ==", "license": "Apache-2.0", + "peer": true, "dependencies": { "heap-js": "^2.3.0" }, @@ -46523,7 +46482,7 @@ "@mongodb-js/compass-utils": "^0.8.2", "@mongodb-js/compass-workspaces": "^0.31.2", "@mongosh/browser-repl": "^3.5.0", - "@mongosh/logging": "^3.2.0", + "@mongosh/logging": "^3.5.0", "@mongosh/node-runtime-worker-thread": "^3.3.0", "bson": "^6.10.1", "compass-preferences-model": "^2.33.2", @@ -46665,6 +46624,23 @@ "node": ">=14.15.1" } }, + "packages/compass-shell/node_modules/@mongosh/logging": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-3.5.0.tgz", + "integrity": "sha512-K3eipDAltOgJ8kV/Gbu4OVDEvL+ZTJ94IYZdj7VcWZyomYIyp2buSTR/ZCWK222mEjHUry5esyalrlH5vmR7fw==", + "license": "Apache-2.0", + "dependencies": { + "@mongodb-js/devtools-connect": "^3.4.1", + "@mongosh/errors": "2.4.0", + "@mongosh/history": "2.4.5", + "@mongosh/types": "3.5.0", + "mongodb-log-writer": "^2.3.1", + "mongodb-redact": "^1.1.5" + }, + "engines": { + "node": ">=14.15.1" + } + }, "packages/compass-shell/node_modules/@mongosh/node-runtime-worker-thread": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/@mongosh/node-runtime-worker-thread/-/node-runtime-worker-thread-3.3.0.tgz", @@ -46730,6 +46706,18 @@ "node": ">=14.15.1" } }, + "packages/compass-shell/node_modules/@mongosh/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-3.5.0.tgz", + "integrity": "sha512-IXhxy/1/LSEyCrG31MwUuF2OWwLDHmYk8SGtcT5FoJoPHcCoZYI6QLbXkVGlFRdsWNct2/BSX5Np4bx1gNSMlQ==", + "license": "Apache-2.0", + "dependencies": { + "@mongodb-js/devtools-connect": "^3.4.1" + }, + "engines": { + "node": ">=14.15.1" + } + }, "packages/compass-shell/node_modules/bson": { "version": "6.10.3", "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.3.tgz", @@ -46785,6 +46773,18 @@ } } }, + "packages/compass-shell/node_modules/mongodb-log-writer": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", + "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", + "license": "Apache-2.0", + "dependencies": { + "heap-js": "^2.3.0" + }, + "peerDependencies": { + "bson": "6.x" + } + }, "packages/compass-shell/node_modules/numeral": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/numeral/-/numeral-2.0.6.tgz", @@ -58470,7 +58470,7 @@ "@mongodb-js/testing-library-compass": "^1.2.2", "@mongodb-js/tsconfig-compass": "^1.2.2", "@mongosh/browser-repl": "^3.5.0", - "@mongosh/logging": "^3.2.0", + "@mongosh/logging": "^3.5.0", "@mongosh/node-runtime-worker-thread": "^3.3.0", "@types/enzyme": "^3.10.14", "bson": "^6.10.1", @@ -58567,6 +58567,19 @@ "@mongosh/errors": "2.4.0" } }, + "@mongosh/logging": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-3.5.0.tgz", + "integrity": "sha512-K3eipDAltOgJ8kV/Gbu4OVDEvL+ZTJ94IYZdj7VcWZyomYIyp2buSTR/ZCWK222mEjHUry5esyalrlH5vmR7fw==", + "requires": { + "@mongodb-js/devtools-connect": "^3.4.1", + "@mongosh/errors": "2.4.0", + "@mongosh/history": "2.4.5", + "@mongosh/types": "3.5.0", + "mongodb-log-writer": "^2.3.1", + "mongodb-redact": "^1.1.5" + } + }, "@mongosh/node-runtime-worker-thread": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/@mongosh/node-runtime-worker-thread/-/node-runtime-worker-thread-3.3.0.tgz", @@ -58614,6 +58627,14 @@ "@mongosh/shell-api": "3.5.0" } }, + "@mongosh/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-3.5.0.tgz", + "integrity": "sha512-IXhxy/1/LSEyCrG31MwUuF2OWwLDHmYk8SGtcT5FoJoPHcCoZYI6QLbXkVGlFRdsWNct2/BSX5Np4bx1gNSMlQ==", + "requires": { + "@mongodb-js/devtools-connect": "^3.4.1" + } + }, "bson": { "version": "6.10.3", "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.3.tgz", @@ -58629,6 +58650,14 @@ "mongodb-connection-string-url": "^3.0.0" } }, + "mongodb-log-writer": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", + "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", + "requires": { + "heap-js": "^2.3.0" + } + }, "numeral": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/numeral/-/numeral-2.0.6.tgz", @@ -61082,36 +61111,6 @@ "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-2.4.0.tgz", "integrity": "sha512-2YwY4TYlrAy3VC9Y5Xa1OWlbdb57O0ZTDfntROFcfotrMXkZc9CU+jafrKRNcPJz8UAhoUcSTDJuaLpC3AutHg==" }, - "@mongosh/history": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-2.4.2.tgz", - "integrity": "sha512-63qaRYr5ZU/+FjC++xX4n1+Kl3PaGFoMMrgRtsJr082uBKfWsFv81Pre/aaGRdt9IqDGFtmkiAKHdMMwnOyMFQ==", - "requires": { - "mongodb-connection-string-url": "^3.0.1", - "mongodb-redact": "^1.1.5" - } - }, - "@mongosh/logging": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-3.2.0.tgz", - "integrity": "sha512-aX7+aR8et+tiS0e69vQwSTbvdHrdoI8IW+LoAAvxiwPp33pFKqoyDU1osnmJ6TgygB+Hxt3aOqygCWi/hqNypg==", - "requires": { - "@mongodb-js/devtools-connect": "^3.4.1", - "@mongosh/errors": "2.4.0", - "@mongosh/history": "2.4.2", - "@mongosh/types": "3.2.0", - "mongodb-log-writer": "^2.1.0", - "mongodb-redact": "^1.1.5" - } - }, - "@mongosh/types": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-3.2.0.tgz", - "integrity": "sha512-tExVfsxH6NDFq8Tldc2k04t1xN5IWKqR8QffeKmNNdOmERGRi7IHMrGWV993AE1eqK0in8dbZoHbgzD6+Ql8hQ==", - "requires": { - "@mongodb-js/devtools-connect": "^3.4.1" - } - }, "@nicolo-ribaudo/eslint-scope-5-internals": { "version": "5.1.1-v1", "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz", @@ -80679,6 +80678,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.1.0.tgz", "integrity": "sha512-ZlNts/L9fs6gQNRuqLcB0+yjjfeyapbxjdkDpeb2bEYOUUThG0iOEhzIFejv0g3TX1SSAsdrT2aGYnFqoQILgQ==", + "peer": true, "requires": { "heap-js": "^2.3.0" } diff --git a/packages/compass-shell/package.json b/packages/compass-shell/package.json index 06e1dbd1e88..31c49c776d0 100644 --- a/packages/compass-shell/package.json +++ b/packages/compass-shell/package.json @@ -58,7 +58,7 @@ "@mongodb-js/compass-utils": "^0.8.2", "@mongodb-js/compass-workspaces": "^0.31.2", "@mongosh/browser-repl": "^3.5.0", - "@mongosh/logging": "^3.2.0", + "@mongosh/logging": "^3.5.0", "@mongosh/node-runtime-worker-thread": "^3.3.0", "bson": "^6.10.1", "compass-preferences-model": "^2.33.2", From a96251d7446a17d0cac3a243512d5ac61619052d Mon Sep 17 00:00:00 2001 From: gagik Date: Tue, 25 Feb 2025 13:32:53 +0100 Subject: [PATCH 4/5] chore: bump at root to force hoisting --- package-lock.json | 123 ++++------------------------------------------ package.json | 3 ++ 2 files changed, 12 insertions(+), 114 deletions(-) diff --git a/package-lock.json b/package-lock.json index 595e1bb4d81..2e67ee14f5c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,9 @@ "configs/*", "scripts" ], + "dependencies": { + "mongodb-log-writer": "^2.3.4" + }, "devDependencies": { "@mongodb-js/monorepo-tools": "^1.1.1", "@mongodb-js/sbom-tools": "^0.7.0", @@ -31711,11 +31714,10 @@ } }, "node_modules/mongodb-log-writer": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.1.0.tgz", - "integrity": "sha512-ZlNts/L9fs6gQNRuqLcB0+yjjfeyapbxjdkDpeb2bEYOUUThG0iOEhzIFejv0g3TX1SSAsdrT2aGYnFqoQILgQ==", + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", + "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", "license": "Apache-2.0", - "peer": true, "dependencies": { "heap-js": "^2.3.0" }, @@ -44582,19 +44584,6 @@ "node": ">=16 || 14 >=14.17" } }, - "packages/compass-e2e-tests/node_modules/mongodb-log-writer": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", - "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "heap-js": "^2.3.0" - }, - "peerDependencies": { - "bson": "6.x" - } - }, "packages/compass-e2e-tests/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -45837,18 +45826,6 @@ "typescript": "^5.0.4" } }, - "packages/compass-logging/node_modules/mongodb-log-writer": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", - "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", - "license": "Apache-2.0", - "dependencies": { - "heap-js": "^2.3.0" - }, - "peerDependencies": { - "bson": "6.x" - } - }, "packages/compass-logging/node_modules/sinon": { "version": "9.2.4", "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz", @@ -46773,18 +46750,6 @@ } } }, - "packages/compass-shell/node_modules/mongodb-log-writer": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", - "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", - "license": "Apache-2.0", - "dependencies": { - "heap-js": "^2.3.0" - }, - "peerDependencies": { - "bson": "6.x" - } - }, "packages/compass-shell/node_modules/numeral": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/numeral/-/numeral-2.0.6.tgz", @@ -47887,19 +47852,6 @@ "node": ">=16 || 14 >=14.17" } }, - "packages/compass/node_modules/mongodb-log-writer": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", - "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "heap-js": "^2.3.0" - }, - "peerDependencies": { - "bson": "6.x" - } - }, "packages/compass/node_modules/node-addon-api": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", @@ -48321,19 +48273,6 @@ "node": ">=12.9.0" } }, - "packages/data-service/node_modules/mongodb-log-writer": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", - "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "heap-js": "^2.3.0" - }, - "peerDependencies": { - "bson": "6.x" - } - }, "packages/data-service/node_modules/node-addon-api": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", @@ -57805,14 +57744,6 @@ "typescript": "^5.0.4" }, "dependencies": { - "mongodb-log-writer": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", - "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", - "requires": { - "heap-js": "^2.3.0" - } - }, "sinon": { "version": "9.2.4", "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz", @@ -58650,14 +58581,6 @@ "mongodb-connection-string-url": "^3.0.0" } }, - "mongodb-log-writer": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", - "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", - "requires": { - "heap-js": "^2.3.0" - } - }, "numeral": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/numeral/-/numeral-2.0.6.tgz", @@ -68321,15 +68244,6 @@ "integrity": "sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w==", "dev": true }, - "mongodb-log-writer": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", - "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", - "dev": true, - "requires": { - "heap-js": "^2.3.0" - } - }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -80176,15 +80090,6 @@ "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", "dev": true }, - "mongodb-log-writer": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", - "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", - "dev": true, - "requires": { - "heap-js": "^2.3.0" - } - }, "node-addon-api": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", @@ -80310,15 +80215,6 @@ "prebuild-install": "^7.1.2" } }, - "mongodb-log-writer": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", - "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", - "dev": true, - "requires": { - "heap-js": "^2.3.0" - } - }, "node-addon-api": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", @@ -80675,10 +80571,9 @@ } }, "mongodb-log-writer": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.1.0.tgz", - "integrity": "sha512-ZlNts/L9fs6gQNRuqLcB0+yjjfeyapbxjdkDpeb2bEYOUUThG0iOEhzIFejv0g3TX1SSAsdrT2aGYnFqoQILgQ==", - "peer": true, + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", + "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", "requires": { "heap-js": "^2.3.0" } diff --git a/package.json b/package.json index cb228bce833..69dc5b01bca 100644 --- a/package.json +++ b/package.json @@ -101,5 +101,8 @@ "chai-enzyme": { "cheerio": "1.0.0-rc.10" } + }, + "dependencies": { + "mongodb-log-writer": "^2.3.4" } } From 4405b6bf5b16cade2c9f2bb77d021b4f52a3a2ef Mon Sep 17 00:00:00 2001 From: gagik Date: Tue, 25 Feb 2025 14:09:18 +0100 Subject: [PATCH 5/5] chore: remove root dependency --- package-lock.json | 3 --- package.json | 3 --- 2 files changed, 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2e67ee14f5c..5f790b60bec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,9 +11,6 @@ "configs/*", "scripts" ], - "dependencies": { - "mongodb-log-writer": "^2.3.4" - }, "devDependencies": { "@mongodb-js/monorepo-tools": "^1.1.1", "@mongodb-js/sbom-tools": "^0.7.0", diff --git a/package.json b/package.json index 69dc5b01bca..cb228bce833 100644 --- a/package.json +++ b/package.json @@ -101,8 +101,5 @@ "chai-enzyme": { "cheerio": "1.0.0-rc.10" } - }, - "dependencies": { - "mongodb-log-writer": "^2.3.4" } }