Merge branch 'develop' into lforst-truncation-logic

Author: Luca Forstner

.eslintrc.js

@@ -38,7 +38,7 @@ module.exports = {
       },
     },
     {
-      files: ['jest/**/*.ts', 'scripts/**/*.ts'],
+      files: ['scripts/**/*.ts'],
       parserOptions: {
         project: ['tsconfig.dev.json'],
       },

.gitignore

@@ -17,8 +17,6 @@ scratch/
 # side effects of running AWS lambda layer zip action locally
 dist-serverless/
 sentry-node-serverless-*.zip
-# transpiled transformers
-jest/transformers/*.js
 # node tarballs
 packages/*/sentry-*.tgz
 .nxcache

.vscode/launch.json

@@ -52,35 +52,6 @@
       "internalConsoleOptions": "openOnSessionStart",
       "outputCapture": "std"
     },
-    // Run a specific test file in watch mode (must have file in currently active tab when hitting the play button).
-    // NOTE: If you try to run this and VSCode complains that the command `shellCommand.execute` can't be found, go
-    // install the recommended extension Tasks Shell Input.
-    {
-      "name": "Debug unit tests - just open file",
-      "type": "node",
-      "cwd": "${workspaceFolder}/packages/${input:getPackageName}",
-      "request": "launch",
-      "program": "${workspaceFolder}/node_modules/.bin/jest",
-      "args": [
-        "--watch",
-        // this runs one test at a time, rather than running them in parallel (necessary for debugging so that you know
-        // you're hitting a single test's breakpoints, in order)
-        "--runInBand",
-        // coverage messes up the source maps
-        "--coverage",
-        "false",
-        // remove this to run all package tests
-        "${relativeFile}"
-      ],
-      "sourceMaps": true,
-      "smartStep": true,
-      // otherwise it goes to the VSCode debug terminal, which prints the test output or console logs (depending on
-      // "outputCapture" option here; default is to show console logs), but not both
-      "console": "integratedTerminal",
-      // since we're not using it, don't automatically switch to it
-      "internalConsoleOptions": "neverOpen"
-    },
-
     // Run a specific test file in watch mode (must have file in currently active tab when hitting the play button).
     // NOTE: If you try to run this and VSCode complains that the command `shellCommand.execute` can't be found, go
     // install the recommended extension Tasks Shell Input.

CONTRIBUTING.md

@@ -73,23 +73,6 @@ the tests in each location. Check out the `scripts` entry of the corresponding `
 
 Note: you must run `yarn build` before `yarn test` will work.
 
-## Debugging Tests
-
-If you run into trouble writing tests and need to debug one of them, you can do so using VSCode's debugger.
-
-0. If you don't already have it installed, install the Tasks Shell Input extension, which you'll find in the Extensions
-   tab in the sidebar as one of the recommended workspace extensions.
-
-1. Place breakpoints or `debugger` statements in the test or the underlying code wherever you'd like `jest` to pause.
-2. Open the file containing the test in question, and make sure its tab is active (so you can see the file's contents).
-3. Switch to the debugger in the sidebar and choose `Debug unit tests - just open file` from the dropdown.
-4. Click the green "play" button to run the tests in the open file in watch mode.
-
-Pro tip: If any of your breakpoints are in code run by multiple tests, and you run the whole test file, you'll land on
-those breakpoints over and over again, in the middle of tests you don't care about. To avoid this, replace the test's
-initial `it` or `test` with `it.only` or `test.only`. That way, when you hit a breakpoint, you'll know you got there are
-part of the buggy test.
-
 ## Debug Build Flags
 
 Throughout the codebase, you will find a `__DEBUG_BUILD__` constant. This flag serves two purposes:

dev-packages/e2e-tests/test-applications/nuxt-3/server/plugins/customNitroErrorHandler.ts

@@ -1,4 +1,4 @@
-import { Context, GLOBAL_OBJ, dropUndefinedKeys, flush, logger, vercelWaitUntil } from '@sentry/core';
+import { Context, GLOBAL_OBJ, flush, logger, vercelWaitUntil } from '@sentry/core';
 import * as SentryNode from '@sentry/node';
 import { H3Error } from 'h3';
 import type { CapturedErrorContext } from 'nitropack';
@@ -36,24 +36,22 @@ export default defineNitroPlugin(nitroApp => {
 });
 
 function extractErrorContext(errorContext: CapturedErrorContext): Context {
-  const structuredContext: Context = {
-    method: undefined,
-    path: undefined,
-    tags: undefined,
-  };
+  const ctx: Context = {};
 
-  if (errorContext) {
-    if (errorContext.event) {
-      structuredContext.method = errorContext.event._method || undefined;
-      structuredContext.path = errorContext.event._path || undefined;
-    }
+  if (!errorContext) {
+    return ctx;
+  }
 
-    if (Array.isArray(errorContext.tags)) {
-      structuredContext.tags = errorContext.tags || undefined;
-    }
+  if (errorContext.event) {
+    ctx.method = errorContext.event._method;
+    ctx.path = errorContext.event._path;
+  }
+
+  if (Array.isArray(errorContext.tags)) {
+    ctx.tags = errorContext.tags;
   }
 
-  return dropUndefinedKeys(structuredContext);
+  return ctx;
 }
 
 async function flushIfServerless(): Promise<void> {

dev-packages/node-integration-tests/.eslintrc.js

@@ -1,7 +1,6 @@
 module.exports = {
   env: {
     node: true,
-    jest: true,
   },
   extends: ['../../.eslintrc.js'],
   overrides: [

dev-packages/node-integration-tests/README.md

@@ -23,7 +23,7 @@ folders containing test scenarios and assertions.
 `runServer` also accepts an optional `scenarioPath` argument for non-standard usage.
 
 `test.ts` is required for each test case, and contains the server runner logic, request interceptors for Sentry
-requests, and assertions. Test server, interceptors and assertions are all run on the same Jest thread.
+requests, and assertions. Test server, interceptors and assertions are all run on the same Vitest thread.
 
 ### Utilities
 
@@ -40,12 +40,10 @@ Tests can be run locally with:
 
 `yarn test`
 
-To run tests with Jest's watch mode:
+To run tests with Vitest's watch mode:
 
 `yarn test:watch`
 
 To filter tests by their title:
 
 `yarn test -t "set different properties of a scope"`
-
-You can refer to [Jest documentation](https://jestjs.io/docs/cli) for other CLI options.

dev-packages/node-integration-tests/tsconfig.json

@@ -9,6 +9,6 @@
     "lib": ["DOM", "ES2018"],
     // package-specific options
     "esModuleInterop": true,
-    "types": ["node", "jest"]
+    "types": ["node"]
   }
 }

jest/jest.config.js

@@ -15,7 +15,7 @@
     "circularDepCheck": "lerna run circularDepCheck",
     "clean": "run-s clean:build clean:caches",
     "clean:build": "lerna run clean",
-    "clean:caches": "yarn rimraf eslintcache .nxcache .nx && yarn jest --clearCache",
+    "clean:caches": "yarn rimraf eslintcache .nxcache .nx",
     "clean:deps": "lerna clean --yes && rm -rf node_modules && yarn",
     "clean:tarballs": "rimraf {packages,dev-packages}/*/*.tgz",
     "clean:watchman": "watchman watch-del \".\"",
@@ -110,17 +110,13 @@
     "@rollup/pluginutils": "^5.1.0",
     "@size-limit/file": "~11.1.6",
     "@size-limit/webpack": "~11.1.6",
-    "@types/jest": "^27.4.1",
     "@types/jsdom": "^21.1.6",
     "@types/node": "^18.19.1",
     "@vitest/coverage-v8": "^2.1.8",
     "deepmerge": "^4.2.2",
     "downlevel-dts": "~0.11.0",
     "es-check": "^7.2.1",
     "eslint": "7.32.0",
-    "jest": "^27.5.1",
-    "jest-environment-node": "^27.5.1",
-    "jest-junit": "^16.0.0",
     "jsdom": "^21.1.2",
     "lerna": "7.1.1",
     "madge": "7.0.0",
@@ -133,7 +129,6 @@
     "rollup-plugin-license": "^3.3.1",
     "size-limit": "~11.1.6",
     "sucrase": "^3.35.0",
-    "ts-jest": "^27.1.4",
     "ts-node": "10.9.1",
     "typescript": "~5.0.0",
     "vitest": "^2.1.8",