Merge branch 'develop' into yarn-deduplicate

Author: nwalters512

.craft.yml

@@ -141,7 +141,7 @@ targets:
   # TODO(v9): Once stable, re-add this target to publish the AWS Lambda layer
   # - name: aws-lambda-layer
   #   includeNames: /^sentry-node-serverless-\d+.\d+.\d+(-(beta|alpha|rc)\.\d+)?\.zip$/
-  #   layerName: SentryNodeServerlessSDK
+  #   layerName: SentryNodeServerlessSDKv9
   #   compatibleRuntimes:
   #     - name: node
   #       versions:

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();
     }