remove bump, use version

mongodb-js · Jan 8, 2025 · 4da9db1 · 4da9db1
1 parent 72cde48
commit 4da9db1
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 7 deletions.
diff --git a/.evergreen/install-npm-deps.sh b/.evergreen/install-npm-deps.sh
@@ -31,7 +31,5 @@ npm run mark-ci-required-optional-dependencies
 # along with its types, but npm wouldn't try and compile the addon
 (npm ci && test -e node_modules/mongodb-client-encryption) || npm ci --ignore-scripts
 
-npm run evergreen-release bump
-
 echo "npm packages after installation"
 npm ls || true
diff --git a/packages/cli-repl/src/constants.ts b/packages/cli-repl/src/constants.ts
@@ -1,6 +1,9 @@
 import i18n from '@mongosh/i18n';
 import { colorizeForStderr as clr } from './clr';
 
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+export const MONGOSH_VERSION: string = require('../package.json').version;
+
 export const TELEMETRY_GREETING_MESSAGE = `
 ${i18n.__('cli-repl.cli-repl.telemetry')}
 ${i18n.__('cli-repl.cli-repl.disableTelemetry')}${clr(

diff --git a/packages/cli-repl/src/mongosh-repl.ts b/packages/cli-repl/src/mongosh-repl.ts
@@ -34,7 +34,11 @@ import { callbackify, promisify } from 'util';
 import * as asyncRepl from './async-repl';
 import type { StyleDefinition } from './clr';
 import clr from './clr';
-import { MONGOSH_WIKI, TELEMETRY_GREETING_MESSAGE } from './constants';
+import {
+  MONGOSH_VERSION,
+  MONGOSH_WIKI,
+  TELEMETRY_GREETING_MESSAGE,
+} from './constants';
 import formatOutput, { formatError } from './format-output';
 import { makeMultilineJSIntoSingleLine } from '@mongosh/js-multiline-to-singleline';
 import { LineByLineInput } from './line-by-line-input';
@@ -144,6 +148,7 @@ class MongoshNodeRepl implements EvaluationListener {
   loadNestingLevel = 0;
   redactHistory: 'keep' | 'remove' | 'remove-redact' = 'remove';
   rawValueToShellResult: WeakMap<any, ShellResult> = new WeakMap();
+  version: string = MONGOSH_VERSION;
 
   constructor(options: MongoshNodeReplOptions) {
     this.input = options.input;

diff --git a/packages/e2e-tests/test/e2e.spec.ts b/packages/e2e-tests/test/e2e.spec.ts
@@ -22,6 +22,7 @@ import { once } from 'events';
 import type { AddressInfo } from 'net';
 const { EJSON } = bson;
 import { sleep } from './util-helpers';
+import { MONGOSH_VERSION } from '../../cli-repl/src/constants';
 
 const jsContextFlagCombinations: `--jsContext=${'plain-vm' | 'repl'}`[][] = [
   [],
@@ -445,9 +446,19 @@ describe('e2e', function () {
     });
 
     it('version', async function () {
-      const expected = require('../package.json').version;
+      const expectedPackageVersion: string =
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        require('../package.json')['dependencies']['@mongosh/cli-repl'];
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+      const expectedVersionFromRepl = MONGOSH_VERSION;
+
+      expect(expectedPackageVersion).not.null;
+      expect(expectedPackageVersion).equals(expectedVersionFromRepl);
+
       await shell.executeLine('version()');
-      shell.assertContainsOutput(expected);
+      shell.assertNoErrors();
+      shell.assertContainsOutput(expectedPackageVersion);
+      shell.assertContainsOutput(expectedVersionFromRepl);
     });
 
     it('fle addon is available', async function () {

diff --git a/packages/node-runtime-worker-thread/src/worker-thread-evaluation-listener.ts b/packages/node-runtime-worker-thread/src/worker-thread-evaluation-listener.ts
@@ -7,7 +7,10 @@ import type { RuntimeEvaluationListener } from '@mongosh/browser-runtime-core';
 export class WorkerThreadEvaluationListener {
   exposedListener: Exposed<
     Required<
-      Omit<RuntimeEvaluationListener, 'onLoad' | 'getCryptLibraryOptions'>
+      Omit<
+        RuntimeEvaluationListener,
+        'version' | 'onLoad' | 'getCryptLibraryOptions'
+      >
     >
   >;
 
@@ -56,6 +59,7 @@ export class WorkerThreadEvaluationListener {
             (Promise.resolve() as Promise<never>)
           );
         },
+        version: workerRuntime.evaluationListener?.version,
       },
       worker
     );

diff --git a/packages/shell-api/src/shell-api.ts b/packages/shell-api/src/shell-api.ts
@@ -289,7 +289,10 @@ export default class ShellApi extends ShellApiClass {
   }
 
   version(): string {
-    const version = require('../package.json').version;
+    const version = this._instanceState.evaluationListener.version;
+    if (!version) {
+      throw new MongoshInternalError('mongosh version not known');
+    }
     return version;
   }
 

diff --git a/packages/shell-api/src/shell-instance-state.ts b/packages/shell-api/src/shell-instance-state.ts
@@ -116,6 +116,9 @@ export interface EvaluationListener
    * options used to access it.
    */
   getCryptLibraryOptions?: () => Promise<AutoEncryptionOptions['extraOptions']>;
+
+  /** References the mongosh version used by the EvaluationListener */
+  version?: string;
 }
 
 /**