Merge branch 'main' into VSCODE-703-add-install-tests-for-VSCode-extension

Author: tculig

.github/workflows/actions/test-and-build/action.yaml

@@ -117,7 +117,7 @@ runs:
       env:
         SNYK_TOKEN: ${{ inputs.SNYK_TOKEN }}
       run: |
-        pnpm run snyk-test > /dev/null 2>&1
+        pnpm run snyk-test
 
     - name: Upload Snyk Report
       if: runner.os == 'Linux'

package.json

@@ -55,7 +55,7 @@
     "pretest": "pnpm run compile",
     "test": "pnpm run test-webview && pnpm run test-extension",
     "test-extension": "cross-env MDB_IS_TEST=true NODE_OPTIONS=--no-force-async-hooks-checks xvfb-maybe node ./out/test/runTest.js",
-    "test-webview": "mocha -r ts-node/register --grep=\"${MOCHA_GREP}\" --file ./src/test/setup-webview.ts src/test/suite/views/webview-app/**/*.test.tsx",
+    "test-webview": "mocha -r ts-node/register --exit --grep=\"${MOCHA_GREP}\" --file ./src/test/setup-webview.ts src/test/suite/views/webview-app/**/*.test.tsx",
     "ai-accuracy-tests": "env TS_NODE_FILES=true mocha -r ts-node/register --grep=\"${MOCHA_GREP}\" --file ./src/test/ai-accuracy-tests/test-setup.ts ./src/test/ai-accuracy-tests/ai-accuracy-tests.ts",
     "analyze-bundle": "webpack --mode production --analyze",
     "vscode:prepublish": "pnpm run clean && pnpm run compile:constants && pnpm run compile:resources && webpack --mode production",
@@ -1403,7 +1403,7 @@
     "@babel/core": "^7.25.8",
     "@babel/parser": "^7.25.8",
     "@babel/traverse": "^7.25.7",
-    "@mongodb-js/compass-components": "^1.38.1",
+    "@mongodb-js/compass-components": "^1.59.2",
     "@mongodb-js/connection-form": "^1.52.3",
     "@mongodb-js/connection-info": "^0.21.0",
     "@mongodb-js/device-id": "^0.3.2",
@@ -1424,7 +1424,7 @@
     "mongodb-connection-string-url": "^3.0.2",
     "mongodb-data-service": "^22.30.1",
     "mongodb-log-writer": "^2.4.1",
-    "mongodb-mcp-server": "^1.3.0-pre.2",
+    "mongodb-mcp-server": "^1.3.0",
     "mongodb-query-parser": "^4.4.2",
     "mongodb-schema": "^12.6.3",
     "node-machine-id": "1.1.12",
@@ -1441,7 +1441,7 @@
   "devDependencies": {
     "@babel/preset-typescript": "^7.25.7",
     "@babel/types": "^7.25.8",
-    "@modelcontextprotocol/sdk": "^1.18.2",
+    "@modelcontextprotocol/sdk": "^1.24.0",
     "@mongodb-js/oidc-mock-provider": "^0.11.5",
     "@mongodb-js/oidc-plugin": "^2.0.5",
     "@mongodb-js/prettier-config-devtools": "^1.0.2",
@@ -1469,12 +1469,11 @@
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "@vscode/test-electron": "^2.4.1",
-    "@vscode/vsce": "^3.2.0",
+    "@vscode/vsce": "^3.7.1",
     "buffer": "^6.0.3",
     "chai": "^4.5.0",
     "chai-as-promised": "^7.1.2",
     "cross-env": "^7.0.3",
-    "crypto-browserify": "^3.12.0",
     "depcheck": "^1.4.7",
     "duplicate-package-checker-webpack-plugin": "^3.0.0",
     "eslint": "^8.57.1",
@@ -1499,7 +1498,6 @@
     "path-browserify": "^1.0.1",
     "prettier": "^3.5.3",
     "process": "^0.11.10",
-    "rewiremock": "^3.14.5",
     "rimraf": "^6.1.2",
     "semver": "^7.7.3",
     "sinon": "^9.2.4",
@@ -1521,10 +1519,7 @@
   "pnpm": {
     "overrides": {
       "react": "^18.3.1",
-      "@mongodb-js/compass-logging": "^1.7.18",
-      "@mongodb-js/compass-utils": "^0.9.16",
-      "@mongodb-js/compass-components": "1.38.1",
-      "parse-asn1": "5.1.6"
+      "jsonwebtoken>jws": "3.2.3"
     }
   }
 }

pnpm-lock.yaml

@@ -34,6 +34,7 @@ async function snykTest(cwd) {
     return res;
   } catch (err) {
     console.error(`testing ${cwd} failed. ${err.message}`);
+    throw err;
   } finally {
     try {
       await fs.rm(tmpPath);
@@ -48,6 +49,11 @@ async function main() {
   await fs.mkdir(path.join(rootPath, `.sbom`), { recursive: true });
   const results = await snykTest(rootPath);
 
+  if (!results) {
+    console.error('Snyk test failed to produce results');
+    process.exit(1);
+  }
+
   await fs.writeFile(
     path.join(rootPath, `.sbom/snyk-test-result.json`),
     JSON.stringify(results, null, 2),
@@ -66,4 +72,7 @@ async function main() {
   );
 }
 
-main();
+main().catch((err) => {
+  console.error('Snyk test failed:', err);
+  process.exit(1);
+});

scripts/snyk-test.js

@@ -1,4 +1,4 @@
-import rewiremock from 'rewiremock';
+import Module from 'module';
 
 const AssistantRole = 2;
 const UserRole = 1;
@@ -36,5 +36,11 @@ const vscodeMock = {
 
 // Mock the 'vscode' module since we don't run the full vscode
 // integration test setup for the ai-accuracy-tests as it's a bit slow.
-rewiremock('vscode').with(vscodeMock);
-rewiremock.enable();
+// eslint-disable-next-line @typescript-eslint/unbound-method
+const originalRequire = Module.prototype.require;
+Module.prototype.require = function (id: string): any {
+  if (id === 'vscode') {
+    return vscodeMock;
+  }
+  return originalRequire.call(this, id);
+};

src/test/ai-accuracy-tests/test-setup.ts

@@ -0,0 +1,2 @@
+// Empty crypto shim for webpack webview bundle
+module.exports = {};

src/utils/crypto-shim.js

@@ -68,6 +68,7 @@ const ConnectionForm: React.FunctionComponent<
       // modal releases.
       contentClassName={modalContentStyles}
       setOpen={(): void => onClose()}
+      darkMode={darkMode}
       open={open}
       size="large"
     >

src/views/webview-app/connection-form.tsx

@@ -172,13 +172,22 @@ module.exports = (env, argv) => {
       fallback: {
         stream: require.resolve('stream-browserify'),
         buffer: require.resolve('buffer'),
-        crypto: require.resolve('crypto-browserify'),
+        // TODO(VSCODE-715): Remove this once we bump compass-components.
+        crypto: path.resolve(__dirname, 'src/utils/crypto-shim.js'),
         path: require.resolve('path-browserify'),
         mongodb: false,
       },
     },
     module: {
       rules: [
+        {
+          test: /\.mjs$/,
+          include: /node_modules/,
+          type: 'javascript/auto',
+          resolve: {
+            fullySpecified: false,
+          },
+        },
         {
           test: /\.(ts|tsx)$/,
           loader: 'ts-loader',