Merge branch 'develop' into upgrade-vite-vitest

Author: nwalters512

dev-packages/browser-integration-tests/suites/integrations/captureConsole-attachStackTrace/test.ts

@@ -19,10 +19,10 @@ sentryTest(
     const errorEvent = events.find(event => event.message === 'console error');
     const traceEvent = events.find(event => event.message === 'console trace');
     const errorWithErrorEvent = events.find(
-      event => event.exception && event.exception.values?.[0].value === 'console error with error object',
+      event => event.exception?.values?.[0].value === 'console error with error object',
     );
     const traceWithErrorEvent = events.find(
-      event => event.exception && event.exception.values?.[0].value === 'console trace with error object',
+      event => event.exception?.values?.[0].value === 'console trace with error object',
     );
 
     expect(logEvent).toEqual(

dev-packages/browser-integration-tests/suites/integrations/captureConsole/test.ts

@@ -17,10 +17,10 @@ sentryTest('it captures console messages correctly', async ({ getLocalTestUrl, p
   const errorEvent = events.find(event => event.message === 'console error');
   const traceEvent = events.find(event => event.message === 'console trace');
   const errorWithErrorEvent = events.find(
-    event => event.exception && event.exception.values?.[0].value === 'console error with error object',
+    event => event.exception?.values?.[0].value === 'console error with error object',
   );
   const traceWithErrorEvent = events.find(
-    event => event.exception && event.exception.values?.[0].value === 'console trace with error object',
+    event => event.exception?.values?.[0].value === 'console trace with error object',
   );
 
   expect(logEvent).toEqual(

dev-packages/browser-integration-tests/suites/integrations/featureFlags/featureFlags/withScope/test.ts

@@ -22,8 +22,8 @@ sentryTest('Flag evaluations in forked scopes are stored separately.', async ({
   const url = await getLocalTestUrl({ testDir: __dirname, skipDsnRouteHandler: true });
   await page.goto(url);
 
-  const forkedReqPromise = waitForErrorRequest(page, event => !!event.tags && event.tags.isForked === true);
-  const mainReqPromise = waitForErrorRequest(page, event => !!event.tags && event.tags.isForked === false);
+  const forkedReqPromise = waitForErrorRequest(page, event => !!event.tags?.isForked === true);
+  const mainReqPromise = waitForErrorRequest(page, event => !!event.tags?.isForked === false);
 
   await page.evaluate(() => {
     const Sentry = (window as any).Sentry;

dev-packages/browser-integration-tests/suites/integrations/featureFlags/launchdarkly/withScope/test.ts

@@ -22,8 +22,8 @@ sentryTest('Flag evaluations in forked scopes are stored separately.', async ({
   const url = await getLocalTestUrl({ testDir: __dirname, skipDsnRouteHandler: true });
   await page.goto(url);
 
-  const forkedReqPromise = waitForErrorRequest(page, event => !!event.tags && event.tags.isForked === true);
-  const mainReqPromise = waitForErrorRequest(page, event => !!event.tags && event.tags.isForked === false);
+  const forkedReqPromise = waitForErrorRequest(page, event => !!event.tags?.isForked === true);
+  const mainReqPromise = waitForErrorRequest(page, event => !!event.tags?.isForked === false);
 
   await page.evaluate(() => {
     const Sentry = (window as any).Sentry;

dev-packages/browser-integration-tests/suites/integrations/featureFlags/openfeature/withScope/test.ts

@@ -22,8 +22,8 @@ sentryTest('Flag evaluations in forked scopes are stored separately.', async ({
   const url = await getLocalTestUrl({ testDir: __dirname, skipDsnRouteHandler: true });
   await page.goto(url);
 
-  const forkedReqPromise = waitForErrorRequest(page, event => !!event.tags && event.tags.isForked === true);
-  const mainReqPromise = waitForErrorRequest(page, event => !!event.tags && event.tags.isForked === false);
+  const forkedReqPromise = waitForErrorRequest(page, event => !!event.tags?.isForked === true);
+  const mainReqPromise = waitForErrorRequest(page, event => !!event.tags?.isForked === false);
 
   await page.evaluate(() => {
     const Sentry = (window as any).Sentry;

dev-packages/browser-integration-tests/suites/old-sdk-interop/acs/getCurrentScope/subject.js

@@ -4,7 +4,7 @@ const sentryCarrier = window?.__SENTRY__;
  * Simulate an old pre v8 SDK obtaining the hub from the global sentry carrier
  * and checking for the hub version.
  */
-const res = sentryCarrier.acs && sentryCarrier.acs.getCurrentScope();
+const res = sentryCarrier.acs?.getCurrentScope();
 
 // Write back result into the document
 document.getElementById('currentScope').innerText = res && 'scope';

dev-packages/browser-integration-tests/suites/old-sdk-interop/hub/isOlderThan/subject.js

@@ -4,7 +4,7 @@ const sentryCarrier = window?.__SENTRY__;
  * Simulate an old pre v8 SDK obtaining the hub from the global sentry carrier
  * and checking for the hub version.
  */
-const res = sentryCarrier.hub && sentryCarrier.hub.isOlderThan(7);
+const res = sentryCarrier.hub?.isOlderThan(7);
 
 // Write back result into the document
 document.getElementById('olderThan').innerText = res;

dev-packages/browser-integration-tests/suites/replay/captureReplayOffline/test.ts

@@ -5,7 +5,7 @@ import { getReplayEvent, shouldSkipReplayTest, waitForReplayRequest } from '../.
 
 sentryTest('should capture replays offline', async ({ getLocalTestUrl, page }) => {
   // makeBrowserOfflineTransport is not included in any CDN bundles
-  if (shouldSkipReplayTest() || (process.env.PW_BUNDLE && process.env.PW_BUNDLE.startsWith('bundle'))) {
+  if (shouldSkipReplayTest() || process.env.PW_BUNDLE?.startsWith('bundle')) {
     sentryTest.skip();
   }
 

dev-packages/browser-integration-tests/suites/replay/replayIntegrationShim/test.ts

@@ -7,7 +7,7 @@ sentryTest(
   async ({ getLocalTestUrl, page, forceFlushReplay }) => {
     const bundle = process.env.PW_BUNDLE;
 
-    if (!bundle || !bundle.startsWith('bundle_') || bundle.includes('replay')) {
+    if (!bundle?.startsWith('bundle_') || bundle.includes('replay')) {
       sentryTest.skip();
     }
 

dev-packages/browser-integration-tests/suites/replay/replayShim/test.ts

@@ -7,7 +7,7 @@ sentryTest(
   async ({ getLocalTestUrl, page, forceFlushReplay }) => {
     const bundle = process.env.PW_BUNDLE;
 
-    if (!bundle || !bundle.startsWith('bundle_') || bundle.includes('replay')) {
+    if (!bundle?.startsWith('bundle_') || bundle.includes('replay')) {
       sentryTest.skip();
     }
 

dev-packages/browser-integration-tests/suites/tracing/dsc-txn-name-update/test.ts

@@ -182,8 +182,5 @@ async function captureErrorAndGetEnvelopeTraceHeader(page: Page): Promise<Partia
 
   const [, errorEnvelopeTraceHeader] = (await errorEventPromise)[0];
 
-  // @ts-expect-error - EventEnvelopeHeaders type in (types/envelope.ts) suggests that trace_id is optional,
-  // which the DynamicSamplingContext type does not permit.
-  // TODO(v9): We should adjust the EventEnvelopeHeaders type because the trace header always needs to have a trace_id
   return errorEnvelopeTraceHeader;
 }

dev-packages/browser-integration-tests/suites/transport/offline/queued/test.ts

@@ -10,7 +10,7 @@ function delay(ms: number) {
 
 sentryTest('should queue and retry events when they fail to send', async ({ getLocalTestUrl, page }) => {
   // makeBrowserOfflineTransport is not included in any CDN bundles
-  if (process.env.PW_BUNDLE && process.env.PW_BUNDLE.startsWith('bundle')) {
+  if (process.env.PW_BUNDLE?.startsWith('bundle')) {
     sentryTest.skip();
   }
 

dev-packages/e2e-tests/test-applications/react-create-browser-router/.gitignore

@@ -0,0 +1,29 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+/test-results/
+/playwright-report/
+/playwright/.cache/
+
+!*.d.ts

dev-packages/e2e-tests/test-applications/react-create-browser-router/.npmrc

@@ -0,0 +1,2 @@
+@sentry:registry=http://127.0.0.1:4873
+@sentry-internal:registry=http://127.0.0.1:4873

dev-packages/e2e-tests/test-applications/react-create-browser-router/package.json

@@ -0,0 +1,40 @@
+{
+  "name": "react-create-browser-router-test",
+  "version": "0.1.0",
+  "private": true,
+  "dependencies": {
+    "@sentry/react": "latest || *",
+    "@types/node": "^18.19.1",
+    "@types/react": "18.0.0",
+    "@types/react-dom": "18.0.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
+    "react-router-dom": "^6.4.1",
+    "react-scripts": "5.0.1",
+    "typescript": "~5.0.0"
+  },
+  "scripts": {
+    "build": "react-scripts build",
+    "start": "serve -s build",
+    "test": "playwright test",
+    "clean": "npx rimraf node_modules pnpm-lock.yaml",
+    "test:build": "pnpm install && pnpm build",
+    "test:build-canary": "pnpm install && pnpm add react@canary react-dom@canary && pnpm build",
+    "test:assert": "pnpm test"
+  },
+  "eslintConfig": {
+    "extends": ["react-app", "react-app/jest"]
+  },
+  "browserslist": {
+    "production": [">0.2%", "not dead", "not op_mini all"],
+    "development": ["last 1 chrome version", "last 1 firefox version", "last 1 safari version"]
+  },
+  "devDependencies": {
+    "@playwright/test": "^1.44.1",
+    "@sentry-internal/test-utils": "link:../../../test-utils",
+    "serve": "14.0.1"
+  },
+  "volta": {
+    "extends": "../../package.json"
+  }
+}

dev-packages/e2e-tests/test-applications/react-create-browser-router/playwright.config.mjs

@@ -0,0 +1,7 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+  startCommand: `pnpm start`,
+});
+
+export default config;

dev-packages/e2e-tests/test-applications/react-create-browser-router/public/index.html

@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta name="description" content="Web site created using create-react-app" />
+    <title>React App</title>
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+    <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+
+      To begin the development, run `npm start` or `yarn start`.
+      To create a production bundle, use `npm run build` or `yarn build`.
+    -->
+  </body>
+</html>

dev-packages/e2e-tests/test-applications/react-create-browser-router/src/globals.d.ts

@@ -0,0 +1,5 @@
+interface Window {
+  recordedTransactions?: string[];
+  capturedExceptionId?: string;
+  sentryReplayId?: string;
+}

dev-packages/e2e-tests/test-applications/react-create-browser-router/src/index.tsx

@@ -0,0 +1,66 @@
+import * as Sentry from '@sentry/react';
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+import {
+  RouterProvider,
+  createBrowserRouter,
+  createRoutesFromChildren,
+  matchRoutes,
+  useLocation,
+  useNavigationType,
+} from 'react-router-dom';
+import Index from './pages/Index';
+import User from './pages/User';
+
+const replay = Sentry.replayIntegration();
+
+Sentry.init({
+  // environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn: process.env.REACT_APP_E2E_TEST_DSN,
+  integrations: [
+    Sentry.reactRouterV6BrowserTracingIntegration({
+      useEffect: React.useEffect,
+      useLocation,
+      useNavigationType,
+      createRoutesFromChildren,
+      matchRoutes,
+    }),
+    replay,
+  ],
+  // We recommend adjusting this value in production, or using tracesSampler
+  // for finer control
+  tracesSampleRate: 1.0,
+  release: 'e2e-test',
+
+  tunnel: 'http://localhost:3031',
+
+  // Always capture replays, so we can test this properly
+  replaysSessionSampleRate: 1.0,
+  replaysOnErrorSampleRate: 0.0,
+
+  debug: !!process.env.DEBUG,
+});
+
+const sentryCreateBrowserRouter = Sentry.wrapCreateBrowserRouterV6(createBrowserRouter);
+
+const router = sentryCreateBrowserRouter(
+  [
+    {
+      path: '/',
+      element: <Index />,
+    },
+    {
+      path: '/user/:id',
+      element: <User />,
+    },
+  ],
+  {
+    // We're testing whether this option is avoided in the integration
+    // We expect this to be ignored
+    initialEntries: ['/user/1'],
+  },
+);
+
+const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement);
+
+root.render(<RouterProvider router={router} />);

dev-packages/e2e-tests/test-applications/react-create-browser-router/src/pages/Index.tsx

@@ -0,0 +1,23 @@
+// biome-ignore lint/nursery/noUnusedImports: Need React import for JSX
+import * as React from 'react';
+import { Link } from 'react-router-dom';
+
+const Index = () => {
+  return (
+    <>
+      <input
+        type="button"
+        value="Capture Exception"
+        id="exception-button"
+        onClick={() => {
+          throw new Error('I am an error!');
+        }}
+      />
+      <Link to="/user/5" id="navigation">
+        navigate
+      </Link>
+    </>
+  );
+};
+
+export default Index;

dev-packages/e2e-tests/test-applications/react-create-browser-router/src/pages/User.tsx

@@ -0,0 +1,8 @@
+// biome-ignore lint/nursery/noUnusedImports: Need React import for JSX
+import * as React from 'react';
+
+const User = () => {
+  return <p>I am a blank page :)</p>;
+};
+
+export default User;

dev-packages/e2e-tests/test-applications/react-create-browser-router/src/react-app-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="react-scripts" />

dev-packages/e2e-tests/test-applications/react-create-browser-router/start-event-proxy.mjs

@@ -0,0 +1,6 @@
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+startEventProxyServer({
+  port: 3031,
+  proxyServerName: 'react-create-browser-router',
+});

dev-packages/e2e-tests/test-applications/react-create-browser-router/tests/errors.test.ts

@@ -0,0 +1,30 @@
+import { expect, test } from '@playwright/test';
+import { waitForError } from '@sentry-internal/test-utils';
+
+test('Captures exception correctly', async ({ page }) => {
+  const errorEventPromise = waitForError('react-create-browser-router', event => {
+    return !event.type && event.exception?.values?.[0]?.value === 'I am an error!';
+  });
+
+  await page.goto('/');
+
+  const exceptionButton = page.locator('id=exception-button');
+  await exceptionButton.click();
+
+  const errorEvent = await errorEventPromise;
+
+  expect(errorEvent.exception?.values).toHaveLength(1);
+  expect(errorEvent.exception?.values?.[0]?.value).toBe('I am an error!');
+
+  expect(errorEvent.request).toEqual({
+    headers: expect.any(Object),
+    url: 'http://localhost:3030/',
+  });
+
+  expect(errorEvent.transaction).toEqual('/');
+
+  expect(errorEvent.contexts?.trace).toEqual({
+    trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+    span_id: expect.stringMatching(/[a-f0-9]{16}/),
+  });
+});