From d206b0f51891250ca5c7402e6af0f9fa04e3d238 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Tue, 14 Dec 2021 20:18:32 -0500 Subject: [PATCH] ref(browser): Remove optional chaining --- packages/browser/src/integrations/trycatch.ts | 2 +- packages/browser/src/integrations/useragent.ts | 4 ++-- packages/browser/src/transports/utils.ts | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/browser/src/integrations/trycatch.ts b/packages/browser/src/integrations/trycatch.ts index e19747542e91..80f503e623f0 100644 --- a/packages/browser/src/integrations/trycatch.ts +++ b/packages/browser/src/integrations/trycatch.ts @@ -232,7 +232,7 @@ export class TryCatch implements Integration { */ const wrappedEventHandler = (fn as unknown) as WrappedFunction; try { - const originalEventHandler = wrappedEventHandler?.__sentry_wrapped__; + const originalEventHandler = wrappedEventHandler && wrappedEventHandler.__sentry_wrapped__; if (originalEventHandler) { originalRemoveEventListener.call(this, eventName, originalEventHandler, options); } diff --git a/packages/browser/src/integrations/useragent.ts b/packages/browser/src/integrations/useragent.ts index 925255f074e9..1160320f9d93 100644 --- a/packages/browser/src/integrations/useragent.ts +++ b/packages/browser/src/integrations/useragent.ts @@ -28,12 +28,12 @@ export class UserAgent implements Integration { } // grab as much info as exists and add it to the event - const url = event.request?.url || global.location?.href; + const url = (event.request && event.request.url) || (global.location && global.location.href); const { referrer } = global.document || {}; const { userAgent } = global.navigator || {}; const headers = { - ...event.request?.headers, + ...(event.request && event.request.headers), ...(referrer && { Referer: referrer }), ...(userAgent && { 'User-Agent': userAgent }), }; diff --git a/packages/browser/src/transports/utils.ts b/packages/browser/src/transports/utils.ts index 336ed942a2ec..5d958b531034 100644 --- a/packages/browser/src/transports/utils.ts +++ b/packages/browser/src/transports/utils.ts @@ -58,13 +58,14 @@ export function getNativeFetchImplementation(): FetchImpl { const document = global.document; let fetchImpl = global.fetch; // eslint-disable-next-line deprecation/deprecation - if (typeof document?.createElement === `function`) { + if (document && typeof document.createElement === `function`) { try { const sandbox = document.createElement('iframe'); sandbox.hidden = true; document.head.appendChild(sandbox); - if (sandbox.contentWindow?.fetch) { - fetchImpl = sandbox.contentWindow.fetch; + const contentWindow = sandbox.contentWindow; + if (contentWindow && contentWindow.fetch) { + fetchImpl = contentWindow.fetch; } document.head.removeChild(sandbox); } catch (e) {