add client options to baseclient

Author: AbhiPrasad

packages/core/src/baseclient.ts

@@ -2,12 +2,12 @@
 import { Scope, Session } from '@sentry/hub';
 import {
   Client,
+  ClientOptions,
   DsnComponents,
   Event,
   EventHint,
   Integration,
   IntegrationClass,
-  Options,
   Severity,
   SeverityLevel,
   Transport,
@@ -68,7 +68,7 @@ const ALREADY_SEEN_ERROR = "Not capturing exception because it's already been ca
  *   // ...
  * }
  */
-export abstract class BaseClient<O extends Options> implements Client<O> {
+export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
   /** Options passed to the SDK. */
   protected readonly _options: O;
 

packages/core/src/integration.ts

@@ -1,5 +1,5 @@
 import { addGlobalEventProcessor, getCurrentHub } from '@sentry/hub';
-import { Integration, Options } from '@sentry/types';
+import { ClientOptions, Integration, Options } from '@sentry/types';
 import { addNonEnumerableProperty, logger } from '@sentry/utils';
 
 import { IS_DEBUG_BUILD } from './flags';
@@ -70,9 +70,9 @@ export function setupIntegration(integration: Integration): void {
  * @param integrations array of integration instances
  * @param withDefault should enable default integrations
  */
-export function setupIntegrations<O extends Options>(options: O): IntegrationIndex {
+export function setupIntegrations<O extends ClientOptions>(options: O): IntegrationIndex {
   const integrations: IntegrationIndex = {};
-  getIntegrationsToSetup(options).forEach(integration => {
+  options.integrations.forEach(integration => {
     integrations[integration.name] = integration;
     setupIntegration(integration);
   });