[v7] Use new transports in all packages

Author: kamilogorek

.eslintrc.js

@@ -8,7 +8,16 @@ module.exports = {
     ecmaVersion: 2018,
   },
   extends: ['prettier', 'eslint:recommended', 'plugin:import/errors', 'plugin:import/warnings'],
-  ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'cjs/**', 'examples/**', 'scripts/**', 'test/manual/**'],
+  ignorePatterns: [
+    'coverage/**',
+    'build/**',
+    'dist/**',
+    'esm/**',
+    'cjs/**',
+    'examples/**',
+    'scripts/**',
+    'test/manual/**',
+  ],
   rules: {
     // We want to prevent usage of unary operators outside of for loops
     'no-plusplus': ['error', { allowForLoopAfterthoughts: true }],

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "7.0.0-alpha",
+  "version": "7.0.0-alpha.0",
   "useWorkspaces": true,
   "npmClient": "yarn"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sentry-javascript",
-  "version": "7.0.0-alpha",
+  "version": "7.0.0-alpha.0",
   "description": "Official Sentry JavaScript SDK",
   "repository": "https://github.com/getsentry/sentry-javascript",
   "author": "Sentry",

packages/angular/package.json

@@ -22,6 +22,7 @@
   },
   "dependencies": {
     "@sentry/browser": "6.2.3",
+    "@sentry/transport-base": "7.0.0-alpha.0",
     "@sentry/types": "6.2.3",
     "@sentry/utils": "6.2.3",
     "rxjs": "^6.6.0"

packages/angular/src/errorhandler.ts

@@ -1,14 +1,15 @@
 import { HttpErrorResponse } from '@angular/common/http';
 import { ErrorHandler as AngularErrorHandler, Injectable } from '@angular/core';
 import * as Sentry from '@sentry/browser';
+import { ReportDialogOptions } from '@sentry/transport-base';
 
 /**
  * Options used to configure the behavior of the Angular ErrorHandler.
  */
 export interface ErrorHandlerOptions {
   logErrors?: boolean;
   showDialog?: boolean;
-  dialogOptions?: Sentry.ReportDialogOptions;
+  dialogOptions?: ReportDialogOptions;
   /**
    * Custom implementation of error extraction from the raw value captured by the Angular.
    * @param error Value captured by Angular's ErrorHandler provider

packages/browser/package.json

@@ -17,6 +17,9 @@
   },
   "dependencies": {
     "@sentry/core": "6.2.3",
+    "@sentry/transport-base": "7.0.0-alpha.0",
+    "@sentry/transport-fetch": "7.0.0-alpha.0",
+    "@sentry/transport-xhr": "7.0.0-alpha.0",
     "@sentry/types": "6.2.3",
     "@sentry/utils": "6.2.3"
   },

packages/browser/src/backend.ts

@@ -1,9 +1,11 @@
 import { BaseBackend } from '@sentry/core';
-import { Event, EventHint, Options, Severity, Transport } from '@sentry/types';
+import { Event, EventHint, Options, Severity } from '@sentry/types';
 import { supportsFetch } from '@sentry/utils';
+import { NoopTransport, Transport, TransportOptions } from '@sentry/transport-base';
+import { FetchTransport } from '@sentry/transport-fetch';
+import { XHRTransport } from '@sentry/transport-xhr';
 
 import { eventFromException, eventFromMessage } from './eventbuilder';
-import { FetchTransport, XHRTransport } from './transports';
 
 /**
  * Configuration options for the Sentry Browser SDK.
@@ -55,24 +57,22 @@ export class BrowserBackend extends BaseBackend<BrowserOptions> {
     return eventFromMessage(this._options, message, level, hint);
   }
 
-  /**
-   * @inheritDoc
-   */
   protected _setupTransport(): Transport {
+    // TODO: This whole function should be unnecessary and moved to client construction
     if (!this._options.dsn) {
       // We return the noop transport here in case there is no Dsn.
-      return super._setupTransport();
+      return new NoopTransport();
     }
 
-    const transportOptions = {
+    const transportOptions: TransportOptions = {
       ...this._options.transportOptions,
-      dsn: this._options.dsn,
-      _metadata: this._options._metadata,
+      dsn: this._options.transportOptions?.dsn ?? this._options.dsn,
     };
 
     if (this._options.transport) {
       return new this._options.transport(transportOptions);
     }
+
     if (supportsFetch()) {
       return new FetchTransport(transportOptions);
     }

packages/browser/src/client.ts

@@ -1,6 +1,7 @@
-import { BaseClient, ReportDialogOptions, Scope, SDK_VERSION } from '@sentry/core';
+import { BaseClient, Scope, SDK_VERSION } from '@sentry/core';
 import { Event, EventHint } from '@sentry/types';
 import { getGlobalObject, logger } from '@sentry/utils';
+import { ReportDialogOptions } from '@sentry/transport-base';
 
 import { BrowserBackend, BrowserOptions } from './backend';
 import { injectReportDialog } from './helpers';

packages/browser/src/exports.ts

@@ -24,10 +24,8 @@ export {
   configureScope,
   getHubFromCarrier,
   getCurrentHub,
-  getReportDialogEndpoint,
   Hub,
   makeMain,
-  ReportDialogOptions,
   Scope,
   startTransaction,
   SDK_VERSION,

packages/browser/src/helpers.ts

@@ -1,6 +1,7 @@
-import { captureException, Dsn, getReportDialogEndpoint, ReportDialogOptions, withScope } from '@sentry/core';
+import { captureException, withScope } from '@sentry/core';
 import { Event as SentryEvent, Mechanism, Scope, WrappedFunction } from '@sentry/types';
 import { addExceptionMechanism, addExceptionTypeValue, logger } from '@sentry/utils';
+import { Dsn, getReportDialogEndpoint, ReportDialogOptions } from '@sentry/transport-base';
 
 let ignoreOnError: number = 0;
 

packages/browser/src/index.ts

@@ -4,7 +4,6 @@ import { Integrations as CoreIntegrations } from '@sentry/core';
 import { getGlobalObject } from '@sentry/utils';
 
 import * as BrowserIntegrations from './integrations';
-import * as Transports from './transports';
 
 let windowIntegrations = {};
 
@@ -20,4 +19,4 @@ const INTEGRATIONS = {
   ...BrowserIntegrations,
 };
 
-export { INTEGRATIONS as Integrations, Transports };
+export { INTEGRATIONS as Integrations };

packages/browser/src/sdk.ts

@@ -1,5 +1,6 @@
-import { getCurrentHub, initAndBind, Integrations as CoreIntegrations, ReportDialogOptions } from '@sentry/core';
+import { getCurrentHub, initAndBind, Integrations as CoreIntegrations } from '@sentry/core';
 import { addInstrumentationHandler, getGlobalObject, logger, SyncPromise } from '@sentry/utils';
+import { ReportDialogOptions } from '@sentry/transport-base';
 
 import { BrowserOptions } from './backend';
 import { BrowserClient } from './client';