Skip to content

Commit 51c1191

Browse files
authored
fix(tracing): Remove circular dep warning with GLOBAL (#6030)
1 parent 31bf467 commit 51c1191

File tree

10 files changed

+11
-12
lines changed

10 files changed

+11
-12
lines changed

packages/tracing/src/browser/backgroundtab.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { logger } from '@sentry/utils';
33
import { IdleTransaction } from '../idletransaction';
44
import { SpanStatusType } from '../span';
55
import { getActiveTransaction } from '../utils';
6-
import { WINDOW } from '.';
6+
import { WINDOW } from './types';
77

88
/**
99
* Add a listener that cancels and finishes a transaction when the global

packages/tracing/src/browser/browsertracing.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { baggageHeaderToDynamicSamplingContext, getDomElement, logger } from '@s
66
import { startIdleTransaction } from '../hubextensions';
77
import { DEFAULT_FINAL_TIMEOUT, DEFAULT_HEARTBEAT_INTERVAL, DEFAULT_IDLE_TIMEOUT } from '../idletransaction';
88
import { extractTraceparentData } from '../utils';
9-
import { WINDOW } from '.';
109
import { registerBackgroundTabDetection } from './backgroundtab';
1110
import { addPerformanceEntries, startTrackingLongTasks, startTrackingWebVitals } from './metrics';
1211
import {
@@ -15,6 +14,7 @@ import {
1514
RequestInstrumentationOptions,
1615
} from './request';
1716
import { instrumentRoutingWithDefaults } from './router';
17+
import { WINDOW } from './types';
1818

1919
export const BROWSER_TRACING_INTEGRATION_ID = 'BrowserTracing';
2020

packages/tracing/src/browser/index.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
import { GLOBAL_OBJ } from '@sentry/utils';
2-
31
export type { RequestInstrumentationOptions } from './request';
42

53
export { BrowserTracing, BROWSER_TRACING_INTEGRATION_ID } from './browsertracing';
64
export { instrumentOutgoingRequests, defaultRequestInstrumentationOptions } from './request';
7-
8-
export const WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ & Window;

packages/tracing/src/browser/metrics/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
import { Measurements } from '@sentry/types';
33
import { browserPerformanceTimeOrigin, htmlTreeAsString, logger } from '@sentry/utils';
44

5-
import { WINDOW } from '..';
65
import { IdleTransaction } from '../../idletransaction';
76
import { Transaction } from '../../transaction';
87
import { getActiveTransaction, msToSec } from '../../utils';
8+
import { WINDOW } from '../types';
99
import { onCLS } from '../web-vitals/getCLS';
1010
import { onFID } from '../web-vitals/getFID';
1111
import { onLCP } from '../web-vitals/getLCP';

packages/tracing/src/browser/router.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Transaction, TransactionContext } from '@sentry/types';
22
import { addInstrumentationHandler, logger } from '@sentry/utils';
33

4-
import { WINDOW } from '.';
4+
import { WINDOW } from './types';
55

66
/**
77
* Default function implementing pageload and navigation transactions

packages/tracing/src/browser/types.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import { GLOBAL_OBJ } from '@sentry/utils';
2+
3+
export const WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ & Window;

packages/tracing/src/browser/web-vitals/lib/getNavigationEntry.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { WINDOW } from '../..';
17+
import { WINDOW } from '../../types';
1818
import { NavigationTimingPolyfillEntry } from '../types';
1919

2020
const getNavigationEntryFromPerformanceTiming = (): NavigationTimingPolyfillEntry => {

packages/tracing/src/browser/web-vitals/lib/getVisibilityWatcher.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { WINDOW } from '../..';
17+
import { WINDOW } from '../../types';
1818
import { onHidden } from './onHidden';
1919

2020
let firstHiddenTime = -1;

packages/tracing/src/browser/web-vitals/lib/initMetric.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { WINDOW } from '../..';
17+
import { WINDOW } from '../../types';
1818
import { Metric } from '../types';
1919
import { generateUniqueID } from './generateUniqueID';
2020
import { getActivationStart } from './getActivationStart';

packages/tracing/src/browser/web-vitals/lib/onHidden.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { WINDOW } from '../..';
17+
import { WINDOW } from '../../types';
1818

1919
export interface OnHiddenCallback {
2020
(event: Event): void;

0 commit comments

Comments
 (0)