[v7] Remove API class, move Dsn to core and simplify it greatly

packages/browser/src/client.ts

@@ -1,9 +1,9 @@
-import { BaseClient, Scope, SDK_VERSION } from '@sentry/core';
+import { BaseClient, ReportDialogOptions, Scope, SDK_VERSION } from '@sentry/core';
 import { Event, EventHint } from '@sentry/types';
 import { getGlobalObject, logger } from '@sentry/utils';
 
 import { BrowserBackend, BrowserOptions } from './backend';
-import { injectReportDialog, ReportDialogOptions } from './helpers';
+import { injectReportDialog } from './helpers';
 import { Breadcrumbs } from './integrations';
 
 /**
@@ -53,7 +53,7 @@ export class BrowserClient extends BaseClient<BrowserBackend, BrowserOptions> {
 
     injectReportDialog({
       ...options,
-      dsn: options.dsn || this.getDsn(),
+      dsn: options.dsn || this.getDsn()?.toString(),
     });
   }
 

packages/browser/src/exports.ts

@@ -24,8 +24,10 @@ export {
   configureScope,
   getHubFromCarrier,
   getCurrentHub,
+  getReportDialogEndpoint,
   Hub,
   makeMain,
+  ReportDialogOptions,
   Scope,
   startTransaction,
   SDK_VERSION,
@@ -40,7 +42,7 @@ export {
 
 export { BrowserOptions } from './backend';
 export { BrowserClient } from './client';
-export { injectReportDialog, ReportDialogOptions } from './helpers';
+export { injectReportDialog } from './helpers';
 export { eventFromException, eventFromMessage } from './eventbuilder';
 export { defaultIntegrations, forceLoad, init, lastEventId, onLoad, showReportDialog, flush, close, wrap } from './sdk';
 export { SDK_NAME } from './version';

packages/browser/src/helpers.ts

@@ -1,5 +1,5 @@
-import { API, captureException, withScope } from '@sentry/core';
-import { DsnLike, Event as SentryEvent, Mechanism, Scope, WrappedFunction } from '@sentry/types';
+import { captureException, Dsn, getReportDialogEndpoint, ReportDialogOptions, withScope } from '@sentry/core';
+import { Event as SentryEvent, Mechanism, Scope, WrappedFunction } from '@sentry/types';
 import { addExceptionMechanism, addExceptionTypeValue, logger } from '@sentry/utils';
 
 let ignoreOnError: number = 0;
@@ -160,39 +160,11 @@ export function wrap(
   return sentryWrapped;
 }
 
-/**
- * All properties the report dialog supports
- */
-export interface ReportDialogOptions {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  [key: string]: any;
-  eventId?: string;
-  dsn?: DsnLike;
-  user?: {
-    email?: string;
-    name?: string;
-  };
-  lang?: string;
-  title?: string;
-  subtitle?: string;
-  subtitle2?: string;
-  labelName?: string;
-  labelEmail?: string;
-  labelComments?: string;
-  labelClose?: string;
-  labelSubmit?: string;
-  errorGeneric?: string;
-  errorFormEntry?: string;
-  successMessage?: string;
-  /** Callback after reportDialog showed up */
-  onLoad?(): void;
-}
-
 /**
  * Injects the Report Dialog script
  * @hidden
  */
-export function injectReportDialog(options: ReportDialogOptions = {}): void {
+export function injectReportDialog(options: ReportDialogOptions & { onLoad?(): void } = {}): void {
   if (!options.eventId) {
     logger.error(`Missing eventId option in showReportDialog call`);
     return;
@@ -204,7 +176,7 @@ export function injectReportDialog(options: ReportDialogOptions = {}): void {
 
   const script = document.createElement('script');
   script.async = true;
-  script.src = new API(options.dsn).getReportDialogEndpoint(options);
+  script.src = getReportDialogEndpoint(new Dsn(options.dsn));
 
   if (options.onLoad) {
     // eslint-disable-next-line @typescript-eslint/unbound-method

packages/browser/src/sdk.ts

@@ -1,9 +1,9 @@
-import { getCurrentHub, initAndBind, Integrations as CoreIntegrations } from '@sentry/core';
+import { getCurrentHub, initAndBind, Integrations as CoreIntegrations, ReportDialogOptions } from '@sentry/core';
 import { addInstrumentationHandler, getGlobalObject, logger, SyncPromise } from '@sentry/utils';
 
 import { BrowserOptions } from './backend';
 import { BrowserClient } from './client';
-import { ReportDialogOptions, wrap as internalWrap } from './helpers';
+import { wrap as internalWrap } from './helpers';
 import { Breadcrumbs, GlobalHandlers, LinkedErrors, TryCatch, UserAgent } from './integrations';
 
 export const defaultIntegrations = [

packages/browser/src/transports/base.ts

@@ -1,4 +1,3 @@
-import { API } from '@sentry/core';
 import {
   Event,
   Response as SentryResponse,
@@ -8,16 +7,11 @@ import {
   TransportOptions,
 } from '@sentry/types';
 import { logger, parseRetryAfterHeader, PromiseBuffer, SentryError } from '@sentry/utils';
+import { Dsn } from '@sentry/core';
 
 /** Base Transport class implementation */
 export abstract class BaseTransport implements Transport {
-  /**
-   * @deprecated
-   */
-  public url: string;
-
-  /** Helper to get Sentry API endpoints. */
-  protected readonly _api: API;
+  protected readonly _dsn: Dsn;
 
   /** A simple buffer holding all requests. */
   protected readonly _buffer: PromiseBuffer<SentryResponse> = new PromiseBuffer(30);
@@ -26,9 +20,7 @@ export abstract class BaseTransport implements Transport {
   protected readonly _rateLimits: Record<string, Date> = {};
 
   public constructor(public options: TransportOptions) {
-    this._api = new API(options.dsn, options._metadata);
-    // eslint-disable-next-line deprecation/deprecation
-    this.url = this._api.getStoreEndpointWithUrlEncodedAuth();
+    this._dsn = new Dsn(options.dsn as string);
   }
 
   /**

packages/browser/src/transports/fetch.ts

@@ -90,14 +90,14 @@ export class FetchTransport extends BaseTransport {
    * @inheritDoc
    */
   public sendEvent(event: Event): PromiseLike<Response> {
-    return this._sendRequest(eventToSentryRequest(event, this._api), event);
+    return this._sendRequest(eventToSentryRequest(event, this._dsn), event);
   }
 
   /**
    * @inheritDoc
    */
   public sendSession(session: Session): PromiseLike<Response> {
-    return this._sendRequest(sessionToSentryRequest(session, this._api), session);
+    return this._sendRequest(sessionToSentryRequest(session, this._dsn), session);
   }
 
   /**

packages/browser/src/transports/xhr.ts

@@ -10,14 +10,14 @@ export class XHRTransport extends BaseTransport {
    * @inheritDoc
    */
   public sendEvent(event: Event): PromiseLike<Response> {
-    return this._sendRequest(eventToSentryRequest(event, this._api), event);
+    return this._sendRequest(eventToSentryRequest(event, this._dsn), event);
   }
 
   /**
    * @inheritDoc
    */
   public sendSession(session: Session): PromiseLike<Response> {
-    return this._sendRequest(sessionToSentryRequest(session, this._api), session);
+    return this._sendRequest(sessionToSentryRequest(session, this._dsn), session);
   }
 
   /**

packages/core/src/baseclient.ts

@@ -12,7 +12,6 @@ import {
 } from '@sentry/types';
 import {
   dateTimestampInSeconds,
-  Dsn,
   isPrimitive,
   isThenable,
   logger,
@@ -23,6 +22,7 @@ import {
   uuid4,
 } from '@sentry/utils';
 
+import { Dsn } from './dsn';
 import { Backend, BackendClass } from './basebackend';
 import { IntegrationIndex, setupIntegrations } from './integration';