fix: Merge transportOptions correctly (getsentry#2153)

kamilogorek · web-flow · commit 1df4c1fe4175 · 2019-07-05T12:52:59.000+02:00
* meta: v5.5.0 changlog

* fix: Merge transportOptions correctly
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,20 @@
 
 ## Unreleased
 
-- [browser]: feat: Try to read `window.SENTRY_RELEASE` to set release by default
-- [utils]: fix(utils): Add polyfill for Object.setPrototypeOf
+- None
+
+## 5.5.0
+
+- [core] fix: Store processing state for each `flush` call separately (#2143)
+- [scope] feat: Generate hint if not provided in the Hub calls (#2142)
+- [browser] feat: Read `window.SENTRY_RELEASE` to set release by default (#2132)
+- [browser] fix: Don't call `fn.handleEvent.bind` if `fn.handleEvent` does not exist (#2138)
+- [browser] fix: Correctly handle events that utilize `handleEvent` object (#2149)
+- [node] feat: Provide optional `shouldHandleError` option for node `errorHandler` (#2146)
+- [node] fix: Remove unsafe `any` from `NodeOptions` type (#2111)
+- [node] fix: Merge `transportOptions` correctly (#2151)
+- [utils] fix: Add polyfill for `Object.setPrototypeOf` (#2127)
+- [integrations] feat: `SessionDuration` integration (#2150)
 
 ## 5.4.3
 
diff --git a/packages/browser/src/backend.ts b/packages/browser/src/backend.ts
@@ -49,9 +49,10 @@ export class BrowserBackend extends BaseBackend<BrowserOptions> {
       return super._setupTransport();
     }
 
-    const transportOptions = this._options.transportOptions
-      ? this._options.transportOptions
-      : { dsn: this._options.dsn };
+    const transportOptions = {
+      ...this._options.transportOptions,
+      dsn: this._options.dsn,
+    };
 
     if (this._options.transport) {
       return new this._options.transport(transportOptions);
diff --git a/packages/node/src/backend.ts b/packages/node/src/backend.ts
@@ -1,5 +1,5 @@
 import { BaseBackend, Dsn, getCurrentHub } from '@sentry/core';
-import { Event, EventHint, Mechanism, Options, Severity, Transport } from '@sentry/types';
+import { Event, EventHint, Mechanism, Options, Severity, Transport, TransportOptions } from '@sentry/types';
 import {
   addExceptionTypeValue,
   isError,
@@ -55,14 +55,13 @@ export class NodeBackend extends BaseBackend<NodeOptions> {
 
     const dsn = new Dsn(this._options.dsn);
 
-    const transportOptions = this._options.transportOptions || { dsn };
-    const clientOptions = ['httpProxy', 'httpsProxy', 'caCerts'];
-
-    for (const option of clientOptions) {
-      if (this._options[option] || transportOptions[option]) {
-        transportOptions[option] = transportOptions[option] || this._options[option];
-      }
-    }
+    const transportOptions: TransportOptions = {
+      ...this._options.transportOptions,
+      ...(this._options.httpProxy && { httpProxy: this._options.httpProxy }),
+      ...(this._options.httpsProxy && { httpsProxy: this._options.httpsProxy }),
+      ...(this._options.caCerts && { caCerts: this._options.caCerts }),
+      dsn: this._options.dsn,
+    };
 
     if (this._options.transport) {
       return new this._options.transport(transportOptions);
diff --git a/packages/types/src/transport.ts b/packages/types/src/transport.ts
@@ -24,7 +24,6 @@ export type TransportClass<T extends Transport> = new (options: TransportOptions
 
 /** JSDoc */
 export interface TransportOptions {
-  [key: string]: any;
   /** Sentry DSN */
   dsn: DsnLike;
   /** Define custom headers */
