Skip to content

Commit de2c1ad

Browse files
authored
ref: Rewrite to use optional chaining & add eslint rule (#14966)
This adds an eslint rule to enforce usage of optional chaining, to keep things consistent. It also fixes remaining places that "violate" this.
1 parent 6a6e05b commit de2c1ad

File tree

113 files changed

+299
-343
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+299
-343
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ sentryTest(
1919
const errorEvent = events.find(event => event.message === 'console error');
2020
const traceEvent = events.find(event => event.message === 'console trace');
2121
const errorWithErrorEvent = events.find(
22-
event => event.exception && event.exception.values?.[0].value === 'console error with error object',
22+
event => event.exception?.values?.[0].value === 'console error with error object',
2323
);
2424
const traceWithErrorEvent = events.find(
25-
event => event.exception && event.exception.values?.[0].value === 'console trace with error object',
25+
event => event.exception?.values?.[0].value === 'console trace with error object',
2626
);
2727

2828
expect(logEvent).toEqual(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ sentryTest('it captures console messages correctly', async ({ getLocalTestUrl, p
1717
const errorEvent = events.find(event => event.message === 'console error');
1818
const traceEvent = events.find(event => event.message === 'console trace');
1919
const errorWithErrorEvent = events.find(
20-
event => event.exception && event.exception.values?.[0].value === 'console error with error object',
20+
event => event.exception?.values?.[0].value === 'console error with error object',
2121
);
2222
const traceWithErrorEvent = events.find(
23-
event => event.exception && event.exception.values?.[0].value === 'console trace with error object',
23+
event => event.exception?.values?.[0].value === 'console trace with error object',
2424
);
2525

2626
expect(logEvent).toEqual(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ sentryTest('Flag evaluations in forked scopes are stored separately.', async ({
2222
const url = await getLocalTestUrl({ testDir: __dirname, skipDsnRouteHandler: true });
2323
await page.goto(url);
2424

25-
const forkedReqPromise = waitForErrorRequest(page, event => !!event.tags && event.tags.isForked === true);
26-
const mainReqPromise = waitForErrorRequest(page, event => !!event.tags && event.tags.isForked === false);
25+
const forkedReqPromise = waitForErrorRequest(page, event => !!event.tags?.isForked === true);
26+
const mainReqPromise = waitForErrorRequest(page, event => !!event.tags?.isForked === false);
2727

2828
await page.evaluate(() => {
2929
const Sentry = (window as any).Sentry;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ sentryTest('Flag evaluations in forked scopes are stored separately.', async ({
2222
const url = await getLocalTestUrl({ testDir: __dirname, skipDsnRouteHandler: true });
2323
await page.goto(url);
2424

25-
const forkedReqPromise = waitForErrorRequest(page, event => !!event.tags && event.tags.isForked === true);
26-
const mainReqPromise = waitForErrorRequest(page, event => !!event.tags && event.tags.isForked === false);
25+
const forkedReqPromise = waitForErrorRequest(page, event => !!event.tags?.isForked === true);
26+
const mainReqPromise = waitForErrorRequest(page, event => !!event.tags?.isForked === false);
2727

2828
await page.evaluate(() => {
2929
const Sentry = (window as any).Sentry;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ sentryTest('Flag evaluations in forked scopes are stored separately.', async ({
2222
const url = await getLocalTestUrl({ testDir: __dirname, skipDsnRouteHandler: true });
2323
await page.goto(url);
2424

25-
const forkedReqPromise = waitForErrorRequest(page, event => !!event.tags && event.tags.isForked === true);
26-
const mainReqPromise = waitForErrorRequest(page, event => !!event.tags && event.tags.isForked === false);
25+
const forkedReqPromise = waitForErrorRequest(page, event => !!event.tags?.isForked === true);
26+
const mainReqPromise = waitForErrorRequest(page, event => !!event.tags?.isForked === false);
2727

2828
await page.evaluate(() => {
2929
const Sentry = (window as any).Sentry;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const sentryCarrier = window?.__SENTRY__;
44
* Simulate an old pre v8 SDK obtaining the hub from the global sentry carrier
55
* and checking for the hub version.
66
*/
7-
const res = sentryCarrier.acs && sentryCarrier.acs.getCurrentScope();
7+
const res = sentryCarrier.acs?.getCurrentScope();
88

99
// Write back result into the document
1010
document.getElementById('currentScope').innerText = res && 'scope';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const sentryCarrier = window?.__SENTRY__;
44
* Simulate an old pre v8 SDK obtaining the hub from the global sentry carrier
55
* and checking for the hub version.
66
*/
7-
const res = sentryCarrier.hub && sentryCarrier.hub.isOlderThan(7);
7+
const res = sentryCarrier.hub?.isOlderThan(7);
88

99
// Write back result into the document
1010
document.getElementById('olderThan').innerText = res;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { getReplayEvent, shouldSkipReplayTest, waitForReplayRequest } from '../.
55

66
sentryTest('should capture replays offline', async ({ getLocalTestUrl, page }) => {
77
// makeBrowserOfflineTransport is not included in any CDN bundles
8-
if (shouldSkipReplayTest() || (process.env.PW_BUNDLE && process.env.PW_BUNDLE.startsWith('bundle'))) {
8+
if (shouldSkipReplayTest() || process.env.PW_BUNDLE?.startsWith('bundle')) {
99
sentryTest.skip();
1010
}
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ sentryTest(
77
async ({ getLocalTestUrl, page, forceFlushReplay }) => {
88
const bundle = process.env.PW_BUNDLE;
99

10-
if (!bundle || !bundle.startsWith('bundle_') || bundle.includes('replay')) {
10+
if (!bundle?.startsWith('bundle_') || bundle.includes('replay')) {
1111
sentryTest.skip();
1212
}
1313

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ sentryTest(
77
async ({ getLocalTestUrl, page, forceFlushReplay }) => {
88
const bundle = process.env.PW_BUNDLE;
99

10-
if (!bundle || !bundle.startsWith('bundle_') || bundle.includes('replay')) {
10+
if (!bundle?.startsWith('bundle_') || bundle.includes('replay')) {
1111
sentryTest.skip();
1212
}
1313

0 commit comments

Comments
 (0)