Merge branch 'develop' into abhi-express-normalized-request

Author: AbhiPrasad

dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/package.json

@@ -22,7 +22,7 @@
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "@sentry/core": "latest || *",
     "@sveltejs/adapter-auto": "^3.0.0",
-    "@sveltejs/kit": "2.5.0",
+    "@sveltejs/kit": "2.8.3",
     "@sveltejs/vite-plugin-svelte": "^3.0.0",
     "svelte": "^5.0.0-next.115",
     "svelte-check": "^3.6.0",

packages/browser/test/tracekit/chromium.test.ts

@@ -643,4 +643,97 @@ describe('Tracekit - Chrome Tests', () => {
       },
     });
   });
+
+  it('should correctly parse a wasm stack trace', () => {
+    const WASM_ERROR = {
+      message: 'memory access out of bounds',
+      name: 'RuntimeError',
+      stack: `RuntimeError: memory access out of bounds
+      at MyClass::bar(int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb)
+      at MyClass::foo(int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637)
+      at MyClass::getAt(int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b)
+      at emscripten::internal::MethodInvoker<int (MyClass::*)(int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df)
+      at ClassHandle.MyClass$getAt [as getAt] (eval at newFunc (http://localhost:8001/main.js:2201:27), <anonymous>:9:10)
+      at myFunctionVectorOutOfBounds (http://localhost:8001/main.html:18:22)
+      at captureError (http://localhost:8001/main.html:27:11)
+      at Object.onRuntimeInitialized (http://localhost:8001/main.html:39:9)
+      at doRun (http://localhost:8001/main.js:7084:71)
+      at run (http://localhost:8001/main.js:7101:5)`,
+    };
+
+    const ex = exceptionFromError(parser, WASM_ERROR);
+
+    // This is really ugly but the wasm integration should clean up these stack frames
+    expect(ex).toStrictEqual({
+      stacktrace: {
+        frames: [
+          {
+            colno: 5,
+            filename: 'http://localhost:8001/main.js',
+            function: 'run',
+            in_app: true,
+            lineno: 7101,
+          },
+          {
+            colno: 71,
+            filename: 'http://localhost:8001/main.js',
+            function: 'doRun',
+            in_app: true,
+            lineno: 7084,
+          },
+          {
+            colno: 9,
+            filename: 'http://localhost:8001/main.html',
+            function: 'Object.onRuntimeInitialized',
+            in_app: true,
+            lineno: 39,
+          },
+          {
+            colno: 11,
+            filename: 'http://localhost:8001/main.html',
+            function: 'captureError',
+            in_app: true,
+            lineno: 27,
+          },
+          {
+            colno: 22,
+            filename: 'http://localhost:8001/main.html',
+            function: 'myFunctionVectorOutOfBounds',
+            in_app: true,
+            lineno: 18,
+          },
+          {
+            colno: 27,
+            filename: 'http://localhost:8001/main.js',
+            function: 'ClassHandle.MyClass$getAt [as getAt]',
+            in_app: true,
+            lineno: 2201,
+          },
+          {
+            filename:
+              'int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df',
+            function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
+            in_app: true,
+          },
+          {
+            filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b',
+            function: 'MyClass::getAt',
+            in_app: true,
+          },
+          {
+            filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637',
+            function: 'MyClass::foo',
+            in_app: true,
+          },
+          {
+            filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
+            function: 'MyClass::bar',
+            in_app: true,
+          },
+        ],
+      },
+      type: 'RuntimeError',
+      value: 'memory access out of bounds',
+    });
+  });
 });

packages/nextjs/jest.config.js

@@ -117,8 +117,8 @@
     "lint": "eslint . --format stylish",
     "test": "yarn test:unit",
     "test:all": "run-s test:unit",
-    "test:unit": "jest",
-    "test:watch": "jest --watch",
+    "test:unit": "vitest run",
+    "test:watch": "vitest --watch",
     "vercel:branch": "source vercel/set-up-branch-for-test-app-use.sh",
     "vercel:project": "source vercel/make-project-use-current-branch.sh",
     "yalc:publish": "yalc publish --push --sig"

packages/nextjs/package.json

@@ -18,6 +18,22 @@ export default [
       // the name doesn't match an SDK dependency)
       packageSpecificConfig: {
         external: ['next/router', 'next/constants', 'next/headers', 'stacktrace-parser'],
+
+        // Next.js and our users are more happy when our client code has the "use client" directive
+        plugins: [
+          {
+            name: 'sentry-internal-add-use-client-directive-to-client-entry-points-plugin-extravaganza',
+            banner: chunk => {
+              if (
+                chunk.isEntry &&
+                (chunk.facadeModuleId.endsWith('/src/index.client.ts') ||
+                  chunk.facadeModuleId.endsWith('/src/client/index.ts'))
+              ) {
+                return '"use client";';
+              }
+            },
+          },
+        ],
       },
     }),
   ),

packages/nextjs/rollup.npm.config.mjs

@@ -4,11 +4,12 @@ import type { Integration } from '@sentry/core';
 import * as SentryReact from '@sentry/react';
 import { WINDOW, getClient, getCurrentScope } from '@sentry/react';
 import { JSDOM } from 'jsdom';
+import { describe, vi, afterAll, afterEach, it, expect } from 'vitest';
 
 import { breadcrumbsIntegration, browserTracingIntegration, init } from '../src/client';
 
-const reactInit = jest.spyOn(SentryReact, 'init');
-const loggerLogSpy = jest.spyOn(logger, 'log');
+const reactInit = vi.spyOn(SentryReact, 'init');
+const loggerLogSpy = vi.spyOn(logger, 'log');
 
 // We're setting up JSDom here because the Next.js routing instrumentations requires a few things to be present on pageload:
 // 1. Access to window.document API for `window.document.getElementById`
@@ -38,7 +39,7 @@ const TEST_DSN = 'https://[email protected]/1337';
 
 describe('Client init()', () => {
   afterEach(() => {
-    jest.clearAllMocks();
+    vi.clearAllMocks();
 
     getGlobalScope().clear();
     getIsolationScope().clear();
@@ -83,7 +84,7 @@ describe('Client init()', () => {
       dsn: 'https://[email protected]/12312012',
       tracesSampleRate: 1.0,
     });
-    const transportSend = jest.spyOn(getClient()!.getTransport()!, 'send');
+    const transportSend = vi.spyOn(getClient()!.getTransport()!, 'send');
 
     // Ensure we have no current span, so our next span is a transaction
     SentryReact.withActiveSpan(null, () => {

packages/nextjs/test/clientSdk.test.ts

@@ -1,16 +1,16 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`valueInjectionLoader should correctly insert values for basic config 1`] = `
+exports[`valueInjectionLoader > should correctly insert values for basic config 1`] = `
 "
-      ;globalThis[\\"foo\\"] = \\"bar\\";import * as Sentry from '@sentry/nextjs';
+      ;globalThis["foo"] = "bar";import * as Sentry from '@sentry/nextjs';
       Sentry.init();
     "
 `;
 
-exports[`valueInjectionLoader should correctly insert values with a misplaced directive 1`] = `
+exports[`valueInjectionLoader > should correctly insert values with a misplaced directive 1`] = `
 "
-      ;globalThis[\\"foo\\"] = \\"bar\\";console.log('This will render the directive useless');
-      \\"use client\\";
+      ;globalThis["foo"] = "bar";console.log('This will render the directive useless');
+      "use client";
 
 
 
@@ -19,44 +19,44 @@ exports[`valueInjectionLoader should correctly insert values with a misplaced di
     "
 `;
 
-exports[`valueInjectionLoader should correctly insert values with directive 1`] = `
+exports[`valueInjectionLoader > should correctly insert values with directive 1`] = `
 "
-      \\"use client\\";globalThis[\\"foo\\"] = \\"bar\\";
+      "use client";globalThis["foo"] = "bar";
       import * as Sentry from '@sentry/nextjs';
       Sentry.init();
     "
 `;
 
-exports[`valueInjectionLoader should correctly insert values with directive and block comments 1`] = `
+exports[`valueInjectionLoader > should correctly insert values with directive and block comments 1`] = `
 "
       /* test */
-      \\"use client\\";;globalThis[\\"foo\\"] = \\"bar\\";
+      "use client";;globalThis["foo"] = "bar";
       import * as Sentry from '@sentry/nextjs';
       Sentry.init();
     "
 `;
 
-exports[`valueInjectionLoader should correctly insert values with directive and inline comments 1`] = `
+exports[`valueInjectionLoader > should correctly insert values with directive and inline comments 1`] = `
 "
       // test
-      \\"use client\\";;globalThis[\\"foo\\"] = \\"bar\\";
+      "use client";;globalThis["foo"] = "bar";
       import * as Sentry from '@sentry/nextjs';
       Sentry.init();
     "
 `;
 
-exports[`valueInjectionLoader should correctly insert values with directive and multiline block comments 1`] = `
+exports[`valueInjectionLoader > should correctly insert values with directive and multiline block comments 1`] = `
 "
       /*
         test
       */
-      \\"use client\\";;globalThis[\\"foo\\"] = \\"bar\\";
+      "use client";;globalThis["foo"] = "bar";
       import * as Sentry from '@sentry/nextjs';
       Sentry.init();
     "
 `;
 
-exports[`valueInjectionLoader should correctly insert values with directive and multiline block comments and a bunch of whitespace 1`] = `
+exports[`valueInjectionLoader > should correctly insert values with directive and multiline block comments and a bunch of whitespace 1`] = `
 "
       /*
         test
@@ -65,7 +65,7 @@ exports[`valueInjectionLoader should correctly insert values with directive and
 
 
 
-      \\"use client\\";;globalThis[\\"foo\\"] = \\"bar\\";
+      "use client";;globalThis["foo"] = "bar";
 
 
 
@@ -74,9 +74,9 @@ exports[`valueInjectionLoader should correctly insert values with directive and
     "
 `;
 
-exports[`valueInjectionLoader should correctly insert values with directive and semicolon 1`] = `
+exports[`valueInjectionLoader > should correctly insert values with directive and semicolon 1`] = `
 "
-      \\"use client\\";;globalThis[\\"foo\\"] = \\"bar\\";
+      "use client";;globalThis["foo"] = "bar";
       import * as Sentry from '@sentry/nextjs';
       Sentry.init();
     "

packages/nextjs/test/config/__snapshots__/valueInjectionLoader.test.ts.snap

@@ -2,6 +2,7 @@
 import './mocks';
 
 import * as fs from 'fs';
+import { describe, vi, it, expect } from 'vitest';
 
 import type { ModuleRuleUseProperty, WebpackModuleRule } from '../../src/config/types';
 import {
@@ -13,36 +14,8 @@ import {
 } from './fixtures';
 import { materializeFinalWebpackConfig } from './testUtils';
 
-const existsSyncSpy = jest.spyOn(fs, 'existsSync');
-const lstatSyncSpy = jest.spyOn(fs, 'lstatSync');
-
-type MatcherResult = { pass: boolean; message: () => string };
-
-expect.extend({
-  stringEndingWith(received: string, expectedEnding: string): MatcherResult {
-    const failsTest = !received.endsWith(expectedEnding);
-    const generateErrorMessage = () =>
-      failsTest
-        ? // Regular error message for match failing
-          `expected string ending with '${expectedEnding}', but got '${received}'`
-        : // Error message for the match passing if someone has called it with `expect.not`
-          `expected string not ending with '${expectedEnding}', but got '${received}'`;
-
-    return {
-      pass: !failsTest,
-      message: generateErrorMessage,
-    };
-  },
-});
-
-declare global {
-  // eslint-disable-next-line @typescript-eslint/no-namespace
-  namespace jest {
-    interface Expect {
-      stringEndingWith: (expectedEnding: string) => MatcherResult;
-    }
-  }
-}
+const existsSyncSpy = vi.spyOn(fs, 'existsSync');
+const lstatSyncSpy = vi.spyOn(fs, 'lstatSync');
 
 function applyRuleToResource(rule: WebpackModuleRule, resourcePath: string): ModuleRuleUseProperty[] {
   const applications = [];
@@ -80,7 +53,7 @@ describe('webpack loaders', () => {
         test: expect.any(RegExp),
         use: [
           {
-            loader: expect.stringEndingWith('valueInjectionLoader.js'),
+            loader: expect.stringMatching(/valueInjectionLoader\.js$/),
             // We use `expect.objectContaining({})` rather than `expect.any(Object)` to match any plain object because
             // the latter will also match arrays, regexes, dates, sets, etc. - anything whose `typeof` value is
             // `'object'`.
@@ -272,7 +245,7 @@ describe('webpack loaders', () => {
         test: /sentry\.client\.config\.(jsx?|tsx?)/,
         use: [
           {
-            loader: expect.stringEndingWith('valueInjectionLoader.js'),
+            loader: expect.stringMatching(/valueInjectionLoader\.js$/),
             // We use `expect.objectContaining({})` rather than `expect.any(Object)` to match any plain object because
             // the latter will also match arrays, regexes, dates, sets, etc. - anything whose `typeof` value is
             // `'object'`.
@@ -285,9 +258,10 @@ describe('webpack loaders', () => {
 });
 
 describe('`distDir` value in default server-side `RewriteFrames` integration', () => {
-  describe('`RewriteFrames` ends up with correct `distDir` value', () => {
+  it('`RewriteFrames` ends up with correct `distDir` value', () => {
     // TODO: this, along with any number of other parts of the build process, should be tested with an integration
     // test which actually runs webpack and inspects the resulting bundles (and that integration test should test
-    // custom `distDir` values with and without a `.`, to make sure the regex escaping is working)
+    // custom `distDir` values with and without a `.`, to make sure the regex
+    // escaping is working)
   });
 });