Merge 82e7d35 into fd7919f

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';
 

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';
 

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';

packages/core/src/js/index.ts

@@ -12,7 +12,7 @@ export type {
   Thread,
   User,
   UserFeedback,
-} from '@sentry/types';
+} from '@sentry/core';
 
 export {
   addBreadcrumb,

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';

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';

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';

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';

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';
 

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';
 

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.

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';
 

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';

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';

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,

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';
 

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';

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';

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';

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';

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';
 

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];
 

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';
 

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';

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';
 

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';

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';
 

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';

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';

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';

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';

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';

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';

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';

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';

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,

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';

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';
 

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';

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';
 

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';

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';

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';

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';

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';

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;

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';