switch browser

Author: AbhiPrasad

packages/browser/src/sdk.ts

@@ -1,8 +1,16 @@
-import { getCurrentHub, initAndBind, Integrations as CoreIntegrations } from '@sentry/core';
+import { defaultCoreOptions, getCurrentHub, initAndBind, Integrations as CoreIntegrations } from '@sentry/core';
+import { getIntegrationsToSetup } from '@sentry/core/build/types/integration';
 import { Hub } from '@sentry/types';
-import { addInstrumentationHandler, getGlobalObject, logger, resolvedSyncPromise } from '@sentry/utils';
+import {
+  addInstrumentationHandler,
+  getGlobalObject,
+  logger,
+  makeDsn,
+  resolvedSyncPromise,
+  stackParserFromOptions,
+} from '@sentry/utils';
 
-import { BrowserClient, BrowserOptions } from './client';
+import { BrowserClient, BrowserClientOptions, BrowserOptions } from './client';
 import { IS_DEBUG_BUILD } from './flags';
 import { ReportDialogOptions, wrap as internalWrap } from './helpers';
 import { Breadcrumbs, Dedupe, GlobalHandlers, LinkedErrors, TryCatch, UserAgent } from './integrations';
@@ -97,9 +105,18 @@ export function init(options: BrowserOptions = {}): void {
   if (options.stackParser === undefined) {
     options.stackParser = defaultStackParsers;
   }
-
   const { transport, newTransport } = setupBrowserTransport(options);
-  initAndBind(BrowserClient, options, transport, newTransport);
+
+  const clientOptions: BrowserClientOptions = {
+    ...options,
+    ...defaultCoreOptions,
+    dsn: options.dsn === undefined ? undefined : makeDsn(options.dsn),
+    stackParser: stackParserFromOptions(options),
+    integrations: getIntegrationsToSetup(options),
+    transport,
+  };
+
+  initAndBind(BrowserClient, clientOptions, transport, newTransport);
 
   if (options.autoSessionTracking) {
     startSessionTracking();

packages/browser/src/transports/setup.ts

@@ -8,7 +8,7 @@ import {
 import { Transport, TransportOptions } from '@sentry/types';
 import { supportsFetch } from '@sentry/utils';
 
-import { BrowserClientOptions } from '../client';
+import { BrowserOptions } from '../client';
 import { FetchTransport } from './fetch';
 import { makeNewFetchTransport } from './new-fetch';
 import { makeNewXHRTransport } from './new-xhr';
@@ -31,7 +31,7 @@ export interface BrowserTransportOptions extends BaseTransportOptions {
  * this function will return a ready to use `NewTransport`.
  */
 // TODO(v7): Adjust return value when NewTransport is the default
-export function setupBrowserTransport(options: BrowserClientOptions): {
+export function setupBrowserTransport(options: BrowserOptions): {
   transport: Transport;
   newTransport?: NewTransport;
 } {

packages/core/src/options.ts

@@ -1,9 +1,3 @@
-import { ClientOptions, Options } from '@sentry/types';
-import { makeDsn, stackParserFromOptions } from '@sentry/utils';
-
-import { getIntegrationsToSetup } from './integration';
-import { NoopTransport } from './transports/noop';
-
 export const DEFAULT_MAX_BREADCRUMBS = 100;
 export const DEFAULT_SAMPLE_RATE = 1;
 export const DEFAULT_MAX_VALUE_LENGTH = 250;
@@ -19,16 +13,3 @@ export const defaultCoreOptions = {
   normalizeMaxBreadth: DEFAULT_NORMALIZE_MAX_BREADTH,
   shutdownTimeout: DEFAULT_SHUTDOWN_TIMEOUT,
 };
-
-/** JSDoc */
-export function optionsToClientOptions(options: Options): ClientOptions {
-  return {
-    // TODO(v7): Remove NoopTransport
-    transport: options.transport || NoopTransport,
-    ...defaultCoreOptions,
-    ...options,
-    dsn: options.dsn === undefined ? undefined : makeDsn(options.dsn),
-    stackParser: stackParserFromOptions(options),
-    integrations: getIntegrationsToSetup(options),
-  };
-}

packages/node/src/sdk.ts

@@ -201,7 +201,7 @@ export function isAutoSessionTrackingEnabled(client?: NodeClient): boolean {
   if (client === undefined) {
     return false;
   }
-  const clientOptions: NodeOptions = client && client.getOptions();
+  const clientOptions: NodeClientOptions = client && client.getOptions();
   if (clientOptions && clientOptions.autoSessionTracking !== undefined) {
     return clientOptions.autoSessionTracking;
   }

packages/types/src/options.ts

@@ -62,7 +62,7 @@ export interface ClientOptions {
   /**
    * Transport object that should be used to send events to Sentry
    */
-  transport: TransportClass<Transport>;
+  transport: Transport;
 
   /**
    * A stack parser implementation
@@ -227,7 +227,7 @@ export interface Options extends Omit<Partial<ClientOptions>, 'dsn' | 'integrati
   /**
    * Transport object that should be used to send events to Sentry
    */
-  transport?: Transport;
+  transport?: TransportClass<Transport>;
 
   /**
    * A stack parser implementation or an array of stack line parsers