Merge branch 'develop' into fn/nextjs-rewrite-frames

Author: AbhiPrasad

.github/workflows/build.yml

@@ -865,8 +865,9 @@ jobs:
             'node-express-app',
             'create-react-app',
             'create-next-app',
-            'create-remix-app',
-            'create-remix-app-v2',
+            # disabling remix e2e tests because of flakes
+            # 'create-remix-app',
+            # 'create-remix-app-v2',
             'debug-id-sourcemaps',
             'nextjs-app-dir',
             'nextjs-14',

.size-limit.js

@@ -54,6 +54,13 @@ module.exports = [
     gzip: true,
     limit: '50 KB',
   },
+  {
+    name: '@sentry/browser (incl. sendFeedback) - Webpack (gzipped)',
+    path: 'packages/browser/build/npm/esm/index.js',
+    import: '{ init, sendFeedback }',
+    gzip: true,
+    limit: '50 KB',
+  },
   {
     name: '@sentry/browser - Webpack (gzipped)',
     path: 'packages/browser/build/npm/esm/index.js',

dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/withCaptureException/init.js

@@ -0,0 +1,16 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  beforeSend(event) {
+    Sentry.captureUserFeedback({
+      event_id: event.event_id,
+      name: 'John Doe',
+      email: '[email protected]',
+      comments: 'This feedback should be attached associated with the captured error',
+    });
+    return event;
+  },
+});

dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/withCaptureException/subject.js

@@ -0,0 +1 @@
+Sentry.captureException(new Error('Error with Feedback'));

dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/withCaptureException/test.ts

@@ -0,0 +1,23 @@
+import { expect } from '@playwright/test';
+import type { Event, UserFeedback } from '@sentry/types';
+
+import { sentryTest } from '../../../../utils/fixtures';
+import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers';
+
+sentryTest('capture user feedback when captureException is called', async ({ getLocalTestPath, page }) => {
+  const url = await getLocalTestPath({ testDir: __dirname });
+
+  const data = (await getMultipleSentryEnvelopeRequests(page, 2, { url })) as (Event | UserFeedback)[];
+
+  expect(data).toHaveLength(2);
+
+  const errorEvent = ('exception' in data[0] ? data[0] : data[1]) as Event;
+  const feedback = ('exception' in data[0] ? data[1] : data[0]) as UserFeedback;
+
+  expect(feedback).toEqual({
+    comments: 'This feedback should be attached associated with the captured error',
+    email: '[email protected]',
+    event_id: errorEvent.event_id,
+    name: 'John Doe',
+  });
+});

dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/withCaptureMessage/init.js

@@ -0,0 +1,16 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  beforeSend(event) {
+    Sentry.captureUserFeedback({
+      event_id: event.event_id,
+      name: 'John Doe',
+      email: '[email protected]',
+      comments: 'This feedback should be attached associated with the captured message',
+    });
+    return event;
+  },
+});

dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/withCaptureMessage/subject.js

@@ -0,0 +1 @@
+Sentry.captureMessage('Message with Feedback');

dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/withCaptureMessage/test.ts

@@ -0,0 +1,23 @@
+import { expect } from '@playwright/test';
+import type { Event, UserFeedback } from '@sentry/types';
+
+import { sentryTest } from '../../../../utils/fixtures';
+import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers';
+
+sentryTest('capture user feedback when captureMessage is called', async ({ getLocalTestPath, page }) => {
+  const url = await getLocalTestPath({ testDir: __dirname });
+
+  const data = (await getMultipleSentryEnvelopeRequests(page, 2, { url })) as (Event | UserFeedback)[];
+
+  expect(data).toHaveLength(2);
+
+  const errorEvent = ('exception' in data[0] ? data[0] : data[1]) as Event;
+  const feedback = ('exception' in data[0] ? data[1] : data[0]) as UserFeedback;
+
+  expect(feedback).toEqual({
+    comments: 'This feedback should be attached associated with the captured message',
+    email: '[email protected]',
+    event_id: errorEvent.event_id,
+    name: 'John Doe',
+  });
+});

dev-packages/e2e-tests/test-applications/create-remix-app-v2/tests/behaviour-client.test.ts

@@ -47,7 +47,8 @@ test('Sends a client-side exception to Sentry', async ({ page }) => {
     .toBe(200);
 });
 
-test('Sends a pageload transaction to Sentry', async ({ page }) => {
+// Skipping test because of flake
+test.skip('Sends a pageload transaction to Sentry', async ({ page }) => {
   await page.goto('/');
 
   const recordedTransactionsHandle = await page.waitForFunction(() => {
@@ -106,7 +107,8 @@ test('Sends a pageload transaction to Sentry', async ({ page }) => {
   expect(hadPageLoadTransaction).toBe(true);
 });
 
-test('Sends a navigation transaction to Sentry', async ({ page }) => {
+// Skipped because of test flake
+test.skip('Sends a navigation transaction to Sentry', async ({ page }) => {
   await page.goto('/');
 
   // Give pageload transaction time to finish

dev-packages/e2e-tests/test-applications/create-remix-app/tests/behaviour-client.test.ts

@@ -7,7 +7,8 @@ const authToken = process.env.E2E_TEST_AUTH_TOKEN;
 const sentryTestOrgSlug = process.env.E2E_TEST_SENTRY_ORG_SLUG;
 const sentryTestProject = process.env.E2E_TEST_SENTRY_TEST_PROJECT;
 
-test('Sends a client-side exception to Sentry', async ({ page }) => {
+// skipping flaky test
+test.skip('Sends a client-side exception to Sentry', async ({ page }) => {
   await page.goto('/');
 
   const exceptionButton = page.locator('id=exception-button');
@@ -47,7 +48,8 @@ test('Sends a client-side exception to Sentry', async ({ page }) => {
     .toBe(200);
 });
 
-test('Sends a pageload transaction to Sentry', async ({ page }) => {
+// skipping flaky test
+test.skip('Sends a pageload transaction to Sentry', async ({ page }) => {
   await page.goto('/');
 
   const recordedTransactionsHandle = await page.waitForFunction(() => {