diff --git a/packages/core/src/js/NativeRNSentry.ts b/packages/core/src/js/NativeRNSentry.ts index c82debe900..2d553e548f 100644 --- a/packages/core/src/js/NativeRNSentry.ts +++ b/packages/core/src/js/NativeRNSentry.ts @@ -1,4 +1,4 @@ -import type { Package } from '@sentry/types'; +import type { Package } from '@sentry/core'; import type { TurboModule } from 'react-native'; import { TurboModuleRegistry } from 'react-native'; diff --git a/packages/core/src/js/breadcrumb.ts b/packages/core/src/js/breadcrumb.ts index c8b43b5290..65a87c6050 100644 --- a/packages/core/src/js/breadcrumb.ts +++ b/packages/core/src/js/breadcrumb.ts @@ -1,5 +1,5 @@ +import type { Breadcrumb, SeverityLevel } from '@sentry/core'; import { severityLevelFromString } from '@sentry/core'; -import type { Breadcrumb, SeverityLevel } from '@sentry/types'; export const DEFAULT_BREADCRUMB_LEVEL: SeverityLevel = 'info'; diff --git a/packages/core/src/js/client.ts b/packages/core/src/js/client.ts index cf623765a7..d838167093 100644 --- a/packages/core/src/js/client.ts +++ b/packages/core/src/js/client.ts @@ -1,5 +1,4 @@ import { eventFromException, eventFromMessage } from '@sentry/browser'; -import { BaseClient, dateTimestampInSeconds, logger, SentryError } from '@sentry/core'; import type { ClientReportEnvelope, ClientReportItem, @@ -10,7 +9,8 @@ import type { SeverityLevel, TransportMakeRequestResponse, UserFeedback, -} from '@sentry/types'; +} from '@sentry/core'; +import { BaseClient, dateTimestampInSeconds, logger, SentryError } from '@sentry/core'; import { Alert } from 'react-native'; import { getDevServer } from './integrations/debugsymbolicatorutils'; diff --git a/packages/core/src/js/index.ts b/packages/core/src/js/index.ts index af1c1d9851..e7c5411613 100644 --- a/packages/core/src/js/index.ts +++ b/packages/core/src/js/index.ts @@ -12,7 +12,7 @@ export type { Thread, User, UserFeedback, -} from '@sentry/types'; +} from '@sentry/core'; export { addBreadcrumb, diff --git a/packages/core/src/js/integrations/debugsymbolicator.ts b/packages/core/src/js/integrations/debugsymbolicator.ts index 3aad20b81b..8529d0eeb6 100644 --- a/packages/core/src/js/integrations/debugsymbolicator.ts +++ b/packages/core/src/js/integrations/debugsymbolicator.ts @@ -1,5 +1,5 @@ +import type { Event, EventHint, Exception, Integration, StackFrame as SentryStackFrame } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { Event, EventHint, Exception, Integration, StackFrame as SentryStackFrame } from '@sentry/types'; import type { ExtendedError } from '../utils/error'; import { getFramesToPop, isErrorLike } from '../utils/error'; diff --git a/packages/core/src/js/integrations/debugsymbolicatorutils.ts b/packages/core/src/js/integrations/debugsymbolicatorutils.ts index 41cc4d7d1a..2b51171b39 100644 --- a/packages/core/src/js/integrations/debugsymbolicatorutils.ts +++ b/packages/core/src/js/integrations/debugsymbolicatorutils.ts @@ -1,5 +1,5 @@ +import type { StackFrame as SentryStackFrame } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { StackFrame as SentryStackFrame } from '@sentry/types'; import { ReactNativeLibraries } from '../utils/rnlibraries'; import { createStealthXhr, XHR_READYSTATE_DONE } from '../utils/xhr'; diff --git a/packages/core/src/js/integrations/default.ts b/packages/core/src/js/integrations/default.ts index 0f32ba6b16..8d48c4b2f0 100644 --- a/packages/core/src/js/integrations/default.ts +++ b/packages/core/src/js/integrations/default.ts @@ -1,6 +1,6 @@ /* eslint-disable complexity */ +import type { Integration } from '@sentry/core'; import type { BrowserOptions } from '@sentry/react'; -import type { Integration } from '@sentry/types'; import type { ReactNativeClientOptions } from '../options'; import { reactNativeTracingIntegration } from '../tracing'; diff --git a/packages/core/src/js/integrations/devicecontext.ts b/packages/core/src/js/integrations/devicecontext.ts index df32574ed9..27875972a8 100644 --- a/packages/core/src/js/integrations/devicecontext.ts +++ b/packages/core/src/js/integrations/devicecontext.ts @@ -1,6 +1,6 @@ /* eslint-disable complexity */ +import type { Client, Event, EventHint, Integration } from '@sentry/core'; import { logger, severityLevelFromString } from '@sentry/core'; -import type { Client, Event, EventHint, Integration } from '@sentry/types'; import { AppState } from 'react-native'; import { breadcrumbFromObject } from '../breadcrumb'; diff --git a/packages/core/src/js/integrations/eventorigin.ts b/packages/core/src/js/integrations/eventorigin.ts index b5163c55fe..e93074ce62 100644 --- a/packages/core/src/js/integrations/eventorigin.ts +++ b/packages/core/src/js/integrations/eventorigin.ts @@ -1,4 +1,4 @@ -import type { Event, Integration } from '@sentry/types'; +import type { Event, Integration } from '@sentry/core'; const INTEGRATION_NAME = 'EventOrigin'; diff --git a/packages/core/src/js/integrations/expocontext.ts b/packages/core/src/js/integrations/expocontext.ts index 8a1dc68382..8e1db1a3ab 100644 --- a/packages/core/src/js/integrations/expocontext.ts +++ b/packages/core/src/js/integrations/expocontext.ts @@ -1,4 +1,4 @@ -import type { DeviceContext, Event, Integration, OsContext } from '@sentry/types'; +import type { DeviceContext, Event, Integration, OsContext } from '@sentry/core'; import { getExpoDevice } from '../utils/expomodules'; diff --git a/packages/core/src/js/integrations/factory.ts b/packages/core/src/js/integrations/factory.ts index 6dbea2eaec..21d8064caa 100644 --- a/packages/core/src/js/integrations/factory.ts +++ b/packages/core/src/js/integrations/factory.ts @@ -1,4 +1,4 @@ -import type { Integration } from '@sentry/types'; +import type { Integration } from '@sentry/core'; /** * Creates an integration out of the provided name and setup function. diff --git a/packages/core/src/js/integrations/modulesloader.ts b/packages/core/src/js/integrations/modulesloader.ts index bd65e4f69e..7a31154d33 100644 --- a/packages/core/src/js/integrations/modulesloader.ts +++ b/packages/core/src/js/integrations/modulesloader.ts @@ -1,5 +1,5 @@ +import type { Event, Integration } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { Event, Integration } from '@sentry/types'; import { NATIVE } from '../wrapper'; diff --git a/packages/core/src/js/integrations/nativelinkederrors.ts b/packages/core/src/js/integrations/nativelinkederrors.ts index 020a4d5656..39d8d55879 100644 --- a/packages/core/src/js/integrations/nativelinkederrors.ts +++ b/packages/core/src/js/integrations/nativelinkederrors.ts @@ -1,5 +1,4 @@ import { exceptionFromError } from '@sentry/browser'; -import { isInstanceOf, isPlainObject, isString } from '@sentry/core'; import type { Client, DebugImage, @@ -10,7 +9,8 @@ import type { Integration, StackFrame, StackParser, -} from '@sentry/types'; +} from '@sentry/core'; +import { isInstanceOf, isPlainObject, isString } from '@sentry/core'; import type { NativeStackFrames } from '../NativeRNSentry'; import { NATIVE } from '../wrapper'; diff --git a/packages/core/src/js/integrations/reactnativeerrorhandlers.ts b/packages/core/src/js/integrations/reactnativeerrorhandlers.ts index eef7e7812b..78b68f23e7 100644 --- a/packages/core/src/js/integrations/reactnativeerrorhandlers.ts +++ b/packages/core/src/js/integrations/reactnativeerrorhandlers.ts @@ -1,5 +1,5 @@ +import type { EventHint, Integration, SeverityLevel } from '@sentry/core'; import { addExceptionMechanism, captureException, getClient, getCurrentScope, logger } from '@sentry/core'; -import type { EventHint, Integration, SeverityLevel } from '@sentry/types'; import { createSyntheticError, isErrorLike } from '../utils/error'; import { RN_GLOBAL_OBJ } from '../utils/worldwide'; diff --git a/packages/core/src/js/integrations/reactnativeinfo.ts b/packages/core/src/js/integrations/reactnativeinfo.ts index a84285fa9a..b24e20f917 100644 --- a/packages/core/src/js/integrations/reactnativeinfo.ts +++ b/packages/core/src/js/integrations/reactnativeinfo.ts @@ -1,4 +1,4 @@ -import type { Context, Event, EventHint, Integration } from '@sentry/types'; +import type { Context, Event, EventHint, Integration } from '@sentry/core'; import { getExpoGoVersion, diff --git a/packages/core/src/js/integrations/release.ts b/packages/core/src/js/integrations/release.ts index 66632acbbc..f414f8a9ac 100644 --- a/packages/core/src/js/integrations/release.ts +++ b/packages/core/src/js/integrations/release.ts @@ -1,4 +1,4 @@ -import type { BaseTransportOptions, Client, ClientOptions, Event, EventHint, Integration } from '@sentry/types'; +import type { BaseTransportOptions, Client, ClientOptions, Event, EventHint, Integration } from '@sentry/core'; import { NATIVE } from '../wrapper'; diff --git a/packages/core/src/js/integrations/rewriteframes.ts b/packages/core/src/js/integrations/rewriteframes.ts index 4b4bbba9be..09ee8b6398 100644 --- a/packages/core/src/js/integrations/rewriteframes.ts +++ b/packages/core/src/js/integrations/rewriteframes.ts @@ -1,5 +1,5 @@ +import type { Integration, StackFrame } from '@sentry/core'; import { rewriteFramesIntegration } from '@sentry/core'; -import type { Integration, StackFrame } from '@sentry/types'; import { Platform } from 'react-native'; import { isExpo, isHermesEnabled } from '../utils/environment'; diff --git a/packages/core/src/js/integrations/screenshot.ts b/packages/core/src/js/integrations/screenshot.ts index 3c24948b76..6f504fa76e 100644 --- a/packages/core/src/js/integrations/screenshot.ts +++ b/packages/core/src/js/integrations/screenshot.ts @@ -1,4 +1,4 @@ -import type { Event, EventHint, Integration } from '@sentry/types'; +import type { Event, EventHint, Integration } from '@sentry/core'; import type { ReactNativeClient } from '../client'; import type { Screenshot as ScreenshotAttachment } from '../wrapper'; diff --git a/packages/core/src/js/integrations/sdkinfo.ts b/packages/core/src/js/integrations/sdkinfo.ts index 27440ce5b6..b90614d5c3 100644 --- a/packages/core/src/js/integrations/sdkinfo.ts +++ b/packages/core/src/js/integrations/sdkinfo.ts @@ -1,5 +1,5 @@ +import type { Event, Integration, Package, SdkInfo as SdkInfoType } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { Event, Integration, Package, SdkInfo as SdkInfoType } from '@sentry/types'; import { isExpoGo, notWeb } from '../utils/environment'; import { SDK_NAME, SDK_PACKAGE_NAME, SDK_VERSION } from '../version'; diff --git a/packages/core/src/js/integrations/spotlight.ts b/packages/core/src/js/integrations/spotlight.ts index 2ce8be3cbc..b4f62e06da 100644 --- a/packages/core/src/js/integrations/spotlight.ts +++ b/packages/core/src/js/integrations/spotlight.ts @@ -1,5 +1,5 @@ +import type { BaseTransportOptions, Client, ClientOptions, Envelope, Integration } from '@sentry/core'; import { logger, serializeEnvelope } from '@sentry/core'; -import type { BaseTransportOptions, Client, ClientOptions, Envelope, Integration } from '@sentry/types'; import { ReactNativeLibraries } from '../utils/rnlibraries'; import { createStealthXhr, XHR_READYSTATE_DONE } from '../utils/xhr'; diff --git a/packages/core/src/js/integrations/viewhierarchy.ts b/packages/core/src/js/integrations/viewhierarchy.ts index e4589db2a1..9b84ece273 100644 --- a/packages/core/src/js/integrations/viewhierarchy.ts +++ b/packages/core/src/js/integrations/viewhierarchy.ts @@ -1,5 +1,5 @@ +import type { Attachment, Event, EventHint, Integration } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { Attachment, Event, EventHint, Integration } from '@sentry/types'; import { NATIVE } from '../wrapper'; diff --git a/packages/core/src/js/misc.ts b/packages/core/src/js/misc.ts index 17dca82f17..17ae67ac50 100644 --- a/packages/core/src/js/misc.ts +++ b/packages/core/src/js/misc.ts @@ -1,4 +1,4 @@ -import type { EnvelopeItem, Exception } from '@sentry/types'; +import type { EnvelopeItem, Exception } from '@sentry/core'; type EnvelopeItemPayload = EnvelopeItem[1]; diff --git a/packages/core/src/js/options.ts b/packages/core/src/js/options.ts index 4d7f46a92f..b984af7a04 100644 --- a/packages/core/src/js/options.ts +++ b/packages/core/src/js/options.ts @@ -1,6 +1,6 @@ import type { makeFetchTransport } from '@sentry/browser'; +import type { CaptureContext, ClientOptions, Event, EventHint, Options } from '@sentry/core'; import type { Profiler } from '@sentry/react'; -import type { CaptureContext, ClientOptions, Event, EventHint, Options } from '@sentry/types'; import type * as React from 'react'; import { Platform } from 'react-native'; diff --git a/packages/core/src/js/profiling/convertHermesProfile.ts b/packages/core/src/js/profiling/convertHermesProfile.ts index 876f6a13f5..39ed9ac752 100644 --- a/packages/core/src/js/profiling/convertHermesProfile.ts +++ b/packages/core/src/js/profiling/convertHermesProfile.ts @@ -1,5 +1,5 @@ +import type { FrameId, StackId, ThreadCpuFrame, ThreadCpuSample, ThreadCpuStack, ThreadId } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { FrameId, StackId, ThreadCpuFrame, ThreadCpuSample, ThreadCpuStack, ThreadId } from '@sentry/types'; import { MAX_PROFILE_DURATION_MS } from './constants'; import type * as Hermes from './hermes'; diff --git a/packages/core/src/js/profiling/debugid.ts b/packages/core/src/js/profiling/debugid.ts index 45375506a4..f5843eb2bc 100644 --- a/packages/core/src/js/profiling/debugid.ts +++ b/packages/core/src/js/profiling/debugid.ts @@ -1,5 +1,5 @@ +import type { DebugImage } from '@sentry/core'; import { GLOBAL_OBJ, logger } from '@sentry/core'; -import type { DebugImage } from '@sentry/types'; import { DEFAULT_BUNDLE_NAME } from './hermes'; diff --git a/packages/core/src/js/profiling/integration.ts b/packages/core/src/js/profiling/integration.ts index b9735aa340..e2e4134fe6 100644 --- a/packages/core/src/js/profiling/integration.ts +++ b/packages/core/src/js/profiling/integration.ts @@ -1,6 +1,6 @@ /* eslint-disable complexity */ +import type { Envelope, Event, Integration, Span, ThreadCpuProfile } from '@sentry/core'; import { getActiveSpan, getClient, logger, spanIsSampled, uuid4 } from '@sentry/core'; -import type { Envelope, Event, Integration, Span, ThreadCpuProfile } from '@sentry/types'; import { Platform } from 'react-native'; import type { ReactNativeClient } from '../client'; diff --git a/packages/core/src/js/profiling/types.ts b/packages/core/src/js/profiling/types.ts index b869339b7c..871c975403 100644 --- a/packages/core/src/js/profiling/types.ts +++ b/packages/core/src/js/profiling/types.ts @@ -1,4 +1,4 @@ -import type { DebugImage, MeasurementUnit, Profile, ThreadCpuFrame, ThreadCpuProfile } from '@sentry/types'; +import type { DebugImage, MeasurementUnit, Profile, ThreadCpuFrame, ThreadCpuProfile } from '@sentry/core'; import type { NativeProfileEvent } from './nativeTypes'; diff --git a/packages/core/src/js/profiling/utils.ts b/packages/core/src/js/profiling/utils.ts index 2473b8cdb9..c83342b50b 100644 --- a/packages/core/src/js/profiling/utils.ts +++ b/packages/core/src/js/profiling/utils.ts @@ -1,6 +1,6 @@ /* eslint-disable complexity */ +import type { Envelope, Event, ThreadCpuProfile } from '@sentry/core'; import { forEachEnvelopeItem, logger } from '@sentry/core'; -import type { Envelope, Event, ThreadCpuProfile } from '@sentry/types'; import { getDefaultEnvironment } from '../utils/environment'; import { getDebugMetadata } from './debugid'; diff --git a/packages/core/src/js/replay/mobilereplay.ts b/packages/core/src/js/replay/mobilereplay.ts index f11a0f96ad..de27fcb247 100644 --- a/packages/core/src/js/replay/mobilereplay.ts +++ b/packages/core/src/js/replay/mobilereplay.ts @@ -1,5 +1,5 @@ +import type { Client, DynamicSamplingContext, Event, Integration } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { Client, DynamicSamplingContext, Event, Integration } from '@sentry/types'; import { isHardCrash } from '../misc'; import { hasHooks } from '../utils/clientutils'; diff --git a/packages/core/src/js/replay/xhrUtils.ts b/packages/core/src/js/replay/xhrUtils.ts index 2a6c1b90f6..8118296ee5 100644 --- a/packages/core/src/js/replay/xhrUtils.ts +++ b/packages/core/src/js/replay/xhrUtils.ts @@ -1,5 +1,5 @@ +import type { Breadcrumb, BreadcrumbHint, SentryWrappedXMLHttpRequest, XhrBreadcrumbHint } from '@sentry/core'; import { dropUndefinedKeys } from '@sentry/core'; -import type { Breadcrumb, BreadcrumbHint, SentryWrappedXMLHttpRequest, XhrBreadcrumbHint } from '@sentry/types'; import type { RequestBody } from './networkUtils'; import { getBodySize, parseContentLengthHeader } from './networkUtils'; diff --git a/packages/core/src/js/scopeSync.ts b/packages/core/src/js/scopeSync.ts index 770d7c9d43..bc9f20c597 100644 --- a/packages/core/src/js/scopeSync.ts +++ b/packages/core/src/js/scopeSync.ts @@ -1,4 +1,4 @@ -import type { Breadcrumb, Scope } from '@sentry/types'; +import type { Breadcrumb, Scope } from '@sentry/core'; import { DEFAULT_BREADCRUMB_LEVEL } from './breadcrumb'; import { fillTyped } from './utils/fill'; diff --git a/packages/core/src/js/sdk.tsx b/packages/core/src/js/sdk.tsx index ee19e6dbc0..0d37fb215f 100644 --- a/packages/core/src/js/sdk.tsx +++ b/packages/core/src/js/sdk.tsx @@ -1,10 +1,10 @@ /* eslint-disable complexity */ +import type { Breadcrumb, BreadcrumbHint, Integration, Scope, SendFeedbackParams, UserFeedback } from '@sentry/core'; import { captureFeedback, getClient, getGlobalScope, getIntegrationsToSetup, getIsolationScope, initAndBind, logger, stackParserFromStackParserOptions, withScope as coreWithScope } from '@sentry/core'; import { defaultStackParser, makeFetchTransport, } from '@sentry/react'; -import type { Breadcrumb, BreadcrumbHint, Integration, Scope, SendFeedbackParams, UserFeedback } from '@sentry/types'; import * as React from 'react'; import { ReactNativeClient } from './client'; diff --git a/packages/core/src/js/tools/metroMiddleware.ts b/packages/core/src/js/tools/metroMiddleware.ts index fe72cd0006..aba23971a6 100644 --- a/packages/core/src/js/tools/metroMiddleware.ts +++ b/packages/core/src/js/tools/metroMiddleware.ts @@ -1,5 +1,5 @@ +import type { StackFrame } from '@sentry/core'; import { addContextToFrame, logger } from '@sentry/core'; -import type { StackFrame } from '@sentry/types'; import { readFile } from 'fs'; import type { IncomingMessage, ServerResponse } from 'http'; import type { InputConfigT, Middleware } from 'metro-config'; diff --git a/packages/core/src/js/touchevents.tsx b/packages/core/src/js/touchevents.tsx index 9795446021..293391a834 100644 --- a/packages/core/src/js/touchevents.tsx +++ b/packages/core/src/js/touchevents.tsx @@ -1,5 +1,5 @@ +import type { SeverityLevel } from '@sentry/core'; import { addBreadcrumb, dropUndefinedKeys, getClient, logger, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core'; -import type { SeverityLevel } from '@sentry/types'; import * as React from 'react'; import type { GestureResponderEvent } from 'react-native'; import { StyleSheet, View } from 'react-native'; diff --git a/packages/core/src/js/tracing/gesturetracing.ts b/packages/core/src/js/tracing/gesturetracing.ts index cd126e9ea8..4dd012fe7b 100644 --- a/packages/core/src/js/tracing/gesturetracing.ts +++ b/packages/core/src/js/tracing/gesturetracing.ts @@ -1,5 +1,5 @@ +import type { Breadcrumb } from '@sentry/core'; import { addBreadcrumb, logger, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core'; -import type { Breadcrumb } from '@sentry/types'; import { startUserInteractionSpan } from './integrations/userInteraction'; import { UI_ACTION } from './ops'; diff --git a/packages/core/src/js/tracing/integrations/appStart.ts b/packages/core/src/js/tracing/integrations/appStart.ts index f2db5184c4..0f96557d4c 100644 --- a/packages/core/src/js/tracing/integrations/appStart.ts +++ b/packages/core/src/js/tracing/integrations/appStart.ts @@ -1,4 +1,5 @@ /* eslint-disable complexity */ +import type { Client, Event, Integration, SpanJSON, TransactionEvent } from '@sentry/core'; import { getCapturedScopesOnSpan, getClient, @@ -9,7 +10,6 @@ import { startInactiveSpan, timestampInSeconds, } from '@sentry/core'; -import type { Client, Event, Integration, SpanJSON, TransactionEvent } from '@sentry/types'; import { APP_START_COLD as APP_START_COLD_MEASUREMENT, diff --git a/packages/core/src/js/tracing/integrations/nativeFrames.ts b/packages/core/src/js/tracing/integrations/nativeFrames.ts index d98eac51ca..ceec914b88 100644 --- a/packages/core/src/js/tracing/integrations/nativeFrames.ts +++ b/packages/core/src/js/tracing/integrations/nativeFrames.ts @@ -1,5 +1,5 @@ +import type { Client, Event, Integration, Measurements, MeasurementUnit, Span } from '@sentry/core'; import { logger, timestampInSeconds } from '@sentry/core'; -import type { Client, Event, Integration, Measurements, MeasurementUnit, Span } from '@sentry/types'; import type { NativeFramesResponse } from '../../NativeRNSentry'; import { AsyncExpiringMap } from '../../utils/AsyncExpiringMap'; diff --git a/packages/core/src/js/tracing/integrations/stalltracking.ts b/packages/core/src/js/tracing/integrations/stalltracking.ts index a8cee2ecd3..e2b05c8d9d 100644 --- a/packages/core/src/js/tracing/integrations/stalltracking.ts +++ b/packages/core/src/js/tracing/integrations/stalltracking.ts @@ -1,6 +1,6 @@ /* eslint-disable max-lines */ +import type { Client, Integration, Measurements, MeasurementUnit, Span } from '@sentry/core'; import { getRootSpan, logger, spanToJSON, timestampInSeconds } from '@sentry/core'; -import type { Client, Integration, Measurements, MeasurementUnit, Span } from '@sentry/types'; import type { AppStateStatus } from 'react-native'; import { AppState } from 'react-native'; diff --git a/packages/core/src/js/tracing/integrations/userInteraction.ts b/packages/core/src/js/tracing/integrations/userInteraction.ts index 1405aeb5e0..378181016c 100644 --- a/packages/core/src/js/tracing/integrations/userInteraction.ts +++ b/packages/core/src/js/tracing/integrations/userInteraction.ts @@ -1,3 +1,4 @@ +import type { Integration, Span, StartSpanOptions } from '@sentry/core'; import { getActiveSpan, getClient, @@ -6,7 +7,6 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, spanToJSON, } from '@sentry/core'; -import type { Integration, Span, StartSpanOptions } from '@sentry/types'; import type { ReactNativeClientOptions } from '../../options'; import { onlySampleIfChildSpans } from '../onSpanEndUtils'; diff --git a/packages/core/src/js/tracing/onSpanEndUtils.ts b/packages/core/src/js/tracing/onSpanEndUtils.ts index 5c64bff196..40365b33fd 100644 --- a/packages/core/src/js/tracing/onSpanEndUtils.ts +++ b/packages/core/src/js/tracing/onSpanEndUtils.ts @@ -1,5 +1,5 @@ +import type { Client, Span } from '@sentry/core'; import { getSpanDescendants, logger, SPAN_STATUS_ERROR, spanToJSON } from '@sentry/core'; -import type { Client, Span } from '@sentry/types'; import type { AppStateStatus } from 'react-native'; import { AppState } from 'react-native'; diff --git a/packages/core/src/js/tracing/reactnativenavigation.ts b/packages/core/src/js/tracing/reactnativenavigation.ts index 45f5173539..0b0f696c68 100644 --- a/packages/core/src/js/tracing/reactnativenavigation.ts +++ b/packages/core/src/js/tracing/reactnativenavigation.ts @@ -1,3 +1,4 @@ +import type { Client, Integration, Span } from '@sentry/core'; import { addBreadcrumb, getClient, @@ -6,7 +7,6 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, spanToJSON, } from '@sentry/core'; -import type { Client, Integration, Span } from '@sentry/types'; import type { EmitterSubscription } from '../utils/rnlibrariesinterface'; import { isSentrySpan } from '../utils/span'; diff --git a/packages/core/src/js/tracing/reactnativetracing.ts b/packages/core/src/js/tracing/reactnativetracing.ts index a90abe1caf..d9ada0ff9d 100644 --- a/packages/core/src/js/tracing/reactnativetracing.ts +++ b/packages/core/src/js/tracing/reactnativetracing.ts @@ -1,7 +1,7 @@ /* eslint-disable max-lines */ import { instrumentOutgoingRequests } from '@sentry/browser'; +import type { Client, Event, Integration, StartSpanOptions } from '@sentry/core'; import { getClient } from '@sentry/core'; -import type { Client, Event, Integration, StartSpanOptions } from '@sentry/types'; import { isWeb } from '../utils/environment'; import { getDevServer } from './../integrations/debugsymbolicatorutils'; diff --git a/packages/core/src/js/tracing/reactnavigation.ts b/packages/core/src/js/tracing/reactnavigation.ts index 8ab7547918..6fb08890ed 100644 --- a/packages/core/src/js/tracing/reactnavigation.ts +++ b/packages/core/src/js/tracing/reactnavigation.ts @@ -1,4 +1,5 @@ /* eslint-disable max-lines */ +import type { Client, Integration, Span } from '@sentry/core'; import { addBreadcrumb, getActiveSpan, @@ -12,7 +13,6 @@ import { startInactiveSpan, timestampInSeconds, } from '@sentry/core'; -import type { Client, Integration, Span } from '@sentry/types'; import type { NewFrameEvent } from '../utils/sentryeventemitter'; import type { SentryEventEmitterFallback } from '../utils/sentryeventemitterfallback'; diff --git a/packages/core/src/js/tracing/span.ts b/packages/core/src/js/tracing/span.ts index 733395a58b..b44425691c 100644 --- a/packages/core/src/js/tracing/span.ts +++ b/packages/core/src/js/tracing/span.ts @@ -1,3 +1,4 @@ +import type { Client, Scope, Span, StartSpanOptions } from '@sentry/core'; import { generatePropagationContext, getActiveSpan, @@ -11,7 +12,6 @@ import { spanToJSON, startIdleSpan as coreStartIdleSpan, } from '@sentry/core'; -import type { Client, Scope, Span, StartSpanOptions } from '@sentry/types'; import { isRootSpan } from '../utils/span'; import { adjustTransactionDuration, cancelInBackground } from './onSpanEndUtils'; diff --git a/packages/core/src/js/tracing/timetodisplay.tsx b/packages/core/src/js/tracing/timetodisplay.tsx index c726409678..12d1198bc4 100644 --- a/packages/core/src/js/tracing/timetodisplay.tsx +++ b/packages/core/src/js/tracing/timetodisplay.tsx @@ -1,5 +1,5 @@ +import type { Span,StartSpanOptions } from '@sentry/core'; import { fill, getActiveSpan, getSpanDescendants, logger, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SPAN_STATUS_ERROR, SPAN_STATUS_OK, spanToJSON, startInactiveSpan } from '@sentry/core'; -import type { Span,StartSpanOptions } from '@sentry/types'; import * as React from 'react'; import { isTurboModuleEnabled } from '../utils/environment'; diff --git a/packages/core/src/js/tracing/types.ts b/packages/core/src/js/tracing/types.ts index 94b2359939..13cfb97396 100644 --- a/packages/core/src/js/tracing/types.ts +++ b/packages/core/src/js/tracing/types.ts @@ -1,4 +1,4 @@ -import type { Span } from '@sentry/types'; +import type { Span } from '@sentry/core'; export interface ReactNavigationRoute { name: string; diff --git a/packages/core/src/js/tracing/utils.ts b/packages/core/src/js/tracing/utils.ts index 044aee9ab0..27b49306ac 100644 --- a/packages/core/src/js/tracing/utils.ts +++ b/packages/core/src/js/tracing/utils.ts @@ -1,3 +1,4 @@ +import type { MeasurementUnit, Span, SpanJSON, TransactionSource } from '@sentry/core'; import { dropUndefinedKeys, getSpanDescendants, @@ -11,7 +12,6 @@ import { timestampInSeconds, uuid4, } from '@sentry/core'; -import type { MeasurementUnit, Span, SpanJSON, TransactionSource } from '@sentry/types'; import { RN_GLOBAL_OBJ } from '../utils/worldwide'; diff --git a/packages/core/src/js/transports/native.ts b/packages/core/src/js/transports/native.ts index 4f1785ad71..ea0ae88129 100644 --- a/packages/core/src/js/transports/native.ts +++ b/packages/core/src/js/transports/native.ts @@ -1,6 +1,11 @@ -import type { PromiseBuffer } from '@sentry/core'; +import type { + BaseTransportOptions, + Envelope, + PromiseBuffer, + Transport, + TransportMakeRequestResponse, +} from '@sentry/core'; import { makePromiseBuffer } from '@sentry/core'; -import type { BaseTransportOptions, Envelope, Transport, TransportMakeRequestResponse } from '@sentry/types'; import { NATIVE } from '../wrapper'; diff --git a/packages/core/src/js/user.ts b/packages/core/src/js/user.ts index 5380929ec3..0b02be64cd 100644 --- a/packages/core/src/js/user.ts +++ b/packages/core/src/js/user.ts @@ -1,4 +1,4 @@ -import type { User } from '@sentry/types'; +import type { User } from '@sentry/core'; /** Requires all the keys defined on User interface to be present on an object */ export type RequiredKeysUser = { [P in keyof Required]: User[P] | undefined }; diff --git a/packages/core/src/js/utils/clientutils.ts b/packages/core/src/js/utils/clientutils.ts index 95047fa000..d03f3bf5b8 100644 --- a/packages/core/src/js/utils/clientutils.ts +++ b/packages/core/src/js/utils/clientutils.ts @@ -1,4 +1,4 @@ -import type { Client } from '@sentry/types'; +import type { Client } from '@sentry/core'; /** * Checks if the provided Sentry client has hooks implemented. diff --git a/packages/core/src/js/utils/envelope.ts b/packages/core/src/js/utils/envelope.ts index 135e8b67e6..f115ca4bd2 100644 --- a/packages/core/src/js/utils/envelope.ts +++ b/packages/core/src/js/utils/envelope.ts @@ -1,5 +1,5 @@ +import type { DsnComponents, EventEnvelope, SdkMetadata, UserFeedback, UserFeedbackItem } from '@sentry/core'; import { createEnvelope, dsnToString } from '@sentry/core'; -import type { DsnComponents, EventEnvelope, SdkMetadata, UserFeedback, UserFeedbackItem } from '@sentry/types'; export const header = 0; export const items = 1; diff --git a/packages/core/src/js/utils/outcome.ts b/packages/core/src/js/utils/outcome.ts index cd4279d46c..95936c0e75 100644 --- a/packages/core/src/js/utils/outcome.ts +++ b/packages/core/src/js/utils/outcome.ts @@ -1,4 +1,4 @@ -import type { Outcome } from '@sentry/types'; +import type { Outcome } from '@sentry/core'; /** * Merges buffer with new outcomes. diff --git a/packages/core/src/js/utils/span.ts b/packages/core/src/js/utils/span.ts index 900e2414bc..7338e1d492 100644 --- a/packages/core/src/js/utils/span.ts +++ b/packages/core/src/js/utils/span.ts @@ -1,5 +1,5 @@ +import type { Span, TransactionEvent } from '@sentry/core'; import { getRootSpan, SentrySpan } from '@sentry/core'; -import type { Span, TransactionEvent } from '@sentry/types'; /** * diff --git a/packages/core/src/js/wrapper.ts b/packages/core/src/js/wrapper.ts index d7bdba0741..4db45f0855 100644 --- a/packages/core/src/js/wrapper.ts +++ b/packages/core/src/js/wrapper.ts @@ -1,5 +1,4 @@ /* eslint-disable max-lines */ -import { logger, normalize, SentryError } from '@sentry/core'; import type { BaseEnvelopeItemHeaders, Breadcrumb, @@ -9,7 +8,8 @@ import type { Package, SeverityLevel, User, -} from '@sentry/types'; +} from '@sentry/core'; +import { logger, normalize, SentryError } from '@sentry/core'; import { NativeModules, Platform } from 'react-native'; import { isHardCrash } from './misc'; diff --git a/packages/core/test/breadcrumb.test.ts b/packages/core/test/breadcrumb.test.ts index 5df834d49d..e0b7db4c60 100644 --- a/packages/core/test/breadcrumb.test.ts +++ b/packages/core/test/breadcrumb.test.ts @@ -1,4 +1,4 @@ -import type { Breadcrumb } from '@sentry/types'; +import type { Breadcrumb } from '@sentry/core'; import { breadcrumbFromObject } from '../src/js/breadcrumb'; diff --git a/packages/core/test/client.test.ts b/packages/core/test/client.test.ts index ec7e673988..8cb4217356 100644 --- a/packages/core/test/client.test.ts +++ b/packages/core/test/client.test.ts @@ -2,8 +2,8 @@ import * as mockedtimetodisplaynative from './tracing/mockedtimetodisplaynative' jest.mock('../src/js/tracing/timetodisplaynative', () => mockedtimetodisplaynative); import { defaultStackParser } from '@sentry/browser'; +import type { Envelope, Event, Outcome, Transport, TransportMakeRequestResponse } from '@sentry/core'; import { rejectedSyncPromise, SentryError } from '@sentry/core'; -import type { Envelope, Event, Outcome, Transport, TransportMakeRequestResponse } from '@sentry/types'; import * as RN from 'react-native'; import { ReactNativeClient } from '../src/js/client'; diff --git a/packages/core/test/feedback.test.ts b/packages/core/test/feedback.test.ts index f36a697001..6b1831934d 100644 --- a/packages/core/test/feedback.test.ts +++ b/packages/core/test/feedback.test.ts @@ -1,3 +1,4 @@ +import type { Span } from '@sentry/core'; import { addBreadcrumb, captureFeedback, @@ -8,7 +9,6 @@ import { withIsolationScope, withScope, } from '@sentry/core'; -import type { Span } from '@sentry/types'; import { getDefaultTestClientOptions, TestClient } from './mocks/client'; diff --git a/packages/core/test/integrations/debugsymbolicator.test.ts b/packages/core/test/integrations/debugsymbolicator.test.ts index e989bedf33..9ed5728319 100644 --- a/packages/core/test/integrations/debugsymbolicator.test.ts +++ b/packages/core/test/integrations/debugsymbolicator.test.ts @@ -1,6 +1,6 @@ jest.mock('../../src/js/integrations/debugsymbolicatorutils'); -import type { Client, Event, EventHint, StackFrame } from '@sentry/types'; +import type { Client, Event, EventHint, StackFrame } from '@sentry/core'; import { debugSymbolicatorIntegration } from '../../src/js/integrations/debugsymbolicator'; import { diff --git a/packages/core/test/integrations/devicecontext.test.ts b/packages/core/test/integrations/devicecontext.test.ts index d8ad810d8e..014b4939eb 100644 --- a/packages/core/test/integrations/devicecontext.test.ts +++ b/packages/core/test/integrations/devicecontext.test.ts @@ -1,4 +1,4 @@ -import type { Client, Event, EventHint, SeverityLevel } from '@sentry/types'; +import type { Client, Event, EventHint, SeverityLevel } from '@sentry/core'; import { deviceContextIntegration } from '../../src/js/integrations/devicecontext'; import type { NativeDeviceContextsResponse } from '../../src/js/NativeRNSentry'; diff --git a/packages/core/test/integrations/eventorigin.test.ts b/packages/core/test/integrations/eventorigin.test.ts index 017d75129c..dd3e0cbd91 100644 --- a/packages/core/test/integrations/eventorigin.test.ts +++ b/packages/core/test/integrations/eventorigin.test.ts @@ -1,4 +1,4 @@ -import type { Client } from '@sentry/types'; +import type { Client } from '@sentry/core'; import { eventOriginIntegration } from '../../src/js/integrations/eventorigin'; diff --git a/packages/core/test/integrations/expocontext.test.ts b/packages/core/test/integrations/expocontext.test.ts index 7b449269f9..91059a4bc2 100644 --- a/packages/core/test/integrations/expocontext.test.ts +++ b/packages/core/test/integrations/expocontext.test.ts @@ -1,4 +1,4 @@ -import type { Client, Event } from '@sentry/types'; +import type { Client, Event } from '@sentry/core'; import { expoContextIntegration } from '../../src/js/integrations/expocontext'; import { getExpoDevice } from '../../src/js/utils/expomodules'; diff --git a/packages/core/test/integrations/integrationsexecutionorder.test.ts b/packages/core/test/integrations/integrationsexecutionorder.test.ts index 64ceadd575..08b4a4f5a6 100644 --- a/packages/core/test/integrations/integrationsexecutionorder.test.ts +++ b/packages/core/test/integrations/integrationsexecutionorder.test.ts @@ -3,7 +3,7 @@ jest.mock('../../src/js/wrapper', () => mockWrapper); jest.mock('../../src/js/utils/environment'); import { defaultStackParser } from '@sentry/browser'; -import type { Integration } from '@sentry/types'; +import type { Integration } from '@sentry/core'; import { ReactNativeClient } from '../../src/js/client'; import { getDefaultIntegrations } from '../../src/js/integrations/default'; diff --git a/packages/core/test/integrations/modulesloader.test.ts b/packages/core/test/integrations/modulesloader.test.ts index 73f2b08451..c6fb43bb2f 100644 --- a/packages/core/test/integrations/modulesloader.test.ts +++ b/packages/core/test/integrations/modulesloader.test.ts @@ -1,4 +1,4 @@ -import type { Client, Event, EventHint } from '@sentry/types'; +import type { Client, Event, EventHint } from '@sentry/core'; import { modulesLoaderIntegration } from '../../src/js/integrations/modulesloader'; import { NATIVE } from '../../src/js/wrapper'; diff --git a/packages/core/test/integrations/nativelinkederrors.test.ts b/packages/core/test/integrations/nativelinkederrors.test.ts index 6dbc73fe5b..9dd1a2da1b 100644 --- a/packages/core/test/integrations/nativelinkederrors.test.ts +++ b/packages/core/test/integrations/nativelinkederrors.test.ts @@ -1,5 +1,5 @@ import { defaultStackParser } from '@sentry/browser'; -import type { Client, DebugImage, Event, EventHint, ExtendedError } from '@sentry/types'; +import type { Client, DebugImage, Event, EventHint, ExtendedError } from '@sentry/core'; import { nativeLinkedErrorsIntegration } from '../../src/js/integrations/nativelinkederrors'; import type { NativeStackFrames } from '../../src/js/NativeRNSentry'; diff --git a/packages/core/test/integrations/reactnativeerrorhandlers.test.ts b/packages/core/test/integrations/reactnativeerrorhandlers.test.ts index 69932a9318..2cca84044d 100644 --- a/packages/core/test/integrations/reactnativeerrorhandlers.test.ts +++ b/packages/core/test/integrations/reactnativeerrorhandlers.test.ts @@ -1,7 +1,7 @@ jest.mock('../../src/js/integrations/reactnativeerrorhandlersutils'); +import type { ExtendedError, SeverityLevel } from '@sentry/core'; import { setCurrentClient } from '@sentry/core'; -import type { ExtendedError, SeverityLevel } from '@sentry/types'; import { reactNativeErrorHandlersIntegration } from '../../src/js/integrations/reactnativeerrorhandlers'; import { requireRejectionTracking } from '../../src/js/integrations/reactnativeerrorhandlersutils'; diff --git a/packages/core/test/integrations/reactnativeinfo.test.ts b/packages/core/test/integrations/reactnativeinfo.test.ts index 2b6819e152..f7f9f3bfb9 100644 --- a/packages/core/test/integrations/reactnativeinfo.test.ts +++ b/packages/core/test/integrations/reactnativeinfo.test.ts @@ -1,4 +1,4 @@ -import type { Client, Event, EventHint } from '@sentry/types'; +import type { Client, Event, EventHint } from '@sentry/core'; import type { ReactNativeError } from '../../src/js/integrations/debugsymbolicator'; import type { ReactNativeContext } from '../../src/js/integrations/reactnativeinfo'; diff --git a/packages/core/test/integrations/release.test.ts b/packages/core/test/integrations/release.test.ts index 71ba72888f..be3a4f1b10 100644 --- a/packages/core/test/integrations/release.test.ts +++ b/packages/core/test/integrations/release.test.ts @@ -1,4 +1,4 @@ -import type { Client } from '@sentry/types'; +import type { Client } from '@sentry/core'; import { nativeReleaseIntegration } from '../../src/js/integrations/release'; diff --git a/packages/core/test/integrations/rewriteframes.test.ts b/packages/core/test/integrations/rewriteframes.test.ts index d6bb400e5d..45eb9f094c 100644 --- a/packages/core/test/integrations/rewriteframes.test.ts +++ b/packages/core/test/integrations/rewriteframes.test.ts @@ -1,6 +1,6 @@ import type { Exception } from '@sentry/browser'; import { defaultStackParser, eventFromException } from '@sentry/browser'; -import type { Client, Event, EventHint } from '@sentry/types'; +import type { Client, Event, EventHint } from '@sentry/core'; import { Platform } from 'react-native'; import { createReactNativeRewriteFrames } from '../../src/js/integrations/rewriteframes'; diff --git a/packages/core/test/integrations/sdkinfo.test.ts b/packages/core/test/integrations/sdkinfo.test.ts index 71d19d0ec7..912d7f7d93 100644 --- a/packages/core/test/integrations/sdkinfo.test.ts +++ b/packages/core/test/integrations/sdkinfo.test.ts @@ -1,4 +1,4 @@ -import type { Event, EventHint, Package } from '@sentry/types'; +import type { Event, EventHint, Package } from '@sentry/core'; import { SDK_NAME, SDK_VERSION } from '../../src/js'; import { sdkInfoIntegration } from '../../src/js/integrations/sdkinfo'; diff --git a/packages/core/test/integrations/spotlight.test.ts b/packages/core/test/integrations/spotlight.test.ts index 306580d669..dba566f260 100644 --- a/packages/core/test/integrations/spotlight.test.ts +++ b/packages/core/test/integrations/spotlight.test.ts @@ -1,6 +1,6 @@ import type { HttpRequestEventMap } from '@mswjs/interceptors'; import { XMLHttpRequestInterceptor } from '@mswjs/interceptors/XMLHttpRequest'; -import type { Client, Envelope } from '@sentry/types'; +import type { Client, Envelope } from '@sentry/core'; import { spotlightIntegration } from '../../src/js/integrations/spotlight'; diff --git a/packages/core/test/integrations/viewhierarchy.test.ts b/packages/core/test/integrations/viewhierarchy.test.ts index 68cfc0cc7a..69020ce8ac 100644 --- a/packages/core/test/integrations/viewhierarchy.test.ts +++ b/packages/core/test/integrations/viewhierarchy.test.ts @@ -1,4 +1,4 @@ -import type { Client, Event, EventHint } from '@sentry/types'; +import type { Client, Event, EventHint } from '@sentry/core'; import { viewHierarchyIntegration } from '../../src/js/integrations/viewhierarchy'; import { NATIVE } from '../../src/js/wrapper'; diff --git a/packages/core/test/mocks/client.ts b/packages/core/test/mocks/client.ts index bc90b88c38..8a0df75ebc 100644 --- a/packages/core/test/mocks/client.ts +++ b/packages/core/test/mocks/client.ts @@ -1,3 +1,4 @@ +import type { Event, EventHint, Integration, Outcome, ParameterizedString, Session, SeverityLevel } from '@sentry/core'; import { BaseClient, createTransport, @@ -8,15 +9,6 @@ import { resolvedSyncPromise, setCurrentClient, } from '@sentry/core'; -import type { - Event, - EventHint, - Integration, - Outcome, - ParameterizedString, - Session, - SeverityLevel, -} from '@sentry/types'; import type { ReactNativeClientOptions } from '../../src/js/options'; diff --git a/packages/core/test/profiling/convertHermesProfile.test.ts b/packages/core/test/profiling/convertHermesProfile.test.ts index 6e2ccfdd8e..807d662fcd 100644 --- a/packages/core/test/profiling/convertHermesProfile.test.ts +++ b/packages/core/test/profiling/convertHermesProfile.test.ts @@ -1,4 +1,4 @@ -import type { ThreadCpuSample } from '@sentry/types'; +import type { ThreadCpuSample } from '@sentry/core'; import { convertToSentryProfile, mapSamples } from '../../src/js/profiling/convertHermesProfile'; import type * as Hermes from '../../src/js/profiling/hermes'; diff --git a/packages/core/test/profiling/hermes.test.ts b/packages/core/test/profiling/hermes.test.ts index 0d7852d4f0..21255b95ff 100644 --- a/packages/core/test/profiling/hermes.test.ts +++ b/packages/core/test/profiling/hermes.test.ts @@ -1,4 +1,4 @@ -import type { ThreadCpuFrame } from '@sentry/types'; +import type { ThreadCpuFrame } from '@sentry/core'; import { parseHermesJSStackFrame } from '../../src/js/profiling/convertHermesProfile'; diff --git a/packages/core/test/profiling/integration.test.ts b/packages/core/test/profiling/integration.test.ts index 5fc7d9e519..83da5cc53d 100644 --- a/packages/core/test/profiling/integration.test.ts +++ b/packages/core/test/profiling/integration.test.ts @@ -3,8 +3,8 @@ jest.mock('../../src/js/wrapper', () => mockWrapper); jest.mock('../../src/js/utils/environment'); jest.mock('../../src/js/profiling/debugid'); +import type { Envelope, Event, Integration, Profile, Span, ThreadCpuProfile, Transport } from '@sentry/core'; import { getClient, spanToJSON } from '@sentry/core'; -import type { Envelope, Event, Integration, Profile, Span, ThreadCpuProfile, Transport } from '@sentry/types'; import * as Sentry from '../../src/js'; import { getDebugMetadata } from '../../src/js/profiling/debugid'; diff --git a/packages/core/test/replay/xhrUtils.test.ts b/packages/core/test/replay/xhrUtils.test.ts index 614dae4be6..477e8bc661 100644 --- a/packages/core/test/replay/xhrUtils.test.ts +++ b/packages/core/test/replay/xhrUtils.test.ts @@ -1,4 +1,4 @@ -import type { Breadcrumb } from '@sentry/types'; +import type { Breadcrumb } from '@sentry/core'; import { enrichXhrBreadcrumbsForMobileReplay } from '../../src/js/replay/xhrUtils'; diff --git a/packages/core/test/scopeSync.test.ts b/packages/core/test/scopeSync.test.ts index fc0635aa95..85d14fe27c 100644 --- a/packages/core/test/scopeSync.test.ts +++ b/packages/core/test/scopeSync.test.ts @@ -1,7 +1,7 @@ jest.mock('../src/js/wrapper', () => jest.requireActual('./mockWrapper')); +import type { Breadcrumb } from '@sentry/core'; import * as SentryCore from '@sentry/core'; import { Scope } from '@sentry/core'; -import type { Breadcrumb } from '@sentry/types'; import { enableSyncToNative } from '../src/js/scopeSync'; import { getDefaultTestClientOptions, TestClient } from './mocks/client'; diff --git a/packages/core/test/sdk.test.ts b/packages/core/test/sdk.test.ts index 94cbed0aa4..931d7fd6d3 100644 --- a/packages/core/test/sdk.test.ts +++ b/packages/core/test/sdk.test.ts @@ -1,13 +1,6 @@ +import type { BaseTransportOptions, Breadcrumb, BreadcrumbHint, ClientOptions, Integration, Scope } from '@sentry/core'; import { initAndBind, logger } from '@sentry/core'; import { makeFetchTransport } from '@sentry/react'; -import type { - BaseTransportOptions, - Breadcrumb, - BreadcrumbHint, - ClientOptions, - Integration, - Scope, -} from '@sentry/types'; import { getDevServer } from '../src/js/integrations/debugsymbolicatorutils'; import { init, withScope } from '../src/js/sdk'; diff --git a/packages/core/test/testutils.ts b/packages/core/test/testutils.ts index 2cff0aa26a..76bdd990a6 100644 --- a/packages/core/test/testutils.ts +++ b/packages/core/test/testutils.ts @@ -1,5 +1,5 @@ +import type { Session, Transport, UserFeedback } from '@sentry/core'; import { rejectedSyncPromise } from '@sentry/core'; -import type { Session, Transport, UserFeedback } from '@sentry/types'; export type MockInterface = { [K in keyof T]: T[K] extends (...args: infer A) => infer B ? jest.Mock : T[K]; diff --git a/packages/core/test/tools/metroMiddleware.test.ts b/packages/core/test/tools/metroMiddleware.test.ts index f7631e3168..b1743e27a8 100644 --- a/packages/core/test/tools/metroMiddleware.test.ts +++ b/packages/core/test/tools/metroMiddleware.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it, jest } from '@jest/globals'; -import type { StackFrame } from '@sentry/types'; +import type { StackFrame } from '@sentry/core'; import * as fs from 'fs'; import * as metroMiddleware from '../../src/js/tools/metroMiddleware'; diff --git a/packages/core/test/touchevents.test.tsx b/packages/core/test/touchevents.test.tsx index 4d5dd1f3cd..4266f62d4b 100644 --- a/packages/core/test/touchevents.test.tsx +++ b/packages/core/test/touchevents.test.tsx @@ -1,8 +1,8 @@ /** * @jest-environment jsdom */ +import type { SeverityLevel } from '@sentry/core'; import * as core from '@sentry/core'; -import type { SeverityLevel } from '@sentry/types'; import { TouchEventBoundary } from '../src/js/touchevents'; import { getDefaultTestClientOptions, TestClient } from './mocks/client'; diff --git a/packages/core/test/tracing/gesturetracing.test.ts b/packages/core/test/tracing/gesturetracing.test.ts index cc19777a9a..10c5ccf39d 100644 --- a/packages/core/test/tracing/gesturetracing.test.ts +++ b/packages/core/test/tracing/gesturetracing.test.ts @@ -1,5 +1,5 @@ +import type { Breadcrumb } from '@sentry/core'; import { getActiveSpan, spanToJSON, startSpan } from '@sentry/core'; -import type { Breadcrumb } from '@sentry/types'; import { UI_ACTION } from '../../src/js/tracing'; import { diff --git a/packages/core/test/tracing/idleNavigationSpan.test.ts b/packages/core/test/tracing/idleNavigationSpan.test.ts index 27d45c4918..ec4ddf7640 100644 --- a/packages/core/test/tracing/idleNavigationSpan.test.ts +++ b/packages/core/test/tracing/idleNavigationSpan.test.ts @@ -1,5 +1,5 @@ +import type { Span } from '@sentry/core'; import { getActiveSpan, getCurrentScope, spanToJSON, startSpanManual } from '@sentry/core'; -import type { Span } from '@sentry/types'; import type { AppState, AppStateStatus } from 'react-native'; import type { ScopeWithMaybeSpan } from '../../src/js/tracing/span'; diff --git a/packages/core/test/tracing/integrations/appStart.test.ts b/packages/core/test/tracing/integrations/appStart.test.ts index e11e3616dc..4337e3e2b3 100644 --- a/packages/core/test/tracing/integrations/appStart.test.ts +++ b/packages/core/test/tracing/integrations/appStart.test.ts @@ -1,3 +1,4 @@ +import type { ErrorEvent, Event, SpanJSON, TransactionEvent } from '@sentry/core'; import { getCurrentScope, getGlobalScope, @@ -7,7 +8,6 @@ import { setCurrentClient, timestampInSeconds, } from '@sentry/core'; -import type { ErrorEvent, Event, SpanJSON, TransactionEvent } from '@sentry/types'; import { APP_START_COLD as APP_START_COLD_MEASUREMENT, diff --git a/packages/core/test/tracing/integrations/nativeframes.test.ts b/packages/core/test/tracing/integrations/nativeframes.test.ts index c5453dcc82..839bdd5d1b 100644 --- a/packages/core/test/tracing/integrations/nativeframes.test.ts +++ b/packages/core/test/tracing/integrations/nativeframes.test.ts @@ -1,5 +1,5 @@ +import type { Event, Measurements } from '@sentry/core'; import { getCurrentScope, getGlobalScope, getIsolationScope, setCurrentClient, startSpan } from '@sentry/core'; -import type { Event, Measurements } from '@sentry/types'; import { nativeFramesIntegration } from '../../../src/js'; import { NATIVE } from '../../../src/js/wrapper'; diff --git a/packages/core/test/tracing/integrations/stallTracking/stalltracking.test.ts b/packages/core/test/tracing/integrations/stallTracking/stalltracking.test.ts index 125583fcc7..12fc59f1ab 100644 --- a/packages/core/test/tracing/integrations/stallTracking/stalltracking.test.ts +++ b/packages/core/test/tracing/integrations/stallTracking/stalltracking.test.ts @@ -1,3 +1,4 @@ +import type { Span } from '@sentry/core'; import { getCurrentScope, getGlobalScope, @@ -8,7 +9,6 @@ import { startSpanManual, timestampInSeconds, } from '@sentry/core'; -import type { Span } from '@sentry/types'; import { stallTrackingIntegration } from '../../../../src/js/tracing/integrations/stalltracking'; import { getDefaultTestClientOptions, TestClient } from '../../../mocks/client'; diff --git a/packages/core/test/tracing/integrations/stallTracking/stalltrackingutils.ts b/packages/core/test/tracing/integrations/stallTracking/stalltrackingutils.ts index edcf8956c7..8f338a31fd 100644 --- a/packages/core/test/tracing/integrations/stallTracking/stalltrackingutils.ts +++ b/packages/core/test/tracing/integrations/stallTracking/stalltrackingutils.ts @@ -1,4 +1,4 @@ -import type { Measurements } from '@sentry/types'; +import type { Measurements } from '@sentry/core'; export function expectStallMeasurements(measurements: Measurements | undefined) { expect(measurements).toBeDefined(); diff --git a/packages/core/test/tracing/integrations/userInteraction.test.ts b/packages/core/test/tracing/integrations/userInteraction.test.ts index 72dfaeea03..a026e79c0e 100644 --- a/packages/core/test/tracing/integrations/userInteraction.test.ts +++ b/packages/core/test/tracing/integrations/userInteraction.test.ts @@ -1,3 +1,4 @@ +import type { Span } from '@sentry/core'; import { getActiveSpan, getCurrentScope, @@ -6,7 +7,6 @@ import { startInactiveSpan, startSpanManual, } from '@sentry/core'; -import type { Span } from '@sentry/types'; import type { AppState, AppStateStatus } from 'react-native'; import { diff --git a/packages/core/test/tracing/reactnativenavigation.test.ts b/packages/core/test/tracing/reactnativenavigation.test.ts index c6939c6b5c..09acbaa25f 100644 --- a/packages/core/test/tracing/reactnativenavigation.test.ts +++ b/packages/core/test/tracing/reactnativenavigation.test.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/no-empty-function */ +import type { Event, StartSpanOptions } from '@sentry/core'; import { getActiveSpan, getCurrentScope, @@ -7,7 +8,6 @@ import { setCurrentClient, spanToJSON, } from '@sentry/core'; -import type { Event, StartSpanOptions } from '@sentry/types'; import type { EmitterSubscription } from 'react-native'; import { reactNativeTracingIntegration } from '../../src/js'; diff --git a/packages/core/test/tracing/reactnativetracing.test.ts b/packages/core/test/tracing/reactnativetracing.test.ts index 031a8afaec..861b94ba1a 100644 --- a/packages/core/test/tracing/reactnativetracing.test.ts +++ b/packages/core/test/tracing/reactnativetracing.test.ts @@ -1,5 +1,5 @@ import * as SentryBrowser from '@sentry/browser'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; jest.mock('../../src/js/wrapper', () => { return { diff --git a/packages/core/test/tracing/reactnavigation.test.ts b/packages/core/test/tracing/reactnavigation.test.ts index 1e702c1e7c..5c8b805e9d 100644 --- a/packages/core/test/tracing/reactnavigation.test.ts +++ b/packages/core/test/tracing/reactnavigation.test.ts @@ -1,8 +1,8 @@ /* eslint-disable deprecation/deprecation */ /* eslint-disable @typescript-eslint/no-explicit-any */ import type { SentrySpan } from '@sentry/core'; +import type { Event, Measurements, StartSpanOptions } from '@sentry/core'; import { getActiveSpan, getCurrentScope, getGlobalScope, getIsolationScope, setCurrentClient } from '@sentry/core'; -import type { Event, Measurements, StartSpanOptions } from '@sentry/types'; import { nativeFramesIntegration, reactNativeTracingIntegration } from '../../src/js'; import { SPAN_ORIGIN_AUTO_NAVIGATION_REACT_NAVIGATION } from '../../src/js/tracing/origin'; diff --git a/packages/core/test/tracing/reactnavigation.ttid.test.tsx b/packages/core/test/tracing/reactnavigation.ttid.test.tsx index 73823d8cbb..7c0637b896 100644 --- a/packages/core/test/tracing/reactnavigation.ttid.test.tsx +++ b/packages/core/test/tracing/reactnavigation.ttid.test.tsx @@ -1,5 +1,5 @@ +import type { Scope, Span, SpanJSON, TransactionEvent, Transport } from '@sentry/core'; import { timestampInSeconds } from '@sentry/core'; -import type { Scope, Span, SpanJSON, TransactionEvent, Transport } from '@sentry/types'; import * as TestRenderer from '@testing-library/react-native' import * as React from "react"; diff --git a/packages/core/test/tracing/timetodisplay.test.tsx b/packages/core/test/tracing/timetodisplay.test.tsx index f5f12607c4..bfdbd3baa5 100644 --- a/packages/core/test/tracing/timetodisplay.test.tsx +++ b/packages/core/test/tracing/timetodisplay.test.tsx @@ -9,7 +9,7 @@ jest.mock('../../src/js/utils/environment', () => ({ isTurboModuleEnabled: jest.fn().mockReturnValue(false), })); -import type { Event, Measurements, Span, SpanJSON} from '@sentry/types'; +import type { Event, Measurements, Span, SpanJSON} from '@sentry/core'; import * as React from "react"; import * as TestRenderer from 'react-test-renderer'; diff --git a/packages/core/test/transports/native.test.ts b/packages/core/test/transports/native.test.ts index 1f466ca8c5..267f2b4d59 100644 --- a/packages/core/test/transports/native.test.ts +++ b/packages/core/test/transports/native.test.ts @@ -1,4 +1,4 @@ -import type { Envelope } from '@sentry/types'; +import type { Envelope } from '@sentry/core'; import { NativeTransport } from '../../src/js/transports/native'; diff --git a/packages/core/test/wrapper.test.ts b/packages/core/test/wrapper.test.ts index 4663c34a73..9a260f1a18 100644 --- a/packages/core/test/wrapper.test.ts +++ b/packages/core/test/wrapper.test.ts @@ -1,5 +1,5 @@ +import type { Event, EventEnvelope, EventItem, SeverityLevel } from '@sentry/core'; import { createEnvelope, logger } from '@sentry/core'; -import type { Event, EventEnvelope, EventItem, SeverityLevel } from '@sentry/types'; import * as RN from 'react-native'; import type { Spec } from '../src/js/NativeRNSentry'; diff --git a/samples/expo/app/_layout.tsx b/samples/expo/app/_layout.tsx index 31a6a42bb0..1dd559efe8 100644 --- a/samples/expo/app/_layout.tsx +++ b/samples/expo/app/_layout.tsx @@ -7,7 +7,7 @@ import { useEffect } from 'react'; import { useColorScheme } from '@/components/useColorScheme'; import { SENTRY_INTERNAL_DSN } from '../utils/dsn'; import * as Sentry from '@sentry/react-native'; -import { ErrorEvent } from '@sentry/types'; +import { ErrorEvent } from '@sentry/core'; import { isExpoGo } from '../utils/isExpoGo'; import { LogBox } from 'react-native'; diff --git a/samples/expo/utils/setScopeProperties.ts b/samples/expo/utils/setScopeProperties.ts index ec68866a56..1fbfca4238 100644 --- a/samples/expo/utils/setScopeProperties.ts +++ b/samples/expo/utils/setScopeProperties.ts @@ -1,5 +1,5 @@ import * as Sentry from '@sentry/react-native'; -import { SeverityLevel } from '@sentry/types'; +import { SeverityLevel } from '@sentry/core'; export const setScopeProperties = () => { const dateString = new Date().toString(); diff --git a/samples/react-native-macos/package.json b/samples/react-native-macos/package.json index f245a7003a..3e7dc38d09 100644 --- a/samples/react-native-macos/package.json +++ b/samples/react-native-macos/package.json @@ -19,7 +19,6 @@ "@sentry/core": "8.44.0", "@sentry/react": "8.44.0", "@sentry/react-native": "6.4.0", - "@sentry/types": "8.44.0", "delay": "^6.0.0", "react": "18.2.0", "react-native": "0.73.9", diff --git a/samples/react-native-macos/src/App.tsx b/samples/react-native-macos/src/App.tsx index d274783d53..bf6a3c4be9 100644 --- a/samples/react-native-macos/src/App.tsx +++ b/samples/react-native-macos/src/App.tsx @@ -31,7 +31,7 @@ import { LogBox, Platform, StyleSheet, View } from 'react-native'; import Ionicons from 'react-native-vector-icons/Ionicons'; import PlaygroundScreen from './Screens/PlaygroundScreen'; import { logWithoutTracing } from './utils'; -import { ErrorEvent } from '@sentry/types'; +import { ErrorEvent } from '@sentry/core'; LogBox.ignoreAllLogs(); const isMobileOs = Platform.OS === 'android' || Platform.OS === 'ios'; diff --git a/samples/react-native-macos/src/Screens/GesturesTracingScreen.tsx b/samples/react-native-macos/src/Screens/GesturesTracingScreen.tsx index 16e217dfdb..fa440c3648 100644 --- a/samples/react-native-macos/src/Screens/GesturesTracingScreen.tsx +++ b/samples/react-native-macos/src/Screens/GesturesTracingScreen.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { StyleSheet, Text, View } from 'react-native'; import { Gesture, GestureDetector } from 'react-native-gesture-handler'; import { sentryTraceGesture, startSpanManual } from '@sentry/react-native'; -import { Span } from '@sentry/types'; +import { Span } from '@sentry/core'; const GesturesTracingScreen = () => { const gesture = Gesture.Pinch().onBegin(() => { diff --git a/samples/react-native-macos/src/Screens/ManualTrackerScreen.tsx b/samples/react-native-macos/src/Screens/ManualTrackerScreen.tsx index 51242ab2e8..090cb52926 100644 --- a/samples/react-native-macos/src/Screens/ManualTrackerScreen.tsx +++ b/samples/react-native-macos/src/Screens/ManualTrackerScreen.tsx @@ -8,7 +8,7 @@ import { } from 'react-native'; import * as Sentry from '@sentry/react-native'; -import { Span } from '@sentry/types'; +import { Span } from '@sentry/core'; /** * An example of how to add a Sentry Transaction to a React component manually. diff --git a/samples/react-native-macos/src/setScopeProperties.ts b/samples/react-native-macos/src/setScopeProperties.ts index ec68866a56..1fbfca4238 100644 --- a/samples/react-native-macos/src/setScopeProperties.ts +++ b/samples/react-native-macos/src/setScopeProperties.ts @@ -1,5 +1,5 @@ import * as Sentry from '@sentry/react-native'; -import { SeverityLevel } from '@sentry/types'; +import { SeverityLevel } from '@sentry/core'; export const setScopeProperties = () => { const dateString = new Date().toString(); diff --git a/samples/react-native/src/App.tsx b/samples/react-native/src/App.tsx index 04348fa5c6..34e0680f57 100644 --- a/samples/react-native/src/App.tsx +++ b/samples/react-native/src/App.tsx @@ -32,7 +32,7 @@ import { LogBox, Platform, StyleSheet, View } from 'react-native'; import Ionicons from 'react-native-vector-icons/Ionicons'; import PlaygroundScreen from './Screens/PlaygroundScreen'; import { logWithoutTracing } from './utils'; -import { ErrorEvent } from '@sentry/types'; +import { ErrorEvent } from '@sentry/core'; import HeavyNavigationScreen from './Screens/HeavyNavigationScreen'; import WebviewScreen from './Screens/WebviewScreen'; import { isTurboModuleEnabled } from '@sentry/react-native/dist/js/utils/environment'; diff --git a/samples/react-native/src/Screens/GesturesTracingScreen.tsx b/samples/react-native/src/Screens/GesturesTracingScreen.tsx index 16e217dfdb..fa440c3648 100644 --- a/samples/react-native/src/Screens/GesturesTracingScreen.tsx +++ b/samples/react-native/src/Screens/GesturesTracingScreen.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { StyleSheet, Text, View } from 'react-native'; import { Gesture, GestureDetector } from 'react-native-gesture-handler'; import { sentryTraceGesture, startSpanManual } from '@sentry/react-native'; -import { Span } from '@sentry/types'; +import { Span } from '@sentry/core'; const GesturesTracingScreen = () => { const gesture = Gesture.Pinch().onBegin(() => { diff --git a/samples/react-native/src/setScopeProperties.ts b/samples/react-native/src/setScopeProperties.ts index ec68866a56..1fbfca4238 100644 --- a/samples/react-native/src/setScopeProperties.ts +++ b/samples/react-native/src/setScopeProperties.ts @@ -1,5 +1,5 @@ import * as Sentry from '@sentry/react-native'; -import { SeverityLevel } from '@sentry/types'; +import { SeverityLevel } from '@sentry/core'; export const setScopeProperties = () => { const dateString = new Date().toString(); diff --git a/yarn.lock b/yarn.lock index 1a61cbb924..c9cd8e5b0d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -24354,7 +24354,6 @@ __metadata: "@sentry/core": 8.44.0 "@sentry/react": 8.44.0 "@sentry/react-native": 6.4.0 - "@sentry/types": 8.44.0 "@types/react": ^18.2.65 "@types/react-native-vector-icons": ^6.4.18 "@types/react-test-renderer": ^18.0.0