Skip to content

Commit e26e615

Browse files
committed
fix transport types
1 parent bd62e26 commit e26e615

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

packages/browser/src/sdk.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ import {
66
logger,
77
resolvedSyncPromise,
88
stackParserFromOptions,
9+
supportsFetch,
910
} from '@sentry/utils';
1011

1112
import { BrowserClient, BrowserClientOptions, BrowserOptions } from './client';
1213
import { IS_DEBUG_BUILD } from './flags';
1314
import { ReportDialogOptions, wrap as internalWrap } from './helpers';
1415
import { Breadcrumbs, Dedupe, GlobalHandlers, LinkedErrors, TryCatch, UserAgent } from './integrations';
1516
import { defaultStackParsers } from './stack-parsers';
17+
import { FetchTransport, XHRTransport } from './transports';
1618
import { setupBrowserTransport } from './transports/setup';
1719

1820
export const defaultIntegrations = [
@@ -109,7 +111,8 @@ export function init(options: BrowserOptions = {}): void {
109111
...options,
110112
stackParser: stackParserFromOptions(options),
111113
integrations: getIntegrationsToSetup(options),
112-
transport,
114+
// TODO(v7): get rid of transport being passed down below
115+
transport: options.transport || (supportsFetch() ? FetchTransport : XHRTransport),
113116
};
114117

115118
initAndBind(BrowserClient, clientOptions, transport, newTransport);

packages/core/test/lib/base.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jest.mock('@sentry/utils', () => {
5656
function getDefaultTestOptions(options: Partial<TestOptions> = {}): TestOptions {
5757
return {
5858
integrations: [],
59-
transport: new NoopTransport(),
59+
transport: NoopTransport,
6060
stackParser: () => [],
6161
...options,
6262
};

packages/node/src/sdk.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { NodeClient } from './client';
88
import { IS_DEBUG_BUILD } from './flags';
99
import { Console, ContextLines, Http, LinkedErrors, OnUncaughtException, OnUnhandledRejection } from './integrations';
1010
import { nodeStackParser } from './stack-parser';
11-
import { setupNodeTransport } from './transports';
11+
import { HTTPSTransport, HTTPTransport, setupNodeTransport } from './transports';
1212
import { NodeClientOptions, NodeOptions } from './types';
1313

1414
export const defaultIntegrations = [
@@ -138,7 +138,8 @@ export function init(options: NodeOptions = {}): void {
138138
...options,
139139
stackParser: stackParserFromOptions(options),
140140
integrations: getIntegrationsToSetup(options),
141-
transport,
141+
// TODO(v7): Fix me when we switch to new transports entirely.
142+
transport: options.transport || (transport instanceof HTTPTransport ? HTTPTransport : HTTPSTransport),
142143
};
143144

144145
initAndBind(NodeClient, clientOptions, transport, newTransport);
@@ -198,7 +199,7 @@ export function isAutoSessionTrackingEnabled(client?: NodeClient): boolean {
198199
if (client === undefined) {
199200
return false;
200201
}
201-
const clientOptions: NodeClientOptions = client && client.getOptions();
202+
const clientOptions = client && client.getOptions();
202203
if (clientOptions && clientOptions.autoSessionTracking !== undefined) {
203204
return clientOptions.autoSessionTracking;
204205
}

0 commit comments

Comments
 (0)