From 18ef7f20c3d3ab326a5566d263fec79d6eed4d6c Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Wed, 27 Nov 2024 13:27:58 +0000 Subject: [PATCH 1/7] mv --- packages/core/package.json | 3 --- packages/{types/src => core/src/types-hoist}/attachment.ts | 0 packages/{types/src => core/src/types-hoist}/breadcrumb.ts | 0 packages/{types/src => core/src/types-hoist}/browseroptions.ts | 0 packages/{types/src => core/src/types-hoist}/checkin.ts | 0 packages/{types/src => core/src/types-hoist}/client.ts | 0 packages/{types/src => core/src/types-hoist}/clientreport.ts | 0 packages/{types/src => core/src/types-hoist}/context.ts | 0 packages/{types/src => core/src/types-hoist}/datacategory.ts | 0 packages/{types/src => core/src/types-hoist}/debugMeta.ts | 0 packages/{types/src => core/src/types-hoist}/dsn.ts | 0 packages/{types/src => core/src/types-hoist}/envelope.ts | 0 packages/{types/src => core/src/types-hoist}/error.ts | 0 packages/{types/src => core/src/types-hoist}/event.ts | 0 packages/{types/src => core/src/types-hoist}/eventprocessor.ts | 0 packages/{types/src => core/src/types-hoist}/exception.ts | 0 packages/{types/src => core/src/types-hoist}/extra.ts | 0 .../{types/src => core/src/types-hoist}/feedback/config.ts | 0 packages/{types/src => core/src/types-hoist}/feedback/form.ts | 0 packages/{types/src => core/src/types-hoist}/feedback/index.ts | 0 .../src => core/src/types-hoist}/feedback/sendFeedback.ts | 0 packages/{types/src => core/src/types-hoist}/feedback/theme.ts | 0 packages/{types/src => core/src/types-hoist}/hub.ts | 0 packages/{types/src => core/src/types-hoist}/index.ts | 0 packages/{types/src => core/src/types-hoist}/instrument.ts | 0 packages/{types/src => core/src/types-hoist}/integration.ts | 0 packages/{types/src => core/src/types-hoist}/measurement.ts | 0 packages/{types/src => core/src/types-hoist}/mechanism.ts | 0 packages/{types/src => core/src/types-hoist}/metrics.ts | 0 packages/{types/src => core/src/types-hoist}/misc.ts | 0 packages/{types/src => core/src/types-hoist}/opentelemetry.ts | 0 packages/{types/src => core/src/types-hoist}/options.ts | 0 packages/{types/src => core/src/types-hoist}/package.ts | 0 packages/{types/src => core/src/types-hoist}/parameterize.ts | 0 packages/{types/src => core/src/types-hoist}/polymorphics.ts | 0 packages/{types/src => core/src/types-hoist}/profiling.ts | 0 packages/{types/src => core/src/types-hoist}/replay.ts | 0 packages/{types/src => core/src/types-hoist}/request.ts | 0 packages/{types/src => core/src/types-hoist}/runtime.ts | 0 .../{types/src => core/src/types-hoist}/samplingcontext.ts | 0 packages/{types/src => core/src/types-hoist}/scope.ts | 0 packages/{types/src => core/src/types-hoist}/sdkinfo.ts | 0 packages/{types/src => core/src/types-hoist}/sdkmetadata.ts | 0 packages/{types/src => core/src/types-hoist}/session.ts | 0 packages/{types/src => core/src/types-hoist}/severity.ts | 0 packages/{types/src => core/src/types-hoist}/span.ts | 0 packages/{types/src => core/src/types-hoist}/spanStatus.ts | 0 packages/{types/src => core/src/types-hoist}/stackframe.ts | 0 packages/{types/src => core/src/types-hoist}/stacktrace.ts | 0 .../{types/src => core/src/types-hoist}/startSpanOptions.ts | 0 packages/{types/src => core/src/types-hoist}/thread.ts | 0 packages/{types/src => core/src/types-hoist}/timedEvent.ts | 0 packages/{types/src => core/src/types-hoist}/tracing.ts | 0 packages/{types/src => core/src/types-hoist}/transaction.ts | 0 packages/{types/src => core/src/types-hoist}/transport.ts | 0 packages/{types/src => core/src/types-hoist}/user.ts | 0 packages/{types/src => core/src/types-hoist}/view-hierarchy.ts | 0 packages/{types/src => core/src/types-hoist}/webfetchapi.ts | 0 .../{types/src => core/src/types-hoist}/wrappedfunction.ts | 0 packages/types/package.json | 3 +++ 60 files changed, 3 insertions(+), 3 deletions(-) rename packages/{types/src => core/src/types-hoist}/attachment.ts (100%) rename packages/{types/src => core/src/types-hoist}/breadcrumb.ts (100%) rename packages/{types/src => core/src/types-hoist}/browseroptions.ts (100%) rename packages/{types/src => core/src/types-hoist}/checkin.ts (100%) rename packages/{types/src => core/src/types-hoist}/client.ts (100%) rename packages/{types/src => core/src/types-hoist}/clientreport.ts (100%) rename packages/{types/src => core/src/types-hoist}/context.ts (100%) rename packages/{types/src => core/src/types-hoist}/datacategory.ts (100%) rename packages/{types/src => core/src/types-hoist}/debugMeta.ts (100%) rename packages/{types/src => core/src/types-hoist}/dsn.ts (100%) rename packages/{types/src => core/src/types-hoist}/envelope.ts (100%) rename packages/{types/src => core/src/types-hoist}/error.ts (100%) rename packages/{types/src => core/src/types-hoist}/event.ts (100%) rename packages/{types/src => core/src/types-hoist}/eventprocessor.ts (100%) rename packages/{types/src => core/src/types-hoist}/exception.ts (100%) rename packages/{types/src => core/src/types-hoist}/extra.ts (100%) rename packages/{types/src => core/src/types-hoist}/feedback/config.ts (100%) rename packages/{types/src => core/src/types-hoist}/feedback/form.ts (100%) rename packages/{types/src => core/src/types-hoist}/feedback/index.ts (100%) rename packages/{types/src => core/src/types-hoist}/feedback/sendFeedback.ts (100%) rename packages/{types/src => core/src/types-hoist}/feedback/theme.ts (100%) rename packages/{types/src => core/src/types-hoist}/hub.ts (100%) rename packages/{types/src => core/src/types-hoist}/index.ts (100%) rename packages/{types/src => core/src/types-hoist}/instrument.ts (100%) rename packages/{types/src => core/src/types-hoist}/integration.ts (100%) rename packages/{types/src => core/src/types-hoist}/measurement.ts (100%) rename packages/{types/src => core/src/types-hoist}/mechanism.ts (100%) rename packages/{types/src => core/src/types-hoist}/metrics.ts (100%) rename packages/{types/src => core/src/types-hoist}/misc.ts (100%) rename packages/{types/src => core/src/types-hoist}/opentelemetry.ts (100%) rename packages/{types/src => core/src/types-hoist}/options.ts (100%) rename packages/{types/src => core/src/types-hoist}/package.ts (100%) rename packages/{types/src => core/src/types-hoist}/parameterize.ts (100%) rename packages/{types/src => core/src/types-hoist}/polymorphics.ts (100%) rename packages/{types/src => core/src/types-hoist}/profiling.ts (100%) rename packages/{types/src => core/src/types-hoist}/replay.ts (100%) rename packages/{types/src => core/src/types-hoist}/request.ts (100%) rename packages/{types/src => core/src/types-hoist}/runtime.ts (100%) rename packages/{types/src => core/src/types-hoist}/samplingcontext.ts (100%) rename packages/{types/src => core/src/types-hoist}/scope.ts (100%) rename packages/{types/src => core/src/types-hoist}/sdkinfo.ts (100%) rename packages/{types/src => core/src/types-hoist}/sdkmetadata.ts (100%) rename packages/{types/src => core/src/types-hoist}/session.ts (100%) rename packages/{types/src => core/src/types-hoist}/severity.ts (100%) rename packages/{types/src => core/src/types-hoist}/span.ts (100%) rename packages/{types/src => core/src/types-hoist}/spanStatus.ts (100%) rename packages/{types/src => core/src/types-hoist}/stackframe.ts (100%) rename packages/{types/src => core/src/types-hoist}/stacktrace.ts (100%) rename packages/{types/src => core/src/types-hoist}/startSpanOptions.ts (100%) rename packages/{types/src => core/src/types-hoist}/thread.ts (100%) rename packages/{types/src => core/src/types-hoist}/timedEvent.ts (100%) rename packages/{types/src => core/src/types-hoist}/tracing.ts (100%) rename packages/{types/src => core/src/types-hoist}/transaction.ts (100%) rename packages/{types/src => core/src/types-hoist}/transport.ts (100%) rename packages/{types/src => core/src/types-hoist}/user.ts (100%) rename packages/{types/src => core/src/types-hoist}/view-hierarchy.ts (100%) rename packages/{types/src => core/src/types-hoist}/webfetchapi.ts (100%) rename packages/{types/src => core/src/types-hoist}/wrappedfunction.ts (100%) diff --git a/packages/core/package.json b/packages/core/package.json index 8ba0845d7187..3d7bc02b357a 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -38,9 +38,6 @@ "publishConfig": { "access": "public" }, - "dependencies": { - "@sentry/types": "8.40.0" - }, "TODO(v9):": "Remove these dependencies", "devDependencies": { "@types/array.prototype.flat": "^1.2.1", diff --git a/packages/types/src/attachment.ts b/packages/core/src/types-hoist/attachment.ts similarity index 100% rename from packages/types/src/attachment.ts rename to packages/core/src/types-hoist/attachment.ts diff --git a/packages/types/src/breadcrumb.ts b/packages/core/src/types-hoist/breadcrumb.ts similarity index 100% rename from packages/types/src/breadcrumb.ts rename to packages/core/src/types-hoist/breadcrumb.ts diff --git a/packages/types/src/browseroptions.ts b/packages/core/src/types-hoist/browseroptions.ts similarity index 100% rename from packages/types/src/browseroptions.ts rename to packages/core/src/types-hoist/browseroptions.ts diff --git a/packages/types/src/checkin.ts b/packages/core/src/types-hoist/checkin.ts similarity index 100% rename from packages/types/src/checkin.ts rename to packages/core/src/types-hoist/checkin.ts diff --git a/packages/types/src/client.ts b/packages/core/src/types-hoist/client.ts similarity index 100% rename from packages/types/src/client.ts rename to packages/core/src/types-hoist/client.ts diff --git a/packages/types/src/clientreport.ts b/packages/core/src/types-hoist/clientreport.ts similarity index 100% rename from packages/types/src/clientreport.ts rename to packages/core/src/types-hoist/clientreport.ts diff --git a/packages/types/src/context.ts b/packages/core/src/types-hoist/context.ts similarity index 100% rename from packages/types/src/context.ts rename to packages/core/src/types-hoist/context.ts diff --git a/packages/types/src/datacategory.ts b/packages/core/src/types-hoist/datacategory.ts similarity index 100% rename from packages/types/src/datacategory.ts rename to packages/core/src/types-hoist/datacategory.ts diff --git a/packages/types/src/debugMeta.ts b/packages/core/src/types-hoist/debugMeta.ts similarity index 100% rename from packages/types/src/debugMeta.ts rename to packages/core/src/types-hoist/debugMeta.ts diff --git a/packages/types/src/dsn.ts b/packages/core/src/types-hoist/dsn.ts similarity index 100% rename from packages/types/src/dsn.ts rename to packages/core/src/types-hoist/dsn.ts diff --git a/packages/types/src/envelope.ts b/packages/core/src/types-hoist/envelope.ts similarity index 100% rename from packages/types/src/envelope.ts rename to packages/core/src/types-hoist/envelope.ts diff --git a/packages/types/src/error.ts b/packages/core/src/types-hoist/error.ts similarity index 100% rename from packages/types/src/error.ts rename to packages/core/src/types-hoist/error.ts diff --git a/packages/types/src/event.ts b/packages/core/src/types-hoist/event.ts similarity index 100% rename from packages/types/src/event.ts rename to packages/core/src/types-hoist/event.ts diff --git a/packages/types/src/eventprocessor.ts b/packages/core/src/types-hoist/eventprocessor.ts similarity index 100% rename from packages/types/src/eventprocessor.ts rename to packages/core/src/types-hoist/eventprocessor.ts diff --git a/packages/types/src/exception.ts b/packages/core/src/types-hoist/exception.ts similarity index 100% rename from packages/types/src/exception.ts rename to packages/core/src/types-hoist/exception.ts diff --git a/packages/types/src/extra.ts b/packages/core/src/types-hoist/extra.ts similarity index 100% rename from packages/types/src/extra.ts rename to packages/core/src/types-hoist/extra.ts diff --git a/packages/types/src/feedback/config.ts b/packages/core/src/types-hoist/feedback/config.ts similarity index 100% rename from packages/types/src/feedback/config.ts rename to packages/core/src/types-hoist/feedback/config.ts diff --git a/packages/types/src/feedback/form.ts b/packages/core/src/types-hoist/feedback/form.ts similarity index 100% rename from packages/types/src/feedback/form.ts rename to packages/core/src/types-hoist/feedback/form.ts diff --git a/packages/types/src/feedback/index.ts b/packages/core/src/types-hoist/feedback/index.ts similarity index 100% rename from packages/types/src/feedback/index.ts rename to packages/core/src/types-hoist/feedback/index.ts diff --git a/packages/types/src/feedback/sendFeedback.ts b/packages/core/src/types-hoist/feedback/sendFeedback.ts similarity index 100% rename from packages/types/src/feedback/sendFeedback.ts rename to packages/core/src/types-hoist/feedback/sendFeedback.ts diff --git a/packages/types/src/feedback/theme.ts b/packages/core/src/types-hoist/feedback/theme.ts similarity index 100% rename from packages/types/src/feedback/theme.ts rename to packages/core/src/types-hoist/feedback/theme.ts diff --git a/packages/types/src/hub.ts b/packages/core/src/types-hoist/hub.ts similarity index 100% rename from packages/types/src/hub.ts rename to packages/core/src/types-hoist/hub.ts diff --git a/packages/types/src/index.ts b/packages/core/src/types-hoist/index.ts similarity index 100% rename from packages/types/src/index.ts rename to packages/core/src/types-hoist/index.ts diff --git a/packages/types/src/instrument.ts b/packages/core/src/types-hoist/instrument.ts similarity index 100% rename from packages/types/src/instrument.ts rename to packages/core/src/types-hoist/instrument.ts diff --git a/packages/types/src/integration.ts b/packages/core/src/types-hoist/integration.ts similarity index 100% rename from packages/types/src/integration.ts rename to packages/core/src/types-hoist/integration.ts diff --git a/packages/types/src/measurement.ts b/packages/core/src/types-hoist/measurement.ts similarity index 100% rename from packages/types/src/measurement.ts rename to packages/core/src/types-hoist/measurement.ts diff --git a/packages/types/src/mechanism.ts b/packages/core/src/types-hoist/mechanism.ts similarity index 100% rename from packages/types/src/mechanism.ts rename to packages/core/src/types-hoist/mechanism.ts diff --git a/packages/types/src/metrics.ts b/packages/core/src/types-hoist/metrics.ts similarity index 100% rename from packages/types/src/metrics.ts rename to packages/core/src/types-hoist/metrics.ts diff --git a/packages/types/src/misc.ts b/packages/core/src/types-hoist/misc.ts similarity index 100% rename from packages/types/src/misc.ts rename to packages/core/src/types-hoist/misc.ts diff --git a/packages/types/src/opentelemetry.ts b/packages/core/src/types-hoist/opentelemetry.ts similarity index 100% rename from packages/types/src/opentelemetry.ts rename to packages/core/src/types-hoist/opentelemetry.ts diff --git a/packages/types/src/options.ts b/packages/core/src/types-hoist/options.ts similarity index 100% rename from packages/types/src/options.ts rename to packages/core/src/types-hoist/options.ts diff --git a/packages/types/src/package.ts b/packages/core/src/types-hoist/package.ts similarity index 100% rename from packages/types/src/package.ts rename to packages/core/src/types-hoist/package.ts diff --git a/packages/types/src/parameterize.ts b/packages/core/src/types-hoist/parameterize.ts similarity index 100% rename from packages/types/src/parameterize.ts rename to packages/core/src/types-hoist/parameterize.ts diff --git a/packages/types/src/polymorphics.ts b/packages/core/src/types-hoist/polymorphics.ts similarity index 100% rename from packages/types/src/polymorphics.ts rename to packages/core/src/types-hoist/polymorphics.ts diff --git a/packages/types/src/profiling.ts b/packages/core/src/types-hoist/profiling.ts similarity index 100% rename from packages/types/src/profiling.ts rename to packages/core/src/types-hoist/profiling.ts diff --git a/packages/types/src/replay.ts b/packages/core/src/types-hoist/replay.ts similarity index 100% rename from packages/types/src/replay.ts rename to packages/core/src/types-hoist/replay.ts diff --git a/packages/types/src/request.ts b/packages/core/src/types-hoist/request.ts similarity index 100% rename from packages/types/src/request.ts rename to packages/core/src/types-hoist/request.ts diff --git a/packages/types/src/runtime.ts b/packages/core/src/types-hoist/runtime.ts similarity index 100% rename from packages/types/src/runtime.ts rename to packages/core/src/types-hoist/runtime.ts diff --git a/packages/types/src/samplingcontext.ts b/packages/core/src/types-hoist/samplingcontext.ts similarity index 100% rename from packages/types/src/samplingcontext.ts rename to packages/core/src/types-hoist/samplingcontext.ts diff --git a/packages/types/src/scope.ts b/packages/core/src/types-hoist/scope.ts similarity index 100% rename from packages/types/src/scope.ts rename to packages/core/src/types-hoist/scope.ts diff --git a/packages/types/src/sdkinfo.ts b/packages/core/src/types-hoist/sdkinfo.ts similarity index 100% rename from packages/types/src/sdkinfo.ts rename to packages/core/src/types-hoist/sdkinfo.ts diff --git a/packages/types/src/sdkmetadata.ts b/packages/core/src/types-hoist/sdkmetadata.ts similarity index 100% rename from packages/types/src/sdkmetadata.ts rename to packages/core/src/types-hoist/sdkmetadata.ts diff --git a/packages/types/src/session.ts b/packages/core/src/types-hoist/session.ts similarity index 100% rename from packages/types/src/session.ts rename to packages/core/src/types-hoist/session.ts diff --git a/packages/types/src/severity.ts b/packages/core/src/types-hoist/severity.ts similarity index 100% rename from packages/types/src/severity.ts rename to packages/core/src/types-hoist/severity.ts diff --git a/packages/types/src/span.ts b/packages/core/src/types-hoist/span.ts similarity index 100% rename from packages/types/src/span.ts rename to packages/core/src/types-hoist/span.ts diff --git a/packages/types/src/spanStatus.ts b/packages/core/src/types-hoist/spanStatus.ts similarity index 100% rename from packages/types/src/spanStatus.ts rename to packages/core/src/types-hoist/spanStatus.ts diff --git a/packages/types/src/stackframe.ts b/packages/core/src/types-hoist/stackframe.ts similarity index 100% rename from packages/types/src/stackframe.ts rename to packages/core/src/types-hoist/stackframe.ts diff --git a/packages/types/src/stacktrace.ts b/packages/core/src/types-hoist/stacktrace.ts similarity index 100% rename from packages/types/src/stacktrace.ts rename to packages/core/src/types-hoist/stacktrace.ts diff --git a/packages/types/src/startSpanOptions.ts b/packages/core/src/types-hoist/startSpanOptions.ts similarity index 100% rename from packages/types/src/startSpanOptions.ts rename to packages/core/src/types-hoist/startSpanOptions.ts diff --git a/packages/types/src/thread.ts b/packages/core/src/types-hoist/thread.ts similarity index 100% rename from packages/types/src/thread.ts rename to packages/core/src/types-hoist/thread.ts diff --git a/packages/types/src/timedEvent.ts b/packages/core/src/types-hoist/timedEvent.ts similarity index 100% rename from packages/types/src/timedEvent.ts rename to packages/core/src/types-hoist/timedEvent.ts diff --git a/packages/types/src/tracing.ts b/packages/core/src/types-hoist/tracing.ts similarity index 100% rename from packages/types/src/tracing.ts rename to packages/core/src/types-hoist/tracing.ts diff --git a/packages/types/src/transaction.ts b/packages/core/src/types-hoist/transaction.ts similarity index 100% rename from packages/types/src/transaction.ts rename to packages/core/src/types-hoist/transaction.ts diff --git a/packages/types/src/transport.ts b/packages/core/src/types-hoist/transport.ts similarity index 100% rename from packages/types/src/transport.ts rename to packages/core/src/types-hoist/transport.ts diff --git a/packages/types/src/user.ts b/packages/core/src/types-hoist/user.ts similarity index 100% rename from packages/types/src/user.ts rename to packages/core/src/types-hoist/user.ts diff --git a/packages/types/src/view-hierarchy.ts b/packages/core/src/types-hoist/view-hierarchy.ts similarity index 100% rename from packages/types/src/view-hierarchy.ts rename to packages/core/src/types-hoist/view-hierarchy.ts diff --git a/packages/types/src/webfetchapi.ts b/packages/core/src/types-hoist/webfetchapi.ts similarity index 100% rename from packages/types/src/webfetchapi.ts rename to packages/core/src/types-hoist/webfetchapi.ts diff --git a/packages/types/src/wrappedfunction.ts b/packages/core/src/types-hoist/wrappedfunction.ts similarity index 100% rename from packages/types/src/wrappedfunction.ts rename to packages/core/src/types-hoist/wrappedfunction.ts diff --git a/packages/types/package.json b/packages/types/package.json index 97e0dcfca7f1..a6ad81c0daff 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -55,6 +55,9 @@ "fix": "eslint . --format stylish --fix", "yalc:publish": "yalc publish --push --sig" }, + "dependencies": { + "@sentry/core": "8.40.0" + }, "volta": { "extends": "../../package.json" }, From 5dd90e0edb14d6ed83c98b5448ec3f91ef7214b8 Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Wed, 27 Nov 2024 13:42:04 +0000 Subject: [PATCH 2/7] Reexp --- packages/core/src/index.ts | 6 +- packages/types/src/index.ts | 190 ++++++++++++++++++++++++++++++++++++ 2 files changed, 193 insertions(+), 3 deletions(-) create mode 100644 packages/types/src/index.ts diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index eed487e961ba..751279cde693 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -1,5 +1,3 @@ -// TODO(v9): Don't have this file be in the "utils-hoist" folder but "utils" folder - it's cleaner - export type { ClientClass as SentryCoreCurrentScopes } from './sdk'; export type { AsyncContextStrategy } from './asyncContext/types'; export type { Carrier } from './carrier'; @@ -107,7 +105,6 @@ export { thirdPartyErrorFilterIntegration } from './integrations/third-party-err // eslint-disable-next-line deprecation/deprecation export { metrics } from './metrics/exports'; export { profiler } from './profiling'; -export type { MetricData } from '@sentry/types'; // eslint-disable-next-line deprecation/deprecation export { metricsDefault } from './metrics/exports-default'; export { BrowserMetricsAggregator } from './metrics/browser-aggregator'; @@ -123,4 +120,7 @@ export { captureFeedback } from './feedback'; // eslint-disable-next-line deprecation/deprecation export { getCurrentHubShim, getCurrentHub } from './getCurrentHubShim'; +// TODO(v9): Make this structure pretty again and don't do "export *" export * from './utils-hoist/index'; +// TODO(v9): Make this structure pretty again and don't do "export *" +export * from './types-hoist/index'; diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts new file mode 100644 index 000000000000..50c7731ccefe --- /dev/null +++ b/packages/types/src/index.ts @@ -0,0 +1,190 @@ +export type { + Attachment, + Breadcrumb, + BreadcrumbHint, + FetchBreadcrumbData, + XhrBreadcrumbData, + FetchBreadcrumbHint, + XhrBreadcrumbHint, + Client, + ClientReport, + Outcome, + EventDropReason, + Context, + Contexts, + DeviceContext, + OsContext, + AppContext, + CultureContext, + TraceContext, + CloudResourceContext, + MissingInstrumentationContext, + DataCategory, + DsnComponents, + DsnLike, + DsnProtocol, + DebugImage, + DebugMeta, + AttachmentItem, + BaseEnvelopeHeaders, + BaseEnvelopeItemHeaders, + ClientReportEnvelope, + ClientReportItem, + DynamicSamplingContext, + Envelope, + EnvelopeItemType, + EnvelopeItem, + EventEnvelope, + EventEnvelopeHeaders, + EventItem, + ReplayEnvelope, + FeedbackItem, + SessionEnvelope, + SessionItem, + UserFeedbackItem, + CheckInItem, + CheckInEnvelope, + StatsdItem, + StatsdEnvelope, + ProfileItem, + ProfileChunkEnvelope, + ProfileChunkItem, + SpanEnvelope, + SpanItem, + ExtendedError, + Event, + EventHint, + EventType, + ErrorEvent, + TransactionEvent, + EventProcessor, + Exception, + Extra, + Extras, + Hub, + Integration, + IntegrationClass, + IntegrationFn, + Mechanism, + ExtractedNodeRequestData, + HttpHeaderValue, + Primitive, + WorkerLocation, + ClientOptions, + Options, + Package, + PolymorphicEvent, + PolymorphicRequest, + ThreadId, + FrameId, + StackId, + ThreadCpuSample, + ThreadCpuStack, + ThreadCpuFrame, + ThreadCpuProfile, + ContinuousThreadCpuProfile, + Profile, + ProfileChunk, + ReplayEvent, + ReplayRecordingData, + ReplayRecordingMode, + FeedbackEvent, + FeedbackFormData, + FeedbackInternalOptions, + FeedbackModalIntegration, + FeedbackScreenshotIntegration, + SendFeedback, + SendFeedbackParams, + UserFeedback, + QueryParams, + RequestEventData, + Request, + SanitizedRequestData, + Runtime, + CaptureContext, + Scope, + ScopeContext, + ScopeData, + SdkInfo, + SdkMetadata, + SessionAggregates, + AggregationCounts, + Session, + SessionContext, + SessionStatus, + RequestSession, + RequestSessionStatus, + SessionFlusherLike, + SerializedSession, + SeverityLevel, + Span, + SentrySpanArguments, + SpanOrigin, + SpanAttributeValue, + SpanAttributes, + SpanTimeInput, + SpanJSON, + SpanContextData, + TraceFlag, + MetricSummary, + SpanStatus, + TimedEvent, + StackFrame, + Stacktrace, + StackParser, + StackLineParser, + StackLineParserFn, + PropagationContext, + TracePropagationTargets, + SerializedTraceData, + StartSpanOptions, + TraceparentData, + TransactionSource, + CustomSamplingContext, + SamplingContext, + DurationUnit, + InformationUnit, + FractionUnit, + MeasurementUnit, + NoneUnit, + Measurements, + Thread, + Transport, + TransportRequest, + TransportMakeRequestResponse, + InternalBaseTransportOptions, + BaseTransportOptions, + TransportRequestExecutor, + User, + WebFetchHeaders, + WebFetchRequest, + WrappedFunction, + HandlerDataFetch, + HandlerDataXhr, + HandlerDataDom, + HandlerDataConsole, + HandlerDataHistory, + HandlerDataError, + HandlerDataUnhandledRejection, + ConsoleLevel, + SentryXhrData, + SentryWrappedXMLHttpRequest, + BrowserClientReplayOptions, + BrowserClientProfilingOptions, + CheckIn, + MonitorConfig, + FinishedCheckIn, + InProgressCheckIn, + SerializedCheckIn, + MetricsAggregator, + MetricBucketItem, + MetricInstance, + MetricData, + Metrics, + ParameterizedString, + ContinuousProfiler, + ProfilingIntegration, + Profiler, + ViewHierarchyData, + ViewHierarchyWindow, +} from '@sentry/core'; From 2173db21028c51809c1ef71934d1eb7fc29d8f5e Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Wed, 27 Nov 2024 15:30:39 +0000 Subject: [PATCH 3/7] brainrot --- .craft.yml | 2 ++ README.md | 4 ---- .../integrations/Breadcrumbs/dom/click/test.ts | 2 +- .../Breadcrumbs/dom/customEvent/test.ts | 2 +- .../Breadcrumbs/dom/textInput/test.ts | 2 +- .../integrations/Breadcrumbs/fetch/get/test.ts | 2 +- .../fetch/getWithRequestObj/test.ts | 2 +- .../Breadcrumbs/fetch/post/test.ts | 2 +- .../Breadcrumbs/fetch/statusCode/test.ts | 2 +- .../integrations/Breadcrumbs/xhr/get/test.ts | 2 +- .../integrations/Breadcrumbs/xhr/post/test.ts | 2 +- .../Breadcrumbs/xhr/statusCode/test.ts | 2 +- .../suites/integrations/captureConsole/test.ts | 2 +- .../globalHandlers/fetchStackTrace/test.ts | 2 +- .../suites/integrations/httpContext/test.ts | 2 +- .../integrations/httpclient/axios/test.ts | 2 +- .../httpclient/fetch/simple/test.ts | 2 +- .../fetch/withAbortController/test.ts | 2 +- .../httpclient/fetch/withRequest/test.ts | 2 +- .../fetch/withRequestAndBodyAndOptions/test.ts | 2 +- .../fetch/withRequestAndOptions/test.ts | 2 +- .../suites/integrations/httpclient/xhr/test.ts | 2 +- .../moduleMetadata/appliesMetadata/test.ts | 2 +- .../appliesMetadataWithRewriteFrames/test.ts | 2 +- .../manual-client/browser-context/test.ts | 2 +- .../public-api/addBreadcrumb/empty_obj/test.ts | 2 +- .../addBreadcrumb/multiple_breadcrumbs/test.ts | 2 +- .../addBreadcrumb/simple_breadcrumb/test.ts | 2 +- .../addBreadcrumb/undefined_arg/test.ts | 2 +- .../public-api/beforeSendTransaction/test.ts | 2 +- .../captureException/classInstance/test.ts | 2 +- .../captureException/emptyObj/test.ts | 2 +- .../captureException/errorEvent/test.ts | 2 +- .../public-api/captureException/event/test.ts | 2 +- .../captureException/eventBreadcrumbs/test.ts | 2 +- .../captureException/linkedErrors/test.ts | 2 +- .../multipleErrorsDifferentStacktrace/test.ts | 2 +- .../multipleErrorsSameStacktrace/test.ts | 2 +- .../captureException/plainObject/test.ts | 2 +- .../transactionBreadcrumbs/test.ts | 2 +- .../captureException/undefinedArg/test.ts | 2 +- .../multipleMessageAttachStacktrace/test.ts | 2 +- .../parameterized_message/test.ts | 2 +- .../captureMessage/simple_message/test.ts | 2 +- .../captureMessage/with_level/test.ts | 2 +- .../simple_feedback/test.ts | 2 +- .../withCaptureException/test.ts | 2 +- .../withCaptureMessage/test.ts | 2 +- .../suites/public-api/denyUrls/test.ts | 2 +- .../suites/public-api/ignoreErrors/test.ts | 2 +- .../eventListener/named-function/test.ts | 2 +- .../eventListener/remove/test.ts | 2 +- .../eventListener/thrown-error/test.ts | 2 +- .../onError/non-string-arg/test.ts | 2 +- .../instrumentation/onError/rethrown/test.ts | 2 +- .../onError/syntax-errors/test.ts | 2 +- .../onError/thrown-errors/test.ts | 2 +- .../onError/thrown-objects/test.ts | 2 +- .../onError/thrown-strings/test.ts | 2 +- .../onUnhandledRejection/custom-event/test.ts | 2 +- .../onUnhandledRejection/event/test.ts | 2 +- .../onUnhandledRejection/thrown-errors/test.ts | 2 +- .../onUnhandledRejection/thrown-null/test.ts | 2 +- .../onUnhandledRejection/thrown-number/test.ts | 2 +- .../thrown-object-complex/test.ts | 2 +- .../thrown-objects/test.ts | 2 +- .../thrown-string-large/test.ts | 2 +- .../thrown-strings/test.ts | 2 +- .../thrown-undefined/test.ts | 2 +- .../thrown-errors/test.ts | 2 +- .../instrumentation/setInterval/test.ts | 2 +- .../instrumentation/setTimeout/test.ts | 2 +- .../instrumentation/setTimeoutFrozen/test.ts | 2 +- .../instrumentation/xhr/thrown-error/test.ts | 2 +- .../setContext/multiple_contexts/test.ts | 2 +- .../non_serializable_context/test.ts | 2 +- .../setContext/simple_context/test.ts | 2 +- .../setExtra/multiple_extras/test.ts | 2 +- .../setExtra/non_serializable_extra/test.ts | 2 +- .../public-api/setExtra/simple_extra/test.ts | 2 +- .../setExtras/consecutive_calls/test.ts | 2 +- .../setExtras/multiple_extras/test.ts | 2 +- .../setTag/with_non_primitives/test.ts | 2 +- .../public-api/setTag/with_primitives/test.ts | 2 +- .../setTags/with_non_primitives/test.ts | 2 +- .../public-api/setTags/with_primitives/test.ts | 2 +- .../public-api/setUser/unset_user/test.ts | 2 +- .../public-api/setUser/update_user/test.ts | 2 +- .../public-api/startSpan/circular_data/test.ts | 2 +- .../startSpan/error-async-reject/test.ts | 2 +- .../error-async-throw-not-awaited/test.ts | 2 +- .../startSpan/error-async-throw/test.ts | 2 +- .../public-api/startSpan/error-sync/test.ts | 2 +- .../parallel-root-spans-in-scope/test.ts | 2 +- .../test.ts | 2 +- .../startSpan/parallel-root-spans/test.ts | 2 +- .../startSpan/setMeasurement/test.ts | 2 +- .../standalone-mixed-transaction/test.ts | 2 +- .../public-api/startSpan/standalone/test.ts | 2 +- .../public-api/withScope/nested_scopes/test.ts | 2 +- .../public-api/withScope/throwError/test.ts | 2 +- .../suites/replay/dsc/test.ts | 2 +- .../suites/sessions/initial-scope/test.ts | 2 +- .../suites/sessions/start-session/test.ts | 2 +- .../suites/sessions/update-session/test.ts | 2 +- .../sessions/v7-hub-start-session/test.ts | 2 +- .../protocol_containing_fn_identifiers/test.ts | 2 +- .../protocol_fn_identifiers/test.ts | 2 +- .../stacktraces/regular_fn_identifiers/test.ts | 2 +- .../async-spans/test.ts | 2 +- .../backgroundtab-custom/test.ts | 2 +- .../backgroundtab-pageload/test.ts | 2 +- .../browserTracingIntegration/error/test.ts | 2 +- .../http-timings/test.ts | 2 +- .../interactions/test.ts | 2 +- .../test.ts | 2 +- .../long-animation-frame-disabled/test.ts | 2 +- .../long-animation-frame-enabled/test.ts | 2 +- .../long-animation-frame-non-chromium/test.ts | 2 +- .../test.ts | 2 +- .../long-tasks-before-navigation/test.ts | 2 +- .../long-tasks-disabled/test.ts | 2 +- .../long-tasks-enabled/test.ts | 2 +- .../long-tasks-no-animation-frame/test.ts | 2 +- .../browserTracingIntegration/meta/test.ts | 2 +- .../navigation/test.ts | 2 +- .../pageload-update-txn-name/test.ts | 2 +- .../browserTracingIntegration/pageload/test.ts | 2 +- .../pageloadDelayed/test.ts | 2 +- .../suites/tracing/dsc-txn-name-update/test.ts | 2 +- .../envelope-header-transaction-name/test.ts | 2 +- .../suites/tracing/envelope-header/test.ts | 2 +- .../tracing/metrics/connection-rtt/test.ts | 2 +- .../tracing/metrics/handlers-lcp/test.ts | 2 +- .../metrics/pageload-browser-spans/test.ts | 2 +- .../metrics/pageload-measure-spans/test.ts | 2 +- .../metrics/pageload-resource-spans/test.ts | 2 +- .../web-vitals-cls-standalone-spans/test.ts | 2 +- .../tracing/metrics/web-vitals-cls/test.ts | 2 +- .../tracing/metrics/web-vitals-fid/test.ts | 2 +- .../tracing/metrics/web-vitals-fp-fcp/test.ts | 2 +- .../metrics/web-vitals-inp-late/test.ts | 2 +- .../web-vitals-inp-parametrized-late/test.ts | 2 +- .../web-vitals-inp-parametrized/test.ts | 2 +- .../tracing/metrics/web-vitals-inp/test.ts | 2 +- .../tracing/metrics/web-vitals-lcp/test.ts | 2 +- .../tracing/metrics/web-vitals-ttfb/test.ts | 2 +- .../suites/tracing/metrics/web-vitals/test.ts | 2 +- .../suites/tracing/request/fetch/test.ts | 2 +- .../suites/tracing/request/xhr/test.ts | 2 +- .../tracing/trace-lifetime/navigation/test.ts | 2 +- .../trace-lifetime/pageload-meta/test.ts | 2 +- .../tracing/trace-lifetime/pageload/test.ts | 2 +- .../suites/transport/offline/queued/test.ts | 2 +- .../utils/generatePlugin.ts | 2 +- .../browser-integration-tests/utils/helpers.ts | 2 +- .../utils/replayEventTemplates.ts | 2 +- .../utils/replayHelpers.ts | 2 +- .../package.json | 1 - .../package.json | 1 - .../create-remix-app-express/package.json | 1 - .../create-remix-app-legacy/package.json | 1 - .../create-remix-app-v2-legacy/package.json | 1 - .../create-remix-app-v2/package.json | 1 - .../create-remix-app/package.json | 1 - .../test-applications/generic-ts3.8/index.ts | 4 ---- .../generic-ts3.8/package.json | 2 -- .../test-applications/nestjs-8/package.json | 1 - .../nestjs-8/src/app.service.ts | 2 +- .../nestjs-basic/package.json | 1 - .../nestjs-basic/src/app.service.ts | 2 +- .../nestjs-distributed-tracing/package.json | 1 - .../tests/propagation.test.ts | 2 +- .../nestjs-graphql/package.json | 1 - .../package.json | 1 - .../nestjs-with-submodules/package.json | 1 - .../test-applications/nextjs-13/package.json | 1 - .../test-applications/nextjs-14/package.json | 1 - .../test-applications/nextjs-15/package.json | 1 - .../nextjs-app-dir/components/span-context.tsx | 2 +- .../nextjs-app-dir/package.json | 1 - .../nextjs-turbo/package.json | 1 - .../node-connect/package.json | 1 - .../node-exports-test-app/package.json | 1 - .../package.json | 1 - .../node-express-send-to-sentry/package.json | 1 - .../node-express/package.json | 1 - .../node-fastify-5/package.json | 1 - .../node-fastify-5/tests/propagation.test.ts | 2 +- .../node-fastify/package.json | 1 - .../node-fastify/tests/propagation.test.ts | 2 +- .../test-applications/node-hapi/package.json | 3 +-- .../test-applications/node-koa/package.json | 1 - .../node-koa/tests/propagation.test.ts | 2 +- .../node-nestjs-basic/package.json | 1 - .../node-nestjs-basic/src/app.service.ts | 2 +- .../package.json | 1 - .../tests/propagation.test.ts | 2 +- .../node-otel-custom-sampler/package.json | 1 - .../node-otel-sdk-node/package.json | 1 - .../node-otel-without-tracing/package.json | 1 - .../react-router-6/tests/sse.test.ts | 2 +- .../solid-solidrouter/package.json | 1 - .../test-applications/solid/package.json | 1 - .../test-applications/svelte-5/package.json | 1 - .../sveltekit-2-svelte-5/package.json | 1 - .../sveltekit-2-twp/package.json | 1 - .../test-applications/sveltekit-2/package.json | 1 - .../test-applications/sveltekit/package.json | 1 - .../test-applications/vue-3/package.json | 1 - .../e2e-tests/verdaccio-config/config.yaml | 2 ++ .../node-integration-tests/package.json | 1 - .../node-integration-tests/src/index.ts | 2 +- .../node-integration-tests/suites/anr/test.ts | 2 +- .../suites/breadcrumbs/process-thread/test.ts | 2 +- .../startSpan/with-nested-spans/test.ts | 2 +- .../suites/tracing/amqplib/test.ts | 2 +- .../suites/tracing/maxSpans/test.ts | 2 +- .../node-integration-tests/utils/assertions.ts | 2 +- .../node-integration-tests/utils/index.ts | 2 +- .../node-integration-tests/utils/runner.ts | 2 +- .../node-integration-tests/utils/server.ts | 2 +- dev-packages/test-utils/package.json | 3 +-- .../test-utils/src/event-proxy-server.ts | 2 +- packages/angular/package.json | 1 - packages/angular/src/errorhandler.ts | 2 +- packages/angular/src/sdk.ts | 2 +- packages/angular/src/tracing.ts | 2 +- packages/angular/test/errorhandler.test.ts | 2 +- packages/astro/package.json | 1 - packages/astro/src/client/sdk.ts | 2 +- packages/astro/src/index.types.ts | 2 +- packages/astro/src/integration/types.ts | 2 +- packages/astro/src/server/middleware.ts | 2 +- packages/astro/test/server/middleware.test.ts | 2 +- packages/aws-serverless/package.json | 1 - packages/aws-serverless/src/integration/aws.ts | 2 +- .../src/integration/awslambda.ts | 2 +- packages/aws-serverless/src/sdk.ts | 2 +- packages/aws-serverless/src/utils.ts | 2 +- packages/aws-serverless/test/sdk.test.ts | 2 +- packages/browser-utils/package.json | 3 +-- packages/browser-utils/src/instrument/dom.ts | 2 +- .../browser-utils/src/instrument/history.ts | 2 +- packages/browser-utils/src/instrument/xhr.ts | 2 +- .../src/metrics/browserMetrics.ts | 2 +- packages/browser-utils/src/metrics/cls.ts | 2 +- packages/browser-utils/src/metrics/inp.ts | 2 +- packages/browser-utils/src/metrics/utils.ts | 2 +- .../test/browser/browserMetrics.test.ts | 2 +- .../browser-utils/test/utils/TestClient.ts | 2 +- packages/browser/package.json | 3 +-- packages/browser/src/client.ts | 4 ++-- packages/browser/src/eventbuilder.ts | 2 +- packages/browser/src/exports.ts | 2 +- packages/browser/src/helpers.ts | 2 +- packages/browser/src/index.ts | 2 +- .../browser/src/integrations/breadcrumbs.ts | 2 +- .../src/integrations/browserapierrors.ts | 2 +- .../browser/src/integrations/contextlines.ts | 2 +- .../browser/src/integrations/globalhandlers.ts | 2 +- .../browser/src/integrations/httpclient.ts | 2 +- .../browser/src/integrations/linkederrors.ts | 2 +- .../src/integrations/reportingobserver.ts | 2 +- packages/browser/src/integrations/spotlight.ts | 2 +- packages/browser/src/metrics.ts | 2 +- packages/browser/src/profiling/integration.ts | 2 +- .../src/profiling/startProfileForSpan.ts | 2 +- packages/browser/src/profiling/utils.ts | 2 +- packages/browser/src/sdk.ts | 2 +- packages/browser/src/stack-parsers.ts | 2 +- .../src/tracing/browserTracingIntegration.ts | 4 ++-- packages/browser/src/tracing/request.ts | 2 +- packages/browser/src/transports/fetch.ts | 2 +- packages/browser/src/transports/offline.ts | 2 +- packages/browser/src/transports/types.ts | 2 +- packages/browser/src/userfeedback.ts | 2 +- .../browser/src/utils/lazyLoadIntegration.ts | 2 +- .../test/integrations/contextlines.test.ts | 2 +- .../browser/test/integrations/helpers.test.ts | 2 +- .../integrations/reportingobserver.test.ts | 2 +- packages/browser/test/sdk.test.ts | 2 +- .../tracing/browserTracingIntegration.test.ts | 2 +- packages/browser/test/tracing/request.test.ts | 2 +- packages/browser/test/transports/fetch.test.ts | 2 +- .../browser/test/transports/offline.test.ts | 2 +- packages/bun/package.json | 3 +-- packages/bun/src/index.ts | 2 +- packages/bun/src/integrations/bunserver.ts | 2 +- packages/bun/src/sdk.ts | 2 +- packages/bun/src/transports/index.ts | 2 +- packages/bun/src/types.ts | 4 ++-- packages/cloudflare/package.json | 3 +-- packages/cloudflare/src/async.ts | 2 +- packages/cloudflare/src/client.ts | 4 ++-- packages/cloudflare/src/d1.ts | 2 +- packages/cloudflare/src/index.ts | 2 +- packages/cloudflare/src/integrations/fetch.ts | 2 +- packages/cloudflare/src/request.ts | 2 +- packages/cloudflare/src/scope-utils.ts | 2 +- packages/cloudflare/src/sdk.ts | 2 +- packages/cloudflare/src/transport.ts | 2 +- packages/cloudflare/src/vendor/stacktrace.ts | 2 +- packages/cloudflare/test/handler.test.ts | 2 +- .../cloudflare/test/integrations/fetch.test.ts | 2 +- packages/cloudflare/test/request.test.ts | 2 +- packages/cloudflare/test/transport.test.ts | 2 +- packages/core/src/api.ts | 2 +- .../core/src/asyncContext/stackStrategy.ts | 2 +- packages/core/src/asyncContext/types.ts | 2 +- packages/core/src/baseclient.ts | 4 ++-- packages/core/src/breadcrumbs.ts | 2 +- packages/core/src/carrier.ts | 2 +- packages/core/src/checkin.ts | 2 +- packages/core/src/currentScopes.ts | 3 +-- packages/core/src/defaultScopes.ts | 2 +- packages/core/src/envelope.ts | 6 +++--- packages/core/src/eventProcessors.ts | 3 +-- packages/core/src/exports.ts | 2 +- packages/core/src/feedback.ts | 2 +- packages/core/src/fetch.ts | 2 +- packages/core/src/getCurrentHubShim.ts | 2 +- packages/core/src/integration.ts | 8 +------- .../core/src/integrations/captureconsole.ts | 2 +- packages/core/src/integrations/debug.ts | 2 +- packages/core/src/integrations/dedupe.ts | 2 +- .../core/src/integrations/extraerrordata.ts | 2 +- .../core/src/integrations/functiontostring.ts | 2 +- .../core/src/integrations/inboundfilters.ts | 2 +- packages/core/src/integrations/linkederrors.ts | 2 +- packages/core/src/integrations/metadata.ts | 2 +- packages/core/src/integrations/requestdata.ts | 2 +- .../core/src/integrations/rewriteframes.ts | 2 +- .../core/src/integrations/sessiontiming.ts | 2 +- .../integrations/third-party-errors-filter.ts | 2 +- packages/core/src/integrations/zoderrors.ts | 3 +-- packages/core/src/metadata.ts | 2 +- packages/core/src/metrics/aggregator.ts | 2 +- .../core/src/metrics/browser-aggregator.ts | 2 +- packages/core/src/metrics/envelope.ts | 2 +- packages/core/src/metrics/exports-default.ts | 2 +- packages/core/src/metrics/exports.ts | 2 +- packages/core/src/metrics/instance.ts | 2 +- packages/core/src/metrics/metric-summary.ts | 6 +++--- packages/core/src/metrics/types.ts | 2 +- packages/core/src/metrics/utils.ts | 2 +- packages/core/src/profiling.ts | 2 +- packages/core/src/scope.ts | 6 +----- packages/core/src/sdk.ts | 2 +- packages/core/src/server-runtime-client.ts | 2 +- packages/core/src/session.ts | 2 +- packages/core/src/sessionflusher.ts | 4 ++-- .../core/src/tracing/dynamicSamplingContext.ts | 2 +- packages/core/src/tracing/idleSpan.ts | 2 +- packages/core/src/tracing/logSpans.ts | 2 +- packages/core/src/tracing/measurement.ts | 2 +- packages/core/src/tracing/sampling.ts | 2 +- .../core/src/tracing/sentryNonRecordingSpan.ts | 2 +- packages/core/src/tracing/sentrySpan.ts | 6 +++--- packages/core/src/tracing/spanstatus.ts | 2 +- packages/core/src/tracing/trace.ts | 2 +- packages/core/src/tracing/utils.ts | 4 ++-- packages/core/src/transports/base.ts | 2 +- packages/core/src/transports/multiplexed.ts | 2 +- packages/core/src/transports/offline.ts | 2 +- .../core/src/types-hoist/browseroptions.ts | 2 +- .../core/src/utils-hoist/aggregate-errors.ts | 2 +- packages/core/src/utils-hoist/anr.ts | 2 +- packages/core/src/utils-hoist/baggage.ts | 2 +- .../src/utils-hoist/breadcrumb-log-level.ts | 2 +- .../src/utils-hoist/buildPolyfills/types.ts | 2 +- packages/core/src/utils-hoist/clientreport.ts | 2 +- packages/core/src/utils-hoist/debug-ids.ts | 2 +- packages/core/src/utils-hoist/dsn.ts | 2 +- packages/core/src/utils-hoist/envelope.ts | 2 +- packages/core/src/utils-hoist/error.ts | 2 +- packages/core/src/utils-hoist/eventbuilder.ts | 2 +- .../core/src/utils-hoist/instrument/console.ts | 2 +- .../core/src/utils-hoist/instrument/fetch.ts | 2 +- .../src/utils-hoist/instrument/globalError.ts | 2 +- .../instrument/globalUnhandledRejection.ts | 2 +- packages/core/src/utils-hoist/is.ts | 2 +- packages/core/src/utils-hoist/logger.ts | 2 +- packages/core/src/utils-hoist/misc.ts | 2 +- .../core/src/utils-hoist/node-stack-trace.ts | 2 +- packages/core/src/utils-hoist/normalize.ts | 2 +- packages/core/src/utils-hoist/object.ts | 2 +- .../core/src/utils-hoist/propagationContext.ts | 2 +- packages/core/src/utils-hoist/ratelimit.ts | 2 +- packages/core/src/utils-hoist/requestdata.ts | 2 +- packages/core/src/utils-hoist/severity.ts | 2 +- packages/core/src/utils-hoist/stacktrace.ts | 2 +- packages/core/src/utils-hoist/tracing.ts | 2 +- packages/core/src/utils-hoist/worldwide.ts | 2 +- .../core/src/utils/applyScopeDataToEvent.ts | 2 +- packages/core/src/utils/hasTracingEnabled.ts | 2 +- packages/core/src/utils/isSentryRequestUrl.ts | 2 +- packages/core/src/utils/parameterize.ts | 2 +- packages/core/src/utils/prepareEvent.ts | 2 +- packages/core/src/utils/sdkMetadata.ts | 2 +- packages/core/src/utils/spanOnScope.ts | 2 +- packages/core/src/utils/spanUtils.ts | 18 +++++++++--------- packages/core/src/utils/traceData.ts | 2 +- packages/core/test/lib/api.test.ts | 3 +-- packages/core/test/lib/baseclient.test.ts | 2 +- packages/core/test/lib/checkin.test.ts | 2 +- packages/core/test/lib/envelope.test.ts | 2 +- packages/core/test/lib/feedback.test.ts | 2 +- packages/core/test/lib/integration.test.ts | 2 +- .../lib/integrations/captureconsole.test.ts | 2 +- .../core/test/lib/integrations/debug.test.ts | 2 +- .../core/test/lib/integrations/dedupe.test.ts | 2 +- .../lib/integrations/extraerrordata.test.ts | 2 +- .../lib/integrations/inboundfilters.test.ts | 2 +- .../test/lib/integrations/metadata.test.ts | 2 +- .../test/lib/integrations/requestdata.test.ts | 2 +- .../lib/integrations/rewriteframes.test.ts | 2 +- .../lib/integrations/sessiontiming.test.ts | 2 +- .../third-party-errors-filter.test.ts | 2 +- .../test/lib/integrations/zoderrrors.test.ts | 2 +- packages/core/test/lib/metadata.test.ts | 2 +- packages/core/test/lib/prepareEvent.test.ts | 4 ++-- packages/core/test/lib/scope.test.ts | 13 +------------ packages/core/test/lib/sdk.test.ts | 2 +- .../core/test/lib/serverruntimeclient.test.ts | 2 +- packages/core/test/lib/session.test.ts | 2 +- packages/core/test/lib/sessionflusher.test.ts | 2 +- .../lib/tracing/dynamicSamplingContext.test.ts | 2 +- packages/core/test/lib/tracing/errors.test.ts | 2 +- .../core/test/lib/tracing/idleSpan.test.ts | 2 +- .../lib/tracing/sentryNonRecordingSpan.test.ts | 2 +- packages/core/test/lib/tracing/trace.test.ts | 2 +- packages/core/test/lib/transports/base.test.ts | 2 +- .../test/lib/transports/multiplexed.test.ts | 2 +- .../core/test/lib/transports/offline.test.ts | 2 +- .../lib/utils/applyScopeDataToEvent.test.ts | 2 +- .../test/lib/utils/isSentryRequestUrl.test.ts | 2 +- .../core/test/lib/utils/parameterize.test.ts | 2 +- packages/core/test/lib/utils/spanUtils.test.ts | 2 +- packages/core/test/lib/utils/traceData.test.ts | 2 +- packages/core/test/mocks/client.ts | 2 +- packages/core/test/mocks/integration.ts | 2 +- packages/core/test/mocks/transport.ts | 2 +- .../test/utils-hoist/aggregate-errors.test.ts | 2 +- .../core/test/utils-hoist/clientreport.test.ts | 2 +- .../core/test/utils-hoist/envelope.test.ts | 2 +- .../core/test/utils-hoist/eventbuilder.test.ts | 2 +- packages/core/test/utils-hoist/misc.test.ts | 2 +- packages/core/test/utils-hoist/object.test.ts | 2 +- .../core/test/utils-hoist/requestdata.test.ts | 2 +- packages/deno/package.json | 3 +-- packages/deno/src/index.ts | 2 +- packages/deno/src/integrations/breadcrumbs.ts | 2 +- packages/deno/src/integrations/context.ts | 2 +- packages/deno/src/integrations/contextlines.ts | 2 +- packages/deno/src/integrations/deno-cron.ts | 2 +- .../deno/src/integrations/globalhandlers.ts | 2 +- .../deno/src/integrations/normalizepaths.ts | 2 +- packages/deno/src/sdk.ts | 2 +- packages/deno/src/transports/index.ts | 2 +- packages/deno/src/types.ts | 4 ++-- packages/deno/test/build.ts | 2 +- packages/ember/addon/index.ts | 2 +- .../sentry-performance.ts | 2 +- packages/ember/package.json | 1 - packages/ember/tests/helpers/utils.ts | 2 +- packages/feedback/package.json | 3 +-- packages/feedback/src/core/TestClient.ts | 2 +- packages/feedback/src/core/createMainStyles.ts | 2 +- packages/feedback/src/core/integration.ts | 2 +- packages/feedback/src/core/mockSdk.ts | 2 +- packages/feedback/src/core/sendFeedback.ts | 2 +- packages/feedback/src/core/types.ts | 2 +- .../feedback/src/modal/components/Dialog.tsx | 2 +- .../src/modal/components/DialogHeader.tsx | 2 +- .../feedback/src/modal/components/Form.tsx | 2 +- packages/feedback/src/modal/integration.tsx | 2 +- .../screenshot/components/ScreenshotEditor.tsx | 2 +- .../feedback/src/screenshot/integration.ts | 4 ++-- packages/feedback/src/util/mergeOptions.ts | 2 +- packages/feedback/src/util/validate.ts | 2 +- packages/gatsby/package.json | 1 - packages/gatsby/src/sdk.ts | 2 +- packages/google-cloud-serverless/package.json | 1 - .../src/integrations/google-cloud-grpc.ts | 2 +- .../src/integrations/google-cloud-http.ts | 2 +- packages/google-cloud-serverless/src/sdk.ts | 2 +- packages/google-cloud-serverless/src/utils.ts | 2 +- .../test/gcpfunction/events.test.ts | 2 +- .../test/gcpfunction/http.test.ts | 2 +- packages/integration-shims/package.json | 3 +-- packages/integration-shims/src/Feedback.ts | 2 +- packages/integration-shims/src/Replay.ts | 2 +- packages/integration-shims/src/metrics.ts | 2 +- packages/nestjs/README.md | 2 +- packages/nestjs/package.json | 3 +-- packages/nestjs/src/decorators.ts | 2 +- packages/nestjs/src/setup.ts | 2 +- packages/nextjs/package.json | 1 - .../src/client/browserTracingIntegration.ts | 2 +- packages/nextjs/src/client/index.ts | 2 +- .../routing/appRouterRoutingInstrumentation.ts | 2 +- .../routing/nextRoutingInstrumentation.ts | 2 +- .../pagesRouterRoutingInstrumentation.ts | 2 +- .../nextjs/src/common/captureRequestError.ts | 2 +- .../devErrorSymbolicationEventProcessor.ts | 2 +- packages/nextjs/src/common/types.ts | 2 +- .../nextjs/src/common/utils/responseEnd.ts | 2 +- .../nextjs/src/common/utils/tracingUtils.ts | 2 +- .../common/withServerActionInstrumentation.ts | 2 +- .../common/wrapGenerationFunctionWithSentry.ts | 2 +- .../src/common/wrapMiddlewareWithSentry.ts | 2 +- .../src/common/wrapRouteHandlerWithSentry.ts | 2 +- .../common/wrapServerComponentWithSentry.ts | 2 +- .../templates/requestAsyncStorageShim.ts | 2 +- .../templates/routeHandlerWrapperTemplate.ts | 2 +- .../serverComponentWrapperTemplate.ts | 2 +- .../src/edge/rewriteFramesIntegration.ts | 2 +- packages/nextjs/src/index.types.ts | 2 +- packages/nextjs/src/server/index.ts | 2 +- .../src/server/rewriteFramesIntegration.ts | 2 +- packages/nextjs/test/clientSdk.test.ts | 2 +- packages/nextjs/test/config/wrappers.test.ts | 2 +- .../pagesRouterInstrumentation.test.ts | 2 +- packages/nextjs/test/serverSdk.test.ts | 2 +- packages/node/package.json | 1 - packages/node/src/index.ts | 2 +- packages/node/src/integrations/anr/common.ts | 2 +- packages/node/src/integrations/anr/index.ts | 2 +- packages/node/src/integrations/anr/worker.ts | 2 +- packages/node/src/integrations/context.ts | 2 +- packages/node/src/integrations/contextlines.ts | 2 +- .../http/SentryHttpInstrumentation.ts | 2 +- packages/node/src/integrations/http/index.ts | 2 +- .../src/integrations/local-variables/index.ts | 2 +- .../local-variables/local-variables-async.ts | 2 +- .../local-variables/local-variables-sync.ts | 2 +- packages/node/src/integrations/modules.ts | 2 +- packages/node/src/integrations/node-fetch.ts | 2 +- .../src/integrations/onunhandledrejection.ts | 2 +- packages/node/src/integrations/spotlight.ts | 2 +- .../node/src/integrations/tracing/amqplib.ts | 2 +- .../node/src/integrations/tracing/connect.ts | 2 +- .../src/integrations/tracing/dataloader.ts | 2 +- .../node/src/integrations/tracing/express.ts | 2 +- .../node/src/integrations/tracing/fastify.ts | 2 +- .../src/integrations/tracing/genericPool.ts | 2 +- .../node/src/integrations/tracing/graphql.ts | 2 +- .../src/integrations/tracing/hapi/index.ts | 2 +- .../node/src/integrations/tracing/index.ts | 2 +- .../node/src/integrations/tracing/kafka.ts | 2 +- packages/node/src/integrations/tracing/knex.ts | 2 +- packages/node/src/integrations/tracing/koa.ts | 2 +- .../src/integrations/tracing/lrumemoizer.ts | 2 +- .../node/src/integrations/tracing/mongo.ts | 2 +- .../node/src/integrations/tracing/mongoose.ts | 2 +- .../node/src/integrations/tracing/mysql.ts | 2 +- .../node/src/integrations/tracing/mysql2.ts | 2 +- .../src/integrations/tracing/nest/helpers.ts | 2 +- .../node/src/integrations/tracing/nest/nest.ts | 2 +- .../nest/sentry-nest-instrumentation.ts | 2 +- .../node/src/integrations/tracing/postgres.ts | 2 +- .../node/src/integrations/tracing/prisma.ts | 2 +- .../node/src/integrations/tracing/redis.ts | 2 +- .../node/src/integrations/tracing/tedious.ts | 2 +- packages/node/src/sdk/api.ts | 2 +- packages/node/src/sdk/client.ts | 2 +- packages/node/src/sdk/index.ts | 2 +- packages/node/src/sdk/scope.ts | 2 +- packages/node/src/transports/http.ts | 2 +- packages/node/src/types.ts | 4 ++-- packages/node/src/utils/addOriginToSpan.ts | 2 +- .../createMissingInstrumentationContext.ts | 2 +- packages/node/src/utils/prepareEvent.ts | 2 +- .../node/test/integration/transactions.test.ts | 2 +- .../test/integrations/contextlines.test.ts | 2 +- .../node/test/integrations/express.test.ts | 2 +- .../node/test/integrations/spotlight.test.ts | 2 +- packages/node/test/sdk/api.test.ts | 2 +- packages/node/test/sdk/client.test.ts | 4 ++-- packages/node/test/sdk/init.test.ts | 2 +- packages/node/test/sdk/scope.test.ts | 2 +- packages/node/test/transports/http.test.ts | 2 +- packages/node/test/transports/https.test.ts | 2 +- packages/nuxt/package.json | 1 - packages/nuxt/src/client/piniaIntegration.ts | 2 +- packages/nuxt/src/client/sdk.ts | 2 +- packages/nuxt/src/index.types.ts | 2 +- packages/nuxt/src/runtime/utils.ts | 2 +- packages/nuxt/src/server/sdk.ts | 2 +- packages/nuxt/test/server/sdk.test.ts | 2 +- packages/opentelemetry/package.json | 3 +-- .../opentelemetry/src/asyncContextStrategy.ts | 2 +- packages/opentelemetry/src/contextManager.ts | 2 +- packages/opentelemetry/src/custom/client.ts | 2 +- packages/opentelemetry/src/propagator.ts | 2 +- packages/opentelemetry/src/sampler.ts | 2 +- .../src/setupEventContextTrace.ts | 2 +- packages/opentelemetry/src/spanExporter.ts | 2 +- packages/opentelemetry/src/trace.ts | 2 +- packages/opentelemetry/src/types.ts | 2 +- .../opentelemetry/src/utils/addOriginToSpan.ts | 2 +- .../opentelemetry/src/utils/contextData.ts | 2 +- .../enhanceDscWithOpenTelemetryRootSpanName.ts | 2 +- ...generateSpanContextForPropagationContext.ts | 2 +- .../src/utils/getRequestSpanData.ts | 2 +- .../opentelemetry/src/utils/getTraceData.ts | 2 +- .../opentelemetry/src/utils/makeTraceState.ts | 2 +- packages/opentelemetry/src/utils/mapStatus.ts | 2 +- .../src/utils/parseSpanDescription.ts | 2 +- .../test/asyncContextStrategy.test.ts | 2 +- .../opentelemetry/test/helpers/TestClient.ts | 2 +- .../opentelemetry/test/helpers/mockSdkInit.ts | 2 +- .../test/integration/transactions.test.ts | 2 +- packages/opentelemetry/test/trace.test.ts | 2 +- .../opentelemetry/test/utils/mapStatus.test.ts | 2 +- packages/profiling-node/package.json | 1 - packages/profiling-node/src/integration.ts | 2 +- .../profiling-node/src/spanProfileUtils.ts | 2 +- packages/profiling-node/src/types.ts | 2 +- packages/profiling-node/src/utils.ts | 2 +- .../profiling-node/test/cpu_profiler.test.ts | 2 +- .../profiling-node/test/integration.test.ts | 2 +- .../test/spanProfileUtils.test.ts | 4 ++-- .../test/spanProfileUtils.worker.test.ts | 4 ++-- packages/profiling-node/test/utils.test.ts | 2 +- packages/react/package.json | 1 - packages/react/src/error.ts | 2 +- packages/react/src/errorboundary.tsx | 2 +- packages/react/src/profiler.tsx | 2 +- packages/react/src/reactrouter.tsx | 2 +- packages/react/src/reactrouterv3.ts | 2 +- packages/react/src/reactrouterv6.tsx | 2 +- packages/react/src/redux.ts | 2 +- packages/react/src/sdk.ts | 2 +- packages/react/src/tanstackrouter.ts | 2 +- packages/react/test/errorboundary.test.tsx | 2 +- packages/react/test/profiler.test.tsx | 2 +- packages/remix/package.json | 1 - .../src/client/browserTracingIntegration.ts | 2 +- packages/remix/src/client/performance.tsx | 2 +- packages/remix/src/index.client.tsx | 2 +- packages/remix/src/index.server.ts | 2 +- packages/remix/src/index.types.ts | 2 +- packages/remix/src/utils/errors.ts | 2 +- packages/remix/src/utils/instrumentServer.ts | 4 ++-- packages/remix/src/utils/integrations/http.ts | 2 +- .../src/utils/integrations/opentelemetry.ts | 2 +- packages/remix/src/utils/remixOptions.ts | 2 +- packages/remix/src/utils/utils.ts | 2 +- packages/remix/test/integration/package.json | 1 - .../test/client/capture-exception.test.ts | 2 +- .../test/client/capture-message.test.ts | 2 +- .../test/client/click-error.test.ts | 2 +- .../test/client/errorboundary.test.ts | 2 +- .../test/client/manualtracing.test.ts | 2 +- .../integration/test/client/meta-tags.test.ts | 2 +- .../integration/test/client/pageload.test.ts | 2 +- .../instrumentation-legacy/loader.test.ts | 2 +- .../server/instrumentation-otel/loader.test.ts | 2 +- .../integration/test/server/utils/helpers.ts | 2 +- packages/replay-canvas/package.json | 3 +-- packages/replay-canvas/src/canvas.ts | 2 +- packages/replay-internal/package.json | 3 +-- .../src/coreHandlers/handleAfterSendEvent.ts | 2 +- .../src/coreHandlers/handleBeforeSendEvent.ts | 2 +- .../src/coreHandlers/handleBreadcrumbs.ts | 2 +- .../src/coreHandlers/handleClick.ts | 2 +- .../src/coreHandlers/handleDom.ts | 2 +- .../src/coreHandlers/handleGlobalEvent.ts | 2 +- .../src/coreHandlers/handleHistory.ts | 2 +- .../src/coreHandlers/handleKeyboardEvent.ts | 2 +- .../coreHandlers/handleNetworkBreadcrumbs.ts | 2 +- .../coreHandlers/util/addBreadcrumbEvent.ts | 2 +- .../coreHandlers/util/addFeedbackBreadcrumb.ts | 2 +- .../src/coreHandlers/util/fetchUtils.ts | 2 +- .../util/shouldSampleForBufferEvent.ts | 2 +- .../src/coreHandlers/util/xhrUtils.ts | 2 +- .../EventBufferCompressionWorker.ts | 2 +- .../src/eventBuffer/EventBufferProxy.ts | 2 +- packages/replay-internal/src/integration.ts | 8 +------- packages/replay-internal/src/replay.ts | 2 +- packages/replay-internal/src/types/replay.ts | 2 +- .../replay-internal/src/types/replayFrame.ts | 2 +- .../src/util/addGlobalListeners.ts | 2 +- .../src/util/createReplayEnvelope.ts | 2 +- .../replay-internal/src/util/eventUtils.ts | 2 +- .../replay-internal/src/util/isRrwebError.ts | 2 +- packages/replay-internal/src/util/logger.ts | 2 +- .../src/util/prepareRecordingData.ts | 2 +- .../src/util/prepareReplayEvent.ts | 2 +- .../resetReplayIdOnDynamicSamplingContext.ts | 2 +- .../src/util/sendReplayRequest.ts | 2 +- packages/replay-internal/test.setup.ts | 2 +- .../replay-internal/test/fixtures/error.ts | 2 +- .../test/fixtures/transaction.ts | 2 +- .../beforeAddRecordingEvent.test.ts | 2 +- .../coreHandlers/handleAfterSendEvent.test.ts | 2 +- .../coreHandlers/handleGlobalEvent.test.ts | 2 +- .../test/integration/eventProcessors.test.ts | 2 +- .../test/integration/rateLimiting.test.ts | 2 +- .../test/integration/sendReplayEvent.test.ts | 2 +- .../test/integration/session.test.ts | 2 +- .../test/integration/start.test.ts | 2 +- packages/replay-internal/test/mocks/mockSdk.ts | 2 +- packages/replay-internal/test/types.ts | 2 +- .../test/unit/coreHandlers/handleClick.test.ts | 2 +- .../test/unit/coreHandlers/handleDom.test.ts | 2 +- .../handleNetworkBreadcrumbs.test.ts | 2 +- .../test/unit/session/createSession.test.ts | 2 +- .../unit/util/createReplayEnvelope.test.ts | 2 +- .../test/unit/util/prepareReplayEvent.test.ts | 2 +- .../replay-internal/test/utils/TestClient.ts | 2 +- packages/solid/package.json | 3 +-- packages/solid/src/sdk.ts | 2 +- packages/solid/src/solidrouter.ts | 2 +- packages/solidstart/package.json | 1 - packages/solidstart/src/client/sdk.ts | 2 +- packages/solidstart/src/index.types.ts | 2 +- packages/solidstart/src/server/utils.ts | 2 +- packages/svelte/package.json | 1 - packages/svelte/src/performance.ts | 2 +- packages/svelte/src/sdk.ts | 2 +- packages/svelte/test/performance.test.ts | 2 +- packages/svelte/test/sdk.test.ts | 2 +- packages/sveltekit/package.json | 1 - .../src/client/browserTracingIntegration.ts | 2 +- packages/sveltekit/src/client/sdk.ts | 2 +- packages/sveltekit/src/index.types.ts | 2 +- packages/sveltekit/src/server/handle.ts | 2 +- .../src/server/rewriteFramesIntegration.ts | 2 +- packages/sveltekit/src/vite/detectAdapter.ts | 2 +- .../client/browserTracingIntegration.test.ts | 2 +- packages/sveltekit/test/server/handle.test.ts | 2 +- packages/sveltekit/test/server/load.test.ts | 2 +- .../test/server/rewriteFramesIntegration.ts | 2 +- packages/sveltekit/test/utils.ts | 2 +- packages/utils/package.json | 3 +-- packages/vercel-edge/package.json | 3 +-- packages/vercel-edge/src/index.ts | 2 +- .../src/integrations/wintercg-fetch.ts | 2 +- packages/vercel-edge/src/sdk.ts | 2 +- packages/vercel-edge/src/transports/index.ts | 2 +- packages/vercel-edge/src/transports/types.ts | 2 +- packages/vercel-edge/src/types.ts | 4 ++-- .../vercel-edge/test/transports/index.test.ts | 2 +- .../vercel-edge/test/wintercg-fetch.test.ts | 2 +- packages/vue/package.json | 3 +-- packages/vue/src/browserTracingIntegration.ts | 2 +- packages/vue/src/router.ts | 2 +- packages/vue/src/sdk.ts | 2 +- packages/vue/src/tracing.ts | 2 +- .../test/integration/VueIntegration.test.ts | 2 +- packages/vue/test/integration/init.test.ts | 2 +- packages/vue/test/router.test.ts | 2 +- packages/wasm/package.json | 3 +-- packages/wasm/src/index.ts | 2 +- packages/wasm/src/registry.ts | 2 +- scripts/build-types-watch.ts | 2 +- 759 files changed, 732 insertions(+), 843 deletions(-) diff --git a/.craft.yml b/.craft.yml index f08ee2832d25..d9be4d4b3fa4 100644 --- a/.craft.yml +++ b/.craft.yml @@ -5,10 +5,12 @@ targets: # NPM Targets ## 1. Base Packages, node or browser SDKs depend on ## 1.1 Types + # TODO(v9): Remove - name: npm id: '@sentry/types' includeNames: /^sentry-types-\d.*\.tgz$/ ## 1.2 Utils + # TODO(v9): Remove - name: npm id: '@sentry/utils' includeNames: /^sentry-utils-\d.*\.tgz$/ diff --git a/README.md b/README.md index 44b10aa4d5b0..db7000a9d51f 100644 --- a/README.md +++ b/README.md @@ -111,10 +111,6 @@ below: Provides the integration for Session Replay. - [`@sentry/core`](https://github.com/getsentry/sentry-javascript/tree/master/packages/core): The base for all JavaScript SDKs with interfaces, type definitions and base classes. -- [`@sentry/utils`](https://github.com/getsentry/sentry-javascript/tree/master/packages/utils): A set of helpers and - utility functions useful for various SDKs. -- [`@sentry/types`](https://github.com/getsentry/sentry-javascript/tree/master/packages/types): Types used in all - packages. ## Bug Bounty Program diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/click/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/click/test.ts index d6dd646b9965..b76c6f2d85f9 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/click/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/click/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/customEvent/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/customEvent/test.ts index 83cd53f8acba..d56ca8a8cc00 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/customEvent/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/customEvent/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/textInput/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/textInput/test.ts index d7544fbf891e..f7d1a32c4497 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/textInput/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/textInput/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/get/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/get/test.ts index 9ecf29c31014..7daa0b43cb6a 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/get/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/get/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/getWithRequestObj/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/getWithRequestObj/test.ts index 8d545ea6f566..c778276fae90 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/getWithRequestObj/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/getWithRequestObj/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/post/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/post/test.ts index fd27c71e6ad7..a2ef7e478c2e 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/post/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/post/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/statusCode/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/statusCode/test.ts index 70cd868ccfe1..60892609c5b1 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/statusCode/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/statusCode/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/get/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/get/test.ts index 9c4b14e89033..abcc012bc46d 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/get/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/get/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/post/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/post/test.ts index 985e7e316244..cb259b1a547c 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/post/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/post/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/statusCode/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/statusCode/test.ts index eb7014df5890..1fbf688f16d8 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/statusCode/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/statusCode/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/integrations/captureConsole/test.ts b/dev-packages/browser-integration-tests/suites/integrations/captureConsole/test.ts index 606ef8925afd..7630d2a7824f 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/captureConsole/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/captureConsole/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests } from '../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/integrations/globalHandlers/fetchStackTrace/test.ts b/dev-packages/browser-integration-tests/suites/integrations/globalHandlers/fetchStackTrace/test.ts index 3d6790a36230..15dacad349b7 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/globalHandlers/fetchStackTrace/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/globalHandlers/fetchStackTrace/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/integrations/httpContext/test.ts b/dev-packages/browser-integration-tests/suites/integrations/httpContext/test.ts index f85aa63473d5..190aae12ce18 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/httpContext/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/httpContext/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/integrations/httpclient/axios/test.ts b/dev-packages/browser-integration-tests/suites/integrations/httpclient/axios/test.ts index 8b4267c217e6..d4e7ba222b30 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/httpclient/axios/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/httpclient/axios/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/simple/test.ts b/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/simple/test.ts index d490f98426cd..09390fffd573 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/simple/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/simple/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withAbortController/test.ts b/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withAbortController/test.ts index 0bf34e61b95a..fbd30098773a 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withAbortController/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withAbortController/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event as SentryEvent } from '@sentry/types'; +import type { Event as SentryEvent } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequest/test.ts b/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequest/test.ts index 9fb6add1a2d5..f1e23bbd080b 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequest/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequest/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequestAndBodyAndOptions/test.ts b/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequestAndBodyAndOptions/test.ts index 485a52ed3fd4..ba34c4fdfa0f 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequestAndBodyAndOptions/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequestAndBodyAndOptions/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequestAndOptions/test.ts b/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequestAndOptions/test.ts index d78860f7b1a6..0ea8fc7bc0cb 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequestAndOptions/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequestAndOptions/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/integrations/httpclient/xhr/test.ts b/dev-packages/browser-integration-tests/suites/integrations/httpclient/xhr/test.ts index 9953de1c860e..d342e9abf748 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/httpclient/xhr/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/httpclient/xhr/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadata/test.ts b/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadata/test.ts index 8e9401e67be1..271314220f7a 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadata/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadata/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadataWithRewriteFrames/test.ts b/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadataWithRewriteFrames/test.ts index 04e8f24adfaf..bdabe0d63680 100644 --- a/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadataWithRewriteFrames/test.ts +++ b/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadataWithRewriteFrames/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/manual-client/browser-context/test.ts b/dev-packages/browser-integration-tests/suites/manual-client/browser-context/test.ts index 2901c482e2d2..bc6159bcba05 100644 --- a/dev-packages/browser-integration-tests/suites/manual-client/browser-context/test.ts +++ b/dev-packages/browser-integration-tests/suites/manual-client/browser-context/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/empty_obj/test.ts b/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/empty_obj/test.ts index 32f3e0758de2..37de3ad11082 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/empty_obj/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/empty_obj/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/multiple_breadcrumbs/test.ts b/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/multiple_breadcrumbs/test.ts index 43fd59b5b1dc..765c59678d49 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/multiple_breadcrumbs/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/multiple_breadcrumbs/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/simple_breadcrumb/test.ts b/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/simple_breadcrumb/test.ts index 3eba0e1ecc48..d99ec82d88d7 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/simple_breadcrumb/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/simple_breadcrumb/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/undefined_arg/test.ts b/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/undefined_arg/test.ts index 3837262b69a9..b18b57f27c20 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/undefined_arg/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/undefined_arg/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/beforeSendTransaction/test.ts b/dev-packages/browser-integration-tests/suites/public-api/beforeSendTransaction/test.ts index 14531498e90b..92e34c398b27 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/beforeSendTransaction/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/beforeSendTransaction/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/browser'; import { sentryTest } from '../../../utils/fixtures'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/classInstance/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/classInstance/test.ts index 0c0a35859dd0..04527d822407 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/captureException/classInstance/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/classInstance/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/emptyObj/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/emptyObj/test.ts index 712f599f30d5..79f5af014476 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/captureException/emptyObj/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/emptyObj/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/errorEvent/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/errorEvent/test.ts index 5e8cbc0dd9c1..db68fb7790b5 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/captureException/errorEvent/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/errorEvent/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/event/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/event/test.ts index d212a027ec53..b6d68e0da3f0 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/captureException/event/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/event/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/eventBreadcrumbs/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/eventBreadcrumbs/test.ts index 4dc6bd0c7311..887c63d896bc 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/captureException/eventBreadcrumbs/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/eventBreadcrumbs/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/linkedErrors/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/linkedErrors/test.ts index 9136f11ceae0..61dc0e3418f6 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/captureException/linkedErrors/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/linkedErrors/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/multipleErrorsDifferentStacktrace/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/multipleErrorsDifferentStacktrace/test.ts index 103c0c1d1dc5..05283130a679 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/captureException/multipleErrorsDifferentStacktrace/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/multipleErrorsDifferentStacktrace/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/multipleErrorsSameStacktrace/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/multipleErrorsSameStacktrace/test.ts index 7ef825b0b147..fadcc4a72899 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/captureException/multipleErrorsSameStacktrace/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/multipleErrorsSameStacktrace/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/plainObject/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/plainObject/test.ts index 1f31b1738bb4..8bf55ef1eca6 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/captureException/plainObject/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/plainObject/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/transactionBreadcrumbs/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/transactionBreadcrumbs/test.ts index 4383d92a6f73..0599d275b065 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/captureException/transactionBreadcrumbs/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/transactionBreadcrumbs/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/undefinedArg/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/undefinedArg/test.ts index a7e8dfc93116..87611a523b7c 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/captureException/undefinedArg/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/undefinedArg/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureMessage/multipleMessageAttachStacktrace/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureMessage/multipleMessageAttachStacktrace/test.ts index a16afd870fd9..487b0e1c62c4 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/captureMessage/multipleMessageAttachStacktrace/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/captureMessage/multipleMessageAttachStacktrace/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureMessage/parameterized_message/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureMessage/parameterized_message/test.ts index c507f8a7d8c6..79f097d60a6b 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/captureMessage/parameterized_message/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/captureMessage/parameterized_message/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureMessage/simple_message/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureMessage/simple_message/test.ts index 50df0b1c38df..fdd9cba22b37 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/captureMessage/simple_message/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/captureMessage/simple_message/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureMessage/with_level/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureMessage/with_level/test.ts index 96b3a98276df..2a9ab70d0622 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/captureMessage/with_level/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/captureMessage/with_level/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/simple_feedback/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/simple_feedback/test.ts index 6c3ffdbc969f..3d1253910e3d 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/simple_feedback/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/simple_feedback/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { UserFeedback } from '@sentry/types'; +import type { UserFeedback } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/withCaptureException/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/withCaptureException/test.ts index 800489456525..aa7bc8f7aa17 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/withCaptureException/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/withCaptureException/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event, UserFeedback } from '@sentry/types'; +import type { Event, UserFeedback } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/withCaptureMessage/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/withCaptureMessage/test.ts index 7b0b5ad2f2ed..019a5d4a0326 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/withCaptureMessage/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/withCaptureMessage/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event, UserFeedback } from '@sentry/types'; +import type { Event, UserFeedback } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/denyUrls/test.ts b/dev-packages/browser-integration-tests/suites/public-api/denyUrls/test.ts index c562b0fb9c09..b6eda2f9cad0 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/denyUrls/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/denyUrls/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/ignoreErrors/test.ts b/dev-packages/browser-integration-tests/suites/public-api/ignoreErrors/test.ts index 809e47e66a8b..3101cc500cde 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/ignoreErrors/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/ignoreErrors/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests } from '../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/named-function/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/named-function/test.ts index 9ab0c5030bab..aa215deb3141 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/named-function/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/named-function/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/remove/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/remove/test.ts index d8047a044646..8958c4ce71b8 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/remove/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/remove/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/thrown-error/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/thrown-error/test.ts index 3a4313ae044e..276c77d9d04a 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/thrown-error/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/thrown-error/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/non-string-arg/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/non-string-arg/test.ts index a9002579e912..14d42a242cf3 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/non-string-arg/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/non-string-arg/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, runScriptInSandbox } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/rethrown/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/rethrown/test.ts index 53c16ad46e23..4a4cd9e0137f 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/rethrown/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/rethrown/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests, runScriptInSandbox } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/syntax-errors/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/syntax-errors/test.ts index cd08b56ccee5..c11d1897e1c2 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/syntax-errors/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/syntax-errors/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, runScriptInSandbox } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-errors/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-errors/test.ts index 27dbcc771431..683d99b72e23 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-errors/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-errors/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, runScriptInSandbox } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-objects/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-objects/test.ts index 37a70678a2de..c2d174b1cd33 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-objects/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-objects/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, runScriptInSandbox } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-strings/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-strings/test.ts index 1245feb862e5..ff4eb3dd0002 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-strings/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-strings/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, runScriptInSandbox } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/custom-event/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/custom-event/test.ts index 0f0bc09ed6d7..639229c2dc7b 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/custom-event/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/custom-event/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/event/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/event/test.ts index 167cdc48870f..80fc86abd9cf 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/event/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/event/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-errors/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-errors/test.ts index 2d18376174c7..b895470d64f4 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-errors/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-errors/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-null/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-null/test.ts index f350ed0de639..88105df9a6c9 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-null/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-null/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-number/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-number/test.ts index 7fefb9037427..f9fa303d2774 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-number/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-number/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-object-complex/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-object-complex/test.ts index 80a23927d9b5..01b77e1a62a4 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-object-complex/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-object-complex/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-objects/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-objects/test.ts index e4e5fcfa2248..4b4a1d683caf 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-objects/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-objects/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-string-large/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-string-large/test.ts index 1bec29f18f6d..e198d6f944f0 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-string-large/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-string-large/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-strings/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-strings/test.ts index 91faa5536079..220cdcf77cbd 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-strings/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-strings/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-undefined/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-undefined/test.ts index 2195725a6599..d7dad5318e73 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-undefined/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-undefined/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/requestAnimationFrame/thrown-errors/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/requestAnimationFrame/thrown-errors/test.ts index e39e4c20a27b..c9eb70150f0c 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/requestAnimationFrame/thrown-errors/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/requestAnimationFrame/thrown-errors/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setInterval/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setInterval/test.ts index cdf8a4be9eb2..f8061c6ed4c1 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setInterval/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setInterval/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setTimeout/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setTimeout/test.ts index be46196aa754..c63f71650e8f 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setTimeout/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setTimeout/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setTimeoutFrozen/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setTimeoutFrozen/test.ts index 1fdee574b3f2..3ae6049d8c33 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setTimeoutFrozen/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setTimeoutFrozen/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/xhr/thrown-error/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/xhr/thrown-error/test.ts index 0a2114232e48..2e9f97915276 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/xhr/thrown-error/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/xhr/thrown-error/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/setContext/multiple_contexts/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setContext/multiple_contexts/test.ts index 8e11f0cfde64..dfaab3d05b1e 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/setContext/multiple_contexts/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/setContext/multiple_contexts/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/setContext/non_serializable_context/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setContext/non_serializable_context/test.ts index a54080159c2b..349ad39a3b57 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/setContext/non_serializable_context/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/setContext/non_serializable_context/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/setContext/simple_context/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setContext/simple_context/test.ts index 1697d8735ede..beccf31ec42b 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/setContext/simple_context/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/setContext/simple_context/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/setExtra/multiple_extras/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setExtra/multiple_extras/test.ts index e6d0b0a63f9e..6ba6202f2c4f 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/setExtra/multiple_extras/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/setExtra/multiple_extras/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/setExtra/non_serializable_extra/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setExtra/non_serializable_extra/test.ts index 3a107189fc16..742c0e19f070 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/setExtra/non_serializable_extra/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/setExtra/non_serializable_extra/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/setExtra/simple_extra/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setExtra/simple_extra/test.ts index 8c3557d9f047..6d235e6b752b 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/setExtra/simple_extra/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/setExtra/simple_extra/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/setExtras/consecutive_calls/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setExtras/consecutive_calls/test.ts index 64f9101b7057..c7b9e6a283b9 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/setExtras/consecutive_calls/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/setExtras/consecutive_calls/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/setExtras/multiple_extras/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setExtras/multiple_extras/test.ts index b57f70b80c2b..0e388d77b3ba 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/setExtras/multiple_extras/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/setExtras/multiple_extras/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/setTag/with_non_primitives/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setTag/with_non_primitives/test.ts index 2cbe0683e434..b270d7216d7a 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/setTag/with_non_primitives/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/setTag/with_non_primitives/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/setTag/with_primitives/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setTag/with_primitives/test.ts index 3eb7567247c7..04725491b24c 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/setTag/with_primitives/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/setTag/with_primitives/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/setTags/with_non_primitives/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setTags/with_non_primitives/test.ts index 2cbe0683e434..b270d7216d7a 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/setTags/with_non_primitives/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/setTags/with_non_primitives/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/setTags/with_primitives/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setTags/with_primitives/test.ts index 3eb7567247c7..04725491b24c 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/setTags/with_primitives/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/setTags/with_primitives/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/setUser/unset_user/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setUser/unset_user/test.ts index dbf5943c7814..ac3c06311bf9 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/setUser/unset_user/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/setUser/unset_user/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/setUser/update_user/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setUser/update_user/test.ts index 915265a9a030..38a18daf2c2f 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/setUser/update_user/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/setUser/update_user/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/circular_data/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/circular_data/test.ts index bb125b5f5448..e78d377ebdff 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/circular_data/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/circular_data/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-reject/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-reject/test.ts index 62beb28adcbe..b92de394703b 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-reject/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-reject/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-throw-not-awaited/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-throw-not-awaited/test.ts index 0bfb51c8863d..581e0bd61f9c 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-throw-not-awaited/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-throw-not-awaited/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-throw/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-throw/test.ts index 9d966312973f..bb9db67db038 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-throw/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-throw/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-sync/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-sync/test.ts index 1894cac93ec9..1930695c8f3e 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-sync/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-sync/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans-in-scope/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans-in-scope/test.ts index 8ad6e31eccce..6f46367a325f 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans-in-scope/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans-in-scope/test.ts @@ -1,6 +1,6 @@ import { expect } from '@playwright/test'; -import type { TransactionEvent } from '@sentry/types'; +import type { TransactionEvent } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans-with-parentSpanId/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans-with-parentSpanId/test.ts index 212e4808f3e7..2cc4381c8307 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans-with-parentSpanId/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans-with-parentSpanId/test.ts @@ -1,6 +1,6 @@ import { expect } from '@playwright/test'; -import type { TransactionEvent } from '@sentry/types'; +import type { TransactionEvent } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans/test.ts index 47e8e9fa3ac5..df60c3ee1aa3 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans/test.ts @@ -1,6 +1,6 @@ import { expect } from '@playwright/test'; -import type { TransactionEvent } from '@sentry/types'; +import type { TransactionEvent } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/setMeasurement/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/setMeasurement/test.ts index 535d2dd7fc70..a5f55babd291 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/setMeasurement/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/setMeasurement/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone-mixed-transaction/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone-mixed-transaction/test.ts index 7f3d21d22602..af87e11df37e 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone-mixed-transaction/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone-mixed-transaction/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Envelope, EventEnvelope, SpanEnvelope, TransactionEvent } from '@sentry/types'; +import type { Envelope, EventEnvelope, SpanEnvelope, TransactionEvent } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone/test.ts index d871ead881a9..a37a50f28e04 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { SpanEnvelope } from '@sentry/types'; +import type { SpanEnvelope } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { diff --git a/dev-packages/browser-integration-tests/suites/public-api/withScope/nested_scopes/test.ts b/dev-packages/browser-integration-tests/suites/public-api/withScope/nested_scopes/test.ts index 07708d3f6df9..be81e06a6e40 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/withScope/nested_scopes/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/withScope/nested_scopes/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/public-api/withScope/throwError/test.ts b/dev-packages/browser-integration-tests/suites/public-api/withScope/throwError/test.ts index 589b1e5c6f45..540cc36b2d10 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/withScope/throwError/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/withScope/throwError/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/replay/dsc/test.ts b/dev-packages/browser-integration-tests/suites/replay/dsc/test.ts index e95653f3cadc..1e4deae48871 100644 --- a/dev-packages/browser-integration-tests/suites/replay/dsc/test.ts +++ b/dev-packages/browser-integration-tests/suites/replay/dsc/test.ts @@ -1,6 +1,6 @@ import { expect } from '@playwright/test'; import type * as Sentry from '@sentry/browser'; -import type { EventEnvelopeHeaders } from '@sentry/types'; +import type { EventEnvelopeHeaders } from '@sentry/core'; import { sentryTest } from '../../../utils/fixtures'; import { diff --git a/dev-packages/browser-integration-tests/suites/sessions/initial-scope/test.ts b/dev-packages/browser-integration-tests/suites/sessions/initial-scope/test.ts index 985977a3f0a5..b3faacc6f88d 100644 --- a/dev-packages/browser-integration-tests/suites/sessions/initial-scope/test.ts +++ b/dev-packages/browser-integration-tests/suites/sessions/initial-scope/test.ts @@ -1,6 +1,6 @@ import type { Route } from '@playwright/test'; import { expect } from '@playwright/test'; -import type { SessionContext } from '@sentry/types'; +import type { SessionContext } from '@sentry/core'; import { sentryTest } from '../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/sessions/start-session/test.ts b/dev-packages/browser-integration-tests/suites/sessions/start-session/test.ts index 8a8243d81257..0dd12d17fe95 100644 --- a/dev-packages/browser-integration-tests/suites/sessions/start-session/test.ts +++ b/dev-packages/browser-integration-tests/suites/sessions/start-session/test.ts @@ -1,6 +1,6 @@ import type { Route } from '@playwright/test'; import { expect } from '@playwright/test'; -import type { SessionContext } from '@sentry/types'; +import type { SessionContext } from '@sentry/core'; import { sentryTest } from '../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/sessions/update-session/test.ts b/dev-packages/browser-integration-tests/suites/sessions/update-session/test.ts index 966b133dded1..3f1419d1615d 100644 --- a/dev-packages/browser-integration-tests/suites/sessions/update-session/test.ts +++ b/dev-packages/browser-integration-tests/suites/sessions/update-session/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { SessionContext } from '@sentry/types'; +import type { SessionContext } from '@sentry/core'; import { sentryTest } from '../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/sessions/v7-hub-start-session/test.ts b/dev-packages/browser-integration-tests/suites/sessions/v7-hub-start-session/test.ts index 8a8243d81257..0dd12d17fe95 100644 --- a/dev-packages/browser-integration-tests/suites/sessions/v7-hub-start-session/test.ts +++ b/dev-packages/browser-integration-tests/suites/sessions/v7-hub-start-session/test.ts @@ -1,6 +1,6 @@ import type { Route } from '@playwright/test'; import { expect } from '@playwright/test'; -import type { SessionContext } from '@sentry/types'; +import type { SessionContext } from '@sentry/core'; import { sentryTest } from '../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/stacktraces/protocol_containing_fn_identifiers/test.ts b/dev-packages/browser-integration-tests/suites/stacktraces/protocol_containing_fn_identifiers/test.ts index 884dea9c618c..1767e2b1c5b5 100644 --- a/dev-packages/browser-integration-tests/suites/stacktraces/protocol_containing_fn_identifiers/test.ts +++ b/dev-packages/browser-integration-tests/suites/stacktraces/protocol_containing_fn_identifiers/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/stacktraces/protocol_fn_identifiers/test.ts b/dev-packages/browser-integration-tests/suites/stacktraces/protocol_fn_identifiers/test.ts index a78c15963814..1179080c1770 100644 --- a/dev-packages/browser-integration-tests/suites/stacktraces/protocol_fn_identifiers/test.ts +++ b/dev-packages/browser-integration-tests/suites/stacktraces/protocol_fn_identifiers/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/stacktraces/regular_fn_identifiers/test.ts b/dev-packages/browser-integration-tests/suites/stacktraces/regular_fn_identifiers/test.ts index 7585a21521e0..62f84db7ea9e 100644 --- a/dev-packages/browser-integration-tests/suites/stacktraces/regular_fn_identifiers/test.ts +++ b/dev-packages/browser-integration-tests/suites/stacktraces/regular_fn_identifiers/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/async-spans/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/async-spans/test.ts index c9ffb2580615..eaf14c124260 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/async-spans/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/async-spans/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/backgroundtab-custom/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/backgroundtab-custom/test.ts index 2997f614aa26..3047f40e67e6 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/backgroundtab-custom/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/backgroundtab-custom/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { SpanJSON } from '@sentry/types'; +import type { SpanJSON } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/backgroundtab-pageload/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/backgroundtab-pageload/test.ts index 0dcd11ee0159..564138235bb3 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/backgroundtab-pageload/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/backgroundtab-pageload/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/error/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/error/test.ts index 3dbc9a90307c..fe48966ddd6e 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/error/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/error/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests, diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/http-timings/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/http-timings/test.ts index 8d6e9124a86e..c3532e4a298c 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/http-timings/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/http-timings/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/interactions/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/interactions/test.ts index 0bf03d3576ff..e8fa473e1a60 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/interactions/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/interactions/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event as SentryEvent } from '@sentry/types'; +import type { Event as SentryEvent } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-before-navigation/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-before-navigation/test.ts index a4804d0ff309..a9c63508faa0 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-before-navigation/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-before-navigation/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-disabled/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-disabled/test.ts index a0a263762186..a024358259c5 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-disabled/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-disabled/test.ts @@ -1,6 +1,6 @@ import type { Route } from '@playwright/test'; import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-enabled/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-enabled/test.ts index b2729a70f4cf..b127a1f674a1 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-enabled/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-enabled/test.ts @@ -1,6 +1,6 @@ import type { Route } from '@playwright/test'; import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/browser'; import { sentryTest } from '../../../../utils/fixtures'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-non-chromium/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-non-chromium/test.ts index 56d0456e9a2a..e59e9c96168b 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-non-chromium/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-non-chromium/test.ts @@ -1,6 +1,6 @@ import type { Route } from '@playwright/test'; import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-and-animation-frame-enabled/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-and-animation-frame-enabled/test.ts index a3ad1e98a069..51447ee84586 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-and-animation-frame-enabled/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-and-animation-frame-enabled/test.ts @@ -1,6 +1,6 @@ import type { Route } from '@playwright/test'; import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/browser'; import { sentryTest } from '../../../../utils/fixtures'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-before-navigation/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-before-navigation/test.ts index a2ac2817b853..2250fa234faf 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-before-navigation/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-before-navigation/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-disabled/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-disabled/test.ts index 47d212e44119..23b2d31b415e 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-disabled/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-disabled/test.ts @@ -1,6 +1,6 @@ import type { Route } from '@playwright/test'; import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-enabled/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-enabled/test.ts index e0c655836561..c9c1a42ddb1a 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-enabled/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-enabled/test.ts @@ -1,6 +1,6 @@ import type { Route } from '@playwright/test'; import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-no-animation-frame/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-no-animation-frame/test.ts index e0c655836561..c9c1a42ddb1a 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-no-animation-frame/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-no-animation-frame/test.ts @@ -1,6 +1,6 @@ import type { Route } from '@playwright/test'; import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/meta/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/meta/test.ts index b33ea0cc444c..39cad4b8f7d0 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/meta/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/meta/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event, EventEnvelopeHeaders } from '@sentry/types'; +import type { Event, EventEnvelopeHeaders } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/navigation/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/navigation/test.ts index 59939b0a6973..5e22d9a8d502 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/navigation/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/navigation/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload-update-txn-name/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload-update-txn-name/test.ts index 14a95ed9e29e..6226ff75dbb9 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload-update-txn-name/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload-update-txn-name/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { SEMANTIC_ATTRIBUTE_SENTRY_OP, diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload/test.ts index 6f855168ebce..6be7a5cbb9a4 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { SEMANTIC_ATTRIBUTE_SENTRY_OP, diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadDelayed/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadDelayed/test.ts index e0adc33e6271..cf14c46d47a7 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadDelayed/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadDelayed/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/dsc-txn-name-update/test.ts b/dev-packages/browser-integration-tests/suites/tracing/dsc-txn-name-update/test.ts index 41003a133b34..7ce5f7195a5b 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/dsc-txn-name-update/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/dsc-txn-name-update/test.ts @@ -1,6 +1,6 @@ import { expect } from '@playwright/test'; import type { Page } from '@playwright/test'; -import type { DynamicSamplingContext } from '@sentry/types'; +import type { DynamicSamplingContext } from '@sentry/core'; import { sentryTest } from '../../../utils/fixtures'; import type { EventAndTraceHeader } from '../../../utils/helpers'; import { diff --git a/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts b/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts index f2f4b10ede46..11d00ad2a449 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { EventEnvelopeHeaders } from '@sentry/types'; +import type { EventEnvelopeHeaders } from '@sentry/core'; import { sentryTest } from '../../../utils/fixtures'; import { diff --git a/dev-packages/browser-integration-tests/suites/tracing/envelope-header/test.ts b/dev-packages/browser-integration-tests/suites/tracing/envelope-header/test.ts index fdfbac823166..9a2a135a6ec7 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/envelope-header/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/envelope-header/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { EventEnvelopeHeaders } from '@sentry/types'; +import type { EventEnvelopeHeaders } from '@sentry/core'; import { sentryTest } from '../../../utils/fixtures'; import { diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/connection-rtt/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/connection-rtt/test.ts index 145c718dd151..a3ec0c93bce8 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/metrics/connection-rtt/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/connection-rtt/test.ts @@ -1,6 +1,6 @@ import type { Page } from '@playwright/test'; import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/handlers-lcp/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/handlers-lcp/test.ts index 78b48dc5a7f5..625c2a8f6d9a 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/metrics/handlers-lcp/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/handlers-lcp/test.ts @@ -1,6 +1,6 @@ import type { Route } from '@playwright/test'; import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-browser-spans/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-browser-spans/test.ts index 3fb942f4aa67..4e840fd96cae 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-browser-spans/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-browser-spans/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-measure-spans/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-measure-spans/test.ts index 7f2e2fae9021..acc50d68a070 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-measure-spans/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-measure-spans/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-resource-spans/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-resource-spans/test.ts index 152cadf80418..2343d77f55c7 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-resource-spans/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-resource-spans/test.ts @@ -1,6 +1,6 @@ import type { Route } from '@playwright/test'; import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls-standalone-spans/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls-standalone-spans/test.ts index b27d747df649..d227c0aaf575 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls-standalone-spans/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls-standalone-spans/test.ts @@ -1,6 +1,6 @@ import type { Page } from '@playwright/test'; import { expect } from '@playwright/test'; -import type { Event as SentryEvent, EventEnvelope, SpanEnvelope } from '@sentry/types'; +import type { Event as SentryEvent, EventEnvelope, SpanEnvelope } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls/test.ts index 64ccba5d9b35..61c0a20e1506 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fid/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fid/test.ts index 469660563a4e..663774a23920 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fid/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fid/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fp-fcp/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fp-fcp/test.ts index bcdf9e232329..176d81edd930 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fp-fcp/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fp-fcp/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-late/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-late/test.ts index 438c9c5f6ecd..61962bd40593 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-late/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-late/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event as SentryEvent, SpanEnvelope } from '@sentry/types'; +import type { Event as SentryEvent, SpanEnvelope } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized-late/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized-late/test.ts index c68903f23e71..788c168067bd 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized-late/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized-late/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event as SentryEvent, SpanEnvelope } from '@sentry/types'; +import type { Event as SentryEvent, SpanEnvelope } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized/test.ts index 4f3c262d780d..5da11a8caae3 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { SpanEnvelope } from '@sentry/types'; +import type { SpanEnvelope } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp/test.ts index ab2146185b72..0a159db4dc31 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event as SentryEvent, SpanEnvelope, SpanJSON } from '@sentry/types'; +import type { Event as SentryEvent, SpanEnvelope, SpanJSON } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-lcp/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-lcp/test.ts index 84e93b54ac9b..1cfee3b670a7 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-lcp/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-lcp/test.ts @@ -1,6 +1,6 @@ import type { Route } from '@playwright/test'; import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-ttfb/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-ttfb/test.ts index e135601f7ddf..602b4671f342 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-ttfb/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-ttfb/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals/test.ts index c41efad620ac..3f29c0614f14 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals/test.ts @@ -1,6 +1,6 @@ import type { Route } from '@playwright/test'; import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/fetch/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/fetch/test.ts index 53ff985a3f1b..2e06e5157994 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/request/fetch/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/request/fetch/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/xhr/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/xhr/test.ts index 5cc65c872c08..29387eaccfc0 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/request/xhr/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/request/xhr/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/navigation/test.ts b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/navigation/test.ts index f6cb0a413878..cd1e79c211aa 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/navigation/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/navigation/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import type { EventAndTraceHeader } from '../../../../utils/helpers'; import { shouldSkipFeedbackTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload-meta/test.ts b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload-meta/test.ts index bdfe0521c433..d102ad4c128e 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload-meta/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload-meta/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import type { EventAndTraceHeader } from '../../../../utils/helpers'; import { shouldSkipFeedbackTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload/test.ts b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload/test.ts index c9e07869a237..00bbb26740de 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import type { EventAndTraceHeader } from '../../../../utils/helpers'; import { shouldSkipFeedbackTest } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/suites/transport/offline/queued/test.ts b/dev-packages/browser-integration-tests/suites/transport/offline/queued/test.ts index 4cd9b1e8fdff..9b6eb36fd0ea 100644 --- a/dev-packages/browser-integration-tests/suites/transport/offline/queued/test.ts +++ b/dev-packages/browser-integration-tests/suites/transport/offline/queued/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers'; diff --git a/dev-packages/browser-integration-tests/utils/generatePlugin.ts b/dev-packages/browser-integration-tests/utils/generatePlugin.ts index 26a086bf2a77..c3b515ada32d 100644 --- a/dev-packages/browser-integration-tests/utils/generatePlugin.ts +++ b/dev-packages/browser-integration-tests/utils/generatePlugin.ts @@ -1,6 +1,6 @@ import fs from 'fs'; import path from 'path'; -import type { Package } from '@sentry/types'; +import type { Package } from '@sentry/core'; import HtmlWebpackPlugin, { createHtmlTagObject } from 'html-webpack-plugin'; import type { Compiler } from 'webpack'; diff --git a/dev-packages/browser-integration-tests/utils/helpers.ts b/dev-packages/browser-integration-tests/utils/helpers.ts index 34e591cad0dc..df60adfcaabb 100644 --- a/dev-packages/browser-integration-tests/utils/helpers.ts +++ b/dev-packages/browser-integration-tests/utils/helpers.ts @@ -8,7 +8,7 @@ import type { EventEnvelope, EventEnvelopeHeaders, TransactionEvent, -} from '@sentry/types'; +} from '@sentry/core'; export const envelopeUrlRegex = /\.sentry\.io\/api\/\d+\/envelope\//; diff --git a/dev-packages/browser-integration-tests/utils/replayEventTemplates.ts b/dev-packages/browser-integration-tests/utils/replayEventTemplates.ts index 40e303e9b0cb..63152d54870b 100644 --- a/dev-packages/browser-integration-tests/utils/replayEventTemplates.ts +++ b/dev-packages/browser-integration-tests/utils/replayEventTemplates.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-function-return-type */ import { expect } from '@playwright/test'; import { SDK_VERSION } from '@sentry/browser'; -import type { ReplayEvent } from '@sentry/types'; +import type { ReplayEvent } from '@sentry/core'; const DEFAULT_REPLAY_EVENT = { type: 'replay_event', diff --git a/dev-packages/browser-integration-tests/utils/replayHelpers.ts b/dev-packages/browser-integration-tests/utils/replayHelpers.ts index 36727664dce3..e090eba48200 100644 --- a/dev-packages/browser-integration-tests/utils/replayHelpers.ts +++ b/dev-packages/browser-integration-tests/utils/replayHelpers.ts @@ -11,7 +11,7 @@ import type { import type { fullSnapshotEvent, incrementalSnapshotEvent } from '@sentry-internal/rrweb'; import { EventType } from '@sentry-internal/rrweb'; import type { ReplayEventWithTime } from '@sentry/browser'; -import type { Breadcrumb, Event, ReplayEvent, ReplayRecordingMode } from '@sentry/types'; +import type { Breadcrumb, Event, ReplayEvent, ReplayRecordingMode } from '@sentry/core'; import pako from 'pako'; import { envelopeRequestParser } from './helpers'; diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express-legacy/package.json b/dev-packages/e2e-tests/test-applications/create-remix-app-express-legacy/package.json index 1b9747d95bdf..047218b29e3f 100644 --- a/dev-packages/e2e-tests/test-applications/create-remix-app-express-legacy/package.json +++ b/dev-packages/e2e-tests/test-applications/create-remix-app-express-legacy/package.json @@ -31,7 +31,6 @@ "@playwright/test": "^1.44.1", "@sentry-internal/test-utils": "link:../../../test-utils", "@remix-run/dev": "^2.7.2", - "@sentry/types": "latest || *", "@sentry/core": "latest || *", "@types/compression": "^1.7.2", "@types/express": "^4.17.17", diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/package.json b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/package.json index 534078696906..6e9f884bedde 100644 --- a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/package.json +++ b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/package.json @@ -28,7 +28,6 @@ "@playwright/test": "^1.44.1", "@sentry-internal/test-utils": "link:../../../test-utils", "@remix-run/dev": "^2.7.2", - "@sentry/types": "latest || *", "@sentry/core": "latest || *", "@types/compression": "^1.7.5", "@types/express": "^4.17.20", diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express/package.json b/dev-packages/e2e-tests/test-applications/create-remix-app-express/package.json index 1b9747d95bdf..047218b29e3f 100644 --- a/dev-packages/e2e-tests/test-applications/create-remix-app-express/package.json +++ b/dev-packages/e2e-tests/test-applications/create-remix-app-express/package.json @@ -31,7 +31,6 @@ "@playwright/test": "^1.44.1", "@sentry-internal/test-utils": "link:../../../test-utils", "@remix-run/dev": "^2.7.2", - "@sentry/types": "latest || *", "@sentry/core": "latest || *", "@types/compression": "^1.7.2", "@types/express": "^4.17.17", diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-legacy/package.json b/dev-packages/e2e-tests/test-applications/create-remix-app-legacy/package.json index 1bd69b66ff67..1d99cf43d3b6 100644 --- a/dev-packages/e2e-tests/test-applications/create-remix-app-legacy/package.json +++ b/dev-packages/e2e-tests/test-applications/create-remix-app-legacy/package.json @@ -29,7 +29,6 @@ "@remix-run/eslint-config": "^1.19.3", "@types/react": "^18.0.35", "@types/react-dom": "^18.0.11", - "@sentry/types": "latest || *", "@sentry/core": "latest || *", "eslint": "^8.38.0", "typescript": "^5.0.4" diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-legacy/package.json b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-legacy/package.json index 93938b75c6a1..3772ea5c76f6 100644 --- a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-legacy/package.json +++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-legacy/package.json @@ -25,7 +25,6 @@ "@sentry-internal/test-utils": "link:../../../test-utils", "@remix-run/dev": "2.7.2", "@remix-run/eslint-config": "2.7.2", - "@sentry/types": "latest || *", "@sentry/core": "latest || *", "@types/react": "^18.0.35", "@types/react-dom": "^18.0.11", diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2/package.json b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/package.json index 17adb9ace8ae..d1600004d97f 100644 --- a/dev-packages/e2e-tests/test-applications/create-remix-app-v2/package.json +++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/package.json @@ -25,7 +25,6 @@ "@sentry-internal/test-utils": "link:../../../test-utils", "@remix-run/dev": "2.7.2", "@remix-run/eslint-config": "2.7.2", - "@sentry/types": "latest || *", "@sentry/core": "latest || *", "@types/react": "^18.0.35", "@types/react-dom": "^18.0.11", diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app/package.json b/dev-packages/e2e-tests/test-applications/create-remix-app/package.json index a3210d7c3187..34ec42143c9e 100644 --- a/dev-packages/e2e-tests/test-applications/create-remix-app/package.json +++ b/dev-packages/e2e-tests/test-applications/create-remix-app/package.json @@ -29,7 +29,6 @@ "@remix-run/eslint-config": "^1.19.3", "@types/react": "^18.0.35", "@types/react-dom": "^18.0.11", - "@sentry/types": "latest || *", "@sentry/core": "latest || *", "eslint": "^8.38.0", "typescript": "^5.0.4" diff --git a/dev-packages/e2e-tests/test-applications/generic-ts3.8/index.ts b/dev-packages/e2e-tests/test-applications/generic-ts3.8/index.ts index 0a78073e88ae..03cebd495539 100644 --- a/dev-packages/e2e-tests/test-applications/generic-ts3.8/index.ts +++ b/dev-packages/e2e-tests/test-applications/generic-ts3.8/index.ts @@ -7,8 +7,4 @@ import * as _SentryCore from '@sentry/core'; // biome-ignore lint/nursery/noUnusedImports: import * as _SentryNode from '@sentry/node'; // biome-ignore lint/nursery/noUnusedImports: -import * as _SentryTypes from '@sentry/types'; -// biome-ignore lint/nursery/noUnusedImports: -import * as _SentryUtils from '@sentry/utils'; -// biome-ignore lint/nursery/noUnusedImports: import * as _SentryWasm from '@sentry/wasm'; diff --git a/dev-packages/e2e-tests/test-applications/generic-ts3.8/package.json b/dev-packages/e2e-tests/test-applications/generic-ts3.8/package.json index eda13af9e170..77bebc280ea4 100644 --- a/dev-packages/e2e-tests/test-applications/generic-ts3.8/package.json +++ b/dev-packages/e2e-tests/test-applications/generic-ts3.8/package.json @@ -18,8 +18,6 @@ "@sentry/core": "latest || *", "@sentry/node": "latest || *", "@sentry-internal/replay": "latest || *", - "@sentry/types": "latest || *", - "@sentry/core": "latest || *", "@sentry/wasm": "latest || *" } } diff --git a/dev-packages/e2e-tests/test-applications/nestjs-8/package.json b/dev-packages/e2e-tests/test-applications/nestjs-8/package.json index 9cf681c33ef5..20724e8d3b78 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-8/package.json +++ b/dev-packages/e2e-tests/test-applications/nestjs-8/package.json @@ -21,7 +21,6 @@ "@nestjs/schedule": "^4.1.0", "@nestjs/platform-express": "^8.0.0", "@sentry/nestjs": "latest || *", - "@sentry/types": "latest || *", "reflect-metadata": "^0.2.0", "rxjs": "^7.8.1" }, diff --git a/dev-packages/e2e-tests/test-applications/nestjs-8/src/app.service.ts b/dev-packages/e2e-tests/test-applications/nestjs-8/src/app.service.ts index 72aef6947a6c..6b6b01411c0c 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-8/src/app.service.ts +++ b/dev-packages/e2e-tests/test-applications/nestjs-8/src/app.service.ts @@ -1,9 +1,9 @@ import { HttpException, HttpStatus, Injectable } from '@nestjs/common'; import { RpcException } from '@nestjs/microservices'; import { Cron, SchedulerRegistry } from '@nestjs/schedule'; +import type { MonitorConfig } from '@sentry/core'; import * as Sentry from '@sentry/nestjs'; import { SentryCron, SentryTraced } from '@sentry/nestjs'; -import type { MonitorConfig } from '@sentry/types'; const monitorConfig: MonitorConfig = { schedule: { diff --git a/dev-packages/e2e-tests/test-applications/nestjs-basic/package.json b/dev-packages/e2e-tests/test-applications/nestjs-basic/package.json index f7a0da2fc403..44dcda348383 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-basic/package.json +++ b/dev-packages/e2e-tests/test-applications/nestjs-basic/package.json @@ -21,7 +21,6 @@ "@nestjs/schedule": "^4.1.0", "@nestjs/platform-express": "^10.0.0", "@sentry/nestjs": "latest || *", - "@sentry/types": "latest || *", "reflect-metadata": "^0.2.0", "rxjs": "^7.8.1" }, diff --git a/dev-packages/e2e-tests/test-applications/nestjs-basic/src/app.service.ts b/dev-packages/e2e-tests/test-applications/nestjs-basic/src/app.service.ts index 067282dd1ee2..242b4c778a0e 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-basic/src/app.service.ts +++ b/dev-packages/e2e-tests/test-applications/nestjs-basic/src/app.service.ts @@ -1,9 +1,9 @@ import { HttpException, HttpStatus, Injectable } from '@nestjs/common'; import { RpcException } from '@nestjs/microservices'; import { Cron, SchedulerRegistry } from '@nestjs/schedule'; +import type { MonitorConfig } from '@sentry/core'; import * as Sentry from '@sentry/nestjs'; import { SentryCron, SentryTraced } from '@sentry/nestjs'; -import type { MonitorConfig } from '@sentry/types'; const monitorConfig: MonitorConfig = { schedule: { diff --git a/dev-packages/e2e-tests/test-applications/nestjs-distributed-tracing/package.json b/dev-packages/e2e-tests/test-applications/nestjs-distributed-tracing/package.json index efc52a8a4db9..6efae6b1c0d5 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-distributed-tracing/package.json +++ b/dev-packages/e2e-tests/test-applications/nestjs-distributed-tracing/package.json @@ -20,7 +20,6 @@ "@nestjs/platform-express": "^10.0.0", "@nestjs/event-emitter": "^2.0.0", "@sentry/nestjs": "latest || *", - "@sentry/types": "latest || *", "reflect-metadata": "^0.2.0", "rxjs": "^7.8.1" }, diff --git a/dev-packages/e2e-tests/test-applications/nestjs-distributed-tracing/tests/propagation.test.ts b/dev-packages/e2e-tests/test-applications/nestjs-distributed-tracing/tests/propagation.test.ts index d928deac08fd..6f5045b0c90f 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-distributed-tracing/tests/propagation.test.ts +++ b/dev-packages/e2e-tests/test-applications/nestjs-distributed-tracing/tests/propagation.test.ts @@ -1,7 +1,7 @@ import crypto from 'crypto'; import { expect, test } from '@playwright/test'; import { waitForTransaction } from '@sentry-internal/test-utils'; -import { SpanJSON } from '@sentry/types'; +import { SpanJSON } from '@sentry/core'; test('Propagates trace for outgoing http requests', async ({ baseURL }) => { const id = crypto.randomUUID(); diff --git a/dev-packages/e2e-tests/test-applications/nestjs-graphql/package.json b/dev-packages/e2e-tests/test-applications/nestjs-graphql/package.json index 91f495776575..2463d24df940 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-graphql/package.json +++ b/dev-packages/e2e-tests/test-applications/nestjs-graphql/package.json @@ -22,7 +22,6 @@ "@nestjs/graphql": "^12.2.0", "@nestjs/platform-express": "^10.3.10", "@sentry/nestjs": "latest || *", - "@sentry/types": "latest || *", "graphql": "^16.9.0", "reflect-metadata": "^0.1.13", "rxjs": "^7.8.1" diff --git a/dev-packages/e2e-tests/test-applications/nestjs-with-submodules-decorator/package.json b/dev-packages/e2e-tests/test-applications/nestjs-with-submodules-decorator/package.json index 9cc3641d2322..0b03e38ccbdb 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-with-submodules-decorator/package.json +++ b/dev-packages/e2e-tests/test-applications/nestjs-with-submodules-decorator/package.json @@ -19,7 +19,6 @@ "@nestjs/core": "^10.0.0", "@nestjs/platform-express": "^10.0.0", "@sentry/nestjs": "latest || *", - "@sentry/types": "latest || *", "reflect-metadata": "^0.2.0", "rxjs": "^7.8.1" }, diff --git a/dev-packages/e2e-tests/test-applications/nestjs-with-submodules/package.json b/dev-packages/e2e-tests/test-applications/nestjs-with-submodules/package.json index dfbe5e83e640..8f90e1582598 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-with-submodules/package.json +++ b/dev-packages/e2e-tests/test-applications/nestjs-with-submodules/package.json @@ -19,7 +19,6 @@ "@nestjs/core": "^10.0.0", "@nestjs/platform-express": "^10.0.0", "@sentry/nestjs": "latest || *", - "@sentry/types": "latest || *", "reflect-metadata": "^0.2.0", "rxjs": "^7.8.1" }, diff --git a/dev-packages/e2e-tests/test-applications/nextjs-13/package.json b/dev-packages/e2e-tests/test-applications/nextjs-13/package.json index 51eaf9bf9fb4..81e4b844d072 100644 --- a/dev-packages/e2e-tests/test-applications/nextjs-13/package.json +++ b/dev-packages/e2e-tests/test-applications/nextjs-13/package.json @@ -35,7 +35,6 @@ "@sentry/node": "latest || *", "@sentry/opentelemetry": "latest || *", "@sentry/react": "latest || *", - "@sentry/types": "latest || *", "@sentry/vercel-edge": "latest || *" }, "volta": { diff --git a/dev-packages/e2e-tests/test-applications/nextjs-14/package.json b/dev-packages/e2e-tests/test-applications/nextjs-14/package.json index f4569e1f6ceb..b03722a5dccc 100644 --- a/dev-packages/e2e-tests/test-applications/nextjs-14/package.json +++ b/dev-packages/e2e-tests/test-applications/nextjs-14/package.json @@ -35,7 +35,6 @@ "@sentry/opentelemetry": "latest || *", "@sentry/react": "latest || *", "@sentry-internal/replay": "latest || *", - "@sentry/types": "latest || *", "@sentry/vercel-edge": "latest || *" }, "volta": { diff --git a/dev-packages/e2e-tests/test-applications/nextjs-15/package.json b/dev-packages/e2e-tests/test-applications/nextjs-15/package.json index 6e9fb6af5b07..19638112649e 100644 --- a/dev-packages/e2e-tests/test-applications/nextjs-15/package.json +++ b/dev-packages/e2e-tests/test-applications/nextjs-15/package.json @@ -36,7 +36,6 @@ "@sentry/opentelemetry": "latest || *", "@sentry/react": "latest || *", "@sentry-internal/replay": "latest || *", - "@sentry/types": "latest || *", "@sentry/vercel-edge": "latest || *" }, "volta": { diff --git a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/components/span-context.tsx b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/components/span-context.tsx index 81a6f404d0f4..1375b7e9cd4c 100644 --- a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/components/span-context.tsx +++ b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/components/span-context.tsx @@ -1,7 +1,7 @@ 'use client'; +import { Span } from '@sentry/core'; import { startInactiveSpan } from '@sentry/nextjs'; -import { Span } from '@sentry/types'; import { PropsWithChildren, createContext, useState } from 'react'; export const SpanContext = createContext< diff --git a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/package.json b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/package.json index 91791b89be75..dd145692aa23 100644 --- a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/package.json +++ b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/package.json @@ -37,7 +37,6 @@ "@sentry/opentelemetry": "latest || *", "@sentry/react": "latest || *", "@sentry-internal/replay": "latest || *", - "@sentry/types": "latest || *", "@sentry/vercel-edge": "latest || *", "ts-node": "10.9.1" }, diff --git a/dev-packages/e2e-tests/test-applications/nextjs-turbo/package.json b/dev-packages/e2e-tests/test-applications/nextjs-turbo/package.json index 03d8a71dbcae..4ca726c474b8 100644 --- a/dev-packages/e2e-tests/test-applications/nextjs-turbo/package.json +++ b/dev-packages/e2e-tests/test-applications/nextjs-turbo/package.json @@ -35,7 +35,6 @@ "@sentry/opentelemetry": "latest || *", "@sentry/react": "latest || *", "@sentry-internal/replay": "latest || *", - "@sentry/types": "latest || *", "@sentry/vercel-edge": "latest || *", "import-in-the-middle": "1.11.2" }, diff --git a/dev-packages/e2e-tests/test-applications/node-connect/package.json b/dev-packages/e2e-tests/test-applications/node-connect/package.json index bf2ec590b285..276e8654f8f4 100644 --- a/dev-packages/e2e-tests/test-applications/node-connect/package.json +++ b/dev-packages/e2e-tests/test-applications/node-connect/package.json @@ -12,7 +12,6 @@ }, "dependencies": { "@sentry/node": "latest || *", - "@sentry/types": "latest || *", "@sentry/core": "latest || *", "@sentry/opentelemetry": "latest || *", "@types/node": "18.15.1", diff --git a/dev-packages/e2e-tests/test-applications/node-exports-test-app/package.json b/dev-packages/e2e-tests/test-applications/node-exports-test-app/package.json index 574371f84c15..5be4d29bbb38 100644 --- a/dev-packages/e2e-tests/test-applications/node-exports-test-app/package.json +++ b/dev-packages/e2e-tests/test-applications/node-exports-test-app/package.json @@ -20,7 +20,6 @@ "@sentry/aws-serverless": "latest || *", "@sentry/google-cloud-serverless": "latest || *", "@sentry/bun": "latest || *", - "@sentry/types": "latest || *", "@types/node": "18.15.1", "typescript": "4.9.5" }, diff --git a/dev-packages/e2e-tests/test-applications/node-express-incorrect-instrumentation/package.json b/dev-packages/e2e-tests/test-applications/node-express-incorrect-instrumentation/package.json index a8b325bc075d..391514a2c1dd 100644 --- a/dev-packages/e2e-tests/test-applications/node-express-incorrect-instrumentation/package.json +++ b/dev-packages/e2e-tests/test-applications/node-express-incorrect-instrumentation/package.json @@ -13,7 +13,6 @@ "dependencies": { "@sentry/core": "latest || *", "@sentry/node": "latest || *", - "@sentry/types": "latest || *", "@trpc/server": "10.45.2", "@trpc/client": "10.45.2", "@types/express": "4.17.17", diff --git a/dev-packages/e2e-tests/test-applications/node-express-send-to-sentry/package.json b/dev-packages/e2e-tests/test-applications/node-express-send-to-sentry/package.json index 5a1b9b7d8300..49e98e2c49ad 100644 --- a/dev-packages/e2e-tests/test-applications/node-express-send-to-sentry/package.json +++ b/dev-packages/e2e-tests/test-applications/node-express-send-to-sentry/package.json @@ -13,7 +13,6 @@ "dependencies": { "@sentry/core": "latest || *", "@sentry/node": "latest || *", - "@sentry/types": "latest || *", "@types/express": "4.17.17", "@types/node": "18.15.1", "express": "4.19.2", diff --git a/dev-packages/e2e-tests/test-applications/node-express/package.json b/dev-packages/e2e-tests/test-applications/node-express/package.json index 97947e70d06e..bc0b9b4dead7 100644 --- a/dev-packages/e2e-tests/test-applications/node-express/package.json +++ b/dev-packages/e2e-tests/test-applications/node-express/package.json @@ -13,7 +13,6 @@ "dependencies": { "@sentry/core": "latest || *", "@sentry/node": "latest || *", - "@sentry/types": "latest || *", "@trpc/server": "10.45.2", "@trpc/client": "10.45.2", "@types/express": "4.17.17", diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-5/package.json b/dev-packages/e2e-tests/test-applications/node-fastify-5/package.json index c60d9a3dae51..e0a000572a25 100644 --- a/dev-packages/e2e-tests/test-applications/node-fastify-5/package.json +++ b/dev-packages/e2e-tests/test-applications/node-fastify-5/package.json @@ -12,7 +12,6 @@ }, "dependencies": { "@sentry/node": "latest || *", - "@sentry/types": "latest || *", "@sentry/core": "latest || *", "@sentry/opentelemetry": "latest || *", "@types/node": "22.7.5", diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-5/tests/propagation.test.ts b/dev-packages/e2e-tests/test-applications/node-fastify-5/tests/propagation.test.ts index 050ce19c6a3c..95e249034fd5 100644 --- a/dev-packages/e2e-tests/test-applications/node-fastify-5/tests/propagation.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-fastify-5/tests/propagation.test.ts @@ -1,7 +1,7 @@ import crypto from 'crypto'; import { expect, test } from '@playwright/test'; import { waitForTransaction } from '@sentry-internal/test-utils'; -import { SpanJSON } from '@sentry/types'; +import { SpanJSON } from '@sentry/core'; test('Propagates trace for outgoing http requests', async ({ baseURL }) => { const id = crypto.randomUUID(); diff --git a/dev-packages/e2e-tests/test-applications/node-fastify/package.json b/dev-packages/e2e-tests/test-applications/node-fastify/package.json index 0478786cd499..b657eddd1de1 100644 --- a/dev-packages/e2e-tests/test-applications/node-fastify/package.json +++ b/dev-packages/e2e-tests/test-applications/node-fastify/package.json @@ -12,7 +12,6 @@ }, "dependencies": { "@sentry/node": "latest || *", - "@sentry/types": "latest || *", "@sentry/core": "latest || *", "@sentry/opentelemetry": "latest || *", "@types/node": "18.15.1", diff --git a/dev-packages/e2e-tests/test-applications/node-fastify/tests/propagation.test.ts b/dev-packages/e2e-tests/test-applications/node-fastify/tests/propagation.test.ts index d2e9a188da9f..e077ef6f1e7d 100644 --- a/dev-packages/e2e-tests/test-applications/node-fastify/tests/propagation.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-fastify/tests/propagation.test.ts @@ -1,7 +1,7 @@ import crypto from 'crypto'; import { expect, test } from '@playwright/test'; import { waitForTransaction } from '@sentry-internal/test-utils'; -import { SpanJSON } from '@sentry/types'; +import { SpanJSON } from '@sentry/core'; test('Propagates trace for outgoing http requests', async ({ baseURL }) => { const id = crypto.randomUUID(); diff --git a/dev-packages/e2e-tests/test-applications/node-hapi/package.json b/dev-packages/e2e-tests/test-applications/node-hapi/package.json index 47db96a4a666..2eda8acc7589 100644 --- a/dev-packages/e2e-tests/test-applications/node-hapi/package.json +++ b/dev-packages/e2e-tests/test-applications/node-hapi/package.json @@ -13,8 +13,7 @@ "dependencies": { "@hapi/boom": "10.0.1", "@hapi/hapi": "21.3.10", - "@sentry/node": "latest || *", - "@sentry/types": "latest || *" + "@sentry/node": "latest || *" }, "devDependencies": { "@playwright/test": "^1.44.1", diff --git a/dev-packages/e2e-tests/test-applications/node-koa/package.json b/dev-packages/e2e-tests/test-applications/node-koa/package.json index dd8a17d0f4b5..0f6ed61216db 100644 --- a/dev-packages/e2e-tests/test-applications/node-koa/package.json +++ b/dev-packages/e2e-tests/test-applications/node-koa/package.json @@ -13,7 +13,6 @@ "@koa/bodyparser": "^5.1.1", "@koa/router": "^12.0.1", "@sentry/node": "latest || *", - "@sentry/types": "latest || *", "@types/node": "18.15.1", "koa": "^2.15.2", "typescript": "4.9.5" diff --git a/dev-packages/e2e-tests/test-applications/node-koa/tests/propagation.test.ts b/dev-packages/e2e-tests/test-applications/node-koa/tests/propagation.test.ts index 1f5413af0cbe..5d90c9b5647e 100644 --- a/dev-packages/e2e-tests/test-applications/node-koa/tests/propagation.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-koa/tests/propagation.test.ts @@ -1,7 +1,7 @@ import crypto from 'crypto'; import { expect, test } from '@playwright/test'; import { waitForTransaction } from '@sentry-internal/test-utils'; -import { SpanJSON } from '@sentry/types'; +import { SpanJSON } from '@sentry/core'; test('Propagates trace for outgoing http requests', async ({ baseURL }) => { const id = crypto.randomUUID(); diff --git a/dev-packages/e2e-tests/test-applications/node-nestjs-basic/package.json b/dev-packages/e2e-tests/test-applications/node-nestjs-basic/package.json index b7334026d18f..ed286d4c6886 100644 --- a/dev-packages/e2e-tests/test-applications/node-nestjs-basic/package.json +++ b/dev-packages/e2e-tests/test-applications/node-nestjs-basic/package.json @@ -21,7 +21,6 @@ "@nestjs/schedule": "^4.1.0", "@nestjs/platform-express": "^10.0.0", "@sentry/nestjs": "latest || *", - "@sentry/types": "latest || *", "reflect-metadata": "^0.2.0", "rxjs": "^7.8.1" }, diff --git a/dev-packages/e2e-tests/test-applications/node-nestjs-basic/src/app.service.ts b/dev-packages/e2e-tests/test-applications/node-nestjs-basic/src/app.service.ts index 3e4639040a7e..3241e05768ec 100644 --- a/dev-packages/e2e-tests/test-applications/node-nestjs-basic/src/app.service.ts +++ b/dev-packages/e2e-tests/test-applications/node-nestjs-basic/src/app.service.ts @@ -1,9 +1,9 @@ import { HttpException, HttpStatus, Injectable } from '@nestjs/common'; import { RpcException } from '@nestjs/microservices'; import { Cron, SchedulerRegistry } from '@nestjs/schedule'; +import type { MonitorConfig } from '@sentry/core'; import * as Sentry from '@sentry/nestjs'; import { SentryCron, SentryTraced } from '@sentry/nestjs'; -import type { MonitorConfig } from '@sentry/types'; const monitorConfig: MonitorConfig = { schedule: { diff --git a/dev-packages/e2e-tests/test-applications/node-nestjs-distributed-tracing/package.json b/dev-packages/e2e-tests/test-applications/node-nestjs-distributed-tracing/package.json index ad61f9a77ad4..f6fbc916ad68 100644 --- a/dev-packages/e2e-tests/test-applications/node-nestjs-distributed-tracing/package.json +++ b/dev-packages/e2e-tests/test-applications/node-nestjs-distributed-tracing/package.json @@ -19,7 +19,6 @@ "@nestjs/core": "^10.0.0", "@nestjs/platform-express": "^10.0.0", "@sentry/nestjs": "latest || *", - "@sentry/types": "latest || *", "reflect-metadata": "^0.2.0", "rxjs": "^7.8.1" }, diff --git a/dev-packages/e2e-tests/test-applications/node-nestjs-distributed-tracing/tests/propagation.test.ts b/dev-packages/e2e-tests/test-applications/node-nestjs-distributed-tracing/tests/propagation.test.ts index 49b827ca7e27..1e9f7f38b26c 100644 --- a/dev-packages/e2e-tests/test-applications/node-nestjs-distributed-tracing/tests/propagation.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-nestjs-distributed-tracing/tests/propagation.test.ts @@ -1,7 +1,7 @@ import crypto from 'crypto'; import { expect, test } from '@playwright/test'; import { waitForTransaction } from '@sentry-internal/test-utils'; -import { SpanJSON } from '@sentry/types'; +import { SpanJSON } from '@sentry/core'; test('Propagates trace for outgoing http requests', async ({ baseURL }) => { const id = crypto.randomUUID(); diff --git a/dev-packages/e2e-tests/test-applications/node-otel-custom-sampler/package.json b/dev-packages/e2e-tests/test-applications/node-otel-custom-sampler/package.json index 3507981ff013..30cd21643eb8 100644 --- a/dev-packages/e2e-tests/test-applications/node-otel-custom-sampler/package.json +++ b/dev-packages/e2e-tests/test-applications/node-otel-custom-sampler/package.json @@ -15,7 +15,6 @@ "@opentelemetry/sdk-trace-node": "^1.25.1", "@sentry/node": "latest || *", "@sentry/opentelemetry": "latest || *", - "@sentry/types": "latest || *", "@types/express": "4.17.17", "@types/node": "18.15.1", "express": "4.19.2", diff --git a/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/package.json b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/package.json index b02788c4761f..fd2b9bf4aafe 100644 --- a/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/package.json +++ b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/package.json @@ -16,7 +16,6 @@ "@sentry/core": "latest || *", "@sentry/node": "latest || *", "@sentry/opentelemetry": "latest || *", - "@sentry/types": "latest || *", "@types/express": "4.17.17", "@types/node": "18.15.1", "express": "4.19.2", diff --git a/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json b/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json index ed01eff7dce2..efe84d86604e 100644 --- a/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json +++ b/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json @@ -19,7 +19,6 @@ "@sentry/core": "latest || *", "@sentry/node": "latest || *", "@sentry/opentelemetry": "latest || *", - "@sentry/types": "latest || *", "@types/express": "4.17.17", "@types/node": "18.15.1", "express": "4.19.2", diff --git a/dev-packages/e2e-tests/test-applications/react-router-6/tests/sse.test.ts b/dev-packages/e2e-tests/test-applications/react-router-6/tests/sse.test.ts index b34fc8123899..b6146838b0de 100644 --- a/dev-packages/e2e-tests/test-applications/react-router-6/tests/sse.test.ts +++ b/dev-packages/e2e-tests/test-applications/react-router-6/tests/sse.test.ts @@ -1,6 +1,6 @@ import { expect, test } from '@playwright/test'; import { waitForTransaction } from '@sentry-internal/test-utils'; -import { SpanJSON } from '@sentry/types'; +import { SpanJSON } from '@sentry/core'; test('Waits for sse streaming when creating spans', async ({ page }) => { await page.goto('/sse'); diff --git a/dev-packages/e2e-tests/test-applications/solid-solidrouter/package.json b/dev-packages/e2e-tests/test-applications/solid-solidrouter/package.json index 55d4c5743e0a..62050fc0d10c 100644 --- a/dev-packages/e2e-tests/test-applications/solid-solidrouter/package.json +++ b/dev-packages/e2e-tests/test-applications/solid-solidrouter/package.json @@ -16,7 +16,6 @@ "devDependencies": { "@playwright/test": "^1.44.1", "@sentry-internal/test-utils": "link:../../../test-utils", - "@sentry/types": "latest || *", "@sentry/core": "latest || *", "autoprefixer": "^10.4.17", "postcss": "^8.4.33", diff --git a/dev-packages/e2e-tests/test-applications/solid/package.json b/dev-packages/e2e-tests/test-applications/solid/package.json index 51eccbae8a31..5196494cca78 100644 --- a/dev-packages/e2e-tests/test-applications/solid/package.json +++ b/dev-packages/e2e-tests/test-applications/solid/package.json @@ -16,7 +16,6 @@ "devDependencies": { "@playwright/test": "^1.44.1", "@sentry-internal/test-utils": "link:../../../test-utils", - "@sentry/types": "latest || *", "@sentry/core": "latest || *", "autoprefixer": "^10.4.17", "postcss": "^8.4.33", diff --git a/dev-packages/e2e-tests/test-applications/svelte-5/package.json b/dev-packages/e2e-tests/test-applications/svelte-5/package.json index 0eb3d4154d40..d1230c56ef40 100644 --- a/dev-packages/e2e-tests/test-applications/svelte-5/package.json +++ b/dev-packages/e2e-tests/test-applications/svelte-5/package.json @@ -15,7 +15,6 @@ "devDependencies": { "@playwright/test": "^1.44.1", "@sentry-internal/test-utils": "link:../../../test-utils", - "@sentry/types": "latest || *", "@sentry/core": "latest || *", "@sveltejs/vite-plugin-svelte": "^3.0.2", "@tsconfig/svelte": "^5.0.2", diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-svelte-5/package.json b/dev-packages/e2e-tests/test-applications/sveltekit-2-svelte-5/package.json index 192b56a98fe9..7aee187f4469 100644 --- a/dev-packages/e2e-tests/test-applications/sveltekit-2-svelte-5/package.json +++ b/dev-packages/e2e-tests/test-applications/sveltekit-2-svelte-5/package.json @@ -21,7 +21,6 @@ "devDependencies": { "@playwright/test": "^1.44.1", "@sentry-internal/test-utils": "link:../../../test-utils", - "@sentry/types": "latest || *", "@sentry/core": "latest || *", "@sveltejs/adapter-auto": "^3.0.0", "@sveltejs/kit": "^2.0.0", diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/package.json b/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/package.json index 56daf84e58b5..4738b14b39aa 100644 --- a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/package.json +++ b/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/package.json @@ -20,7 +20,6 @@ "devDependencies": { "@playwright/test": "^1.44.1", "@sentry-internal/test-utils": "link:../../../test-utils", - "@sentry/types": "latest || *", "@sentry/core": "latest || *", "@sveltejs/adapter-auto": "^3.0.0", "@sveltejs/kit": "^2.0.0", diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2/package.json b/dev-packages/e2e-tests/test-applications/sveltekit-2/package.json index 080a23ebcfe8..75b5aa195356 100644 --- a/dev-packages/e2e-tests/test-applications/sveltekit-2/package.json +++ b/dev-packages/e2e-tests/test-applications/sveltekit-2/package.json @@ -20,7 +20,6 @@ "devDependencies": { "@playwright/test": "^1.44.1", "@sentry-internal/test-utils": "link:../../../test-utils", - "@sentry/types": "latest || *", "@sentry/core": "latest || *", "@sveltejs/adapter-auto": "^3.0.0", "@sveltejs/adapter-node": "^2.0.0", diff --git a/dev-packages/e2e-tests/test-applications/sveltekit/package.json b/dev-packages/e2e-tests/test-applications/sveltekit/package.json index c7e9aa022d1e..546fec8b9cf5 100644 --- a/dev-packages/e2e-tests/test-applications/sveltekit/package.json +++ b/dev-packages/e2e-tests/test-applications/sveltekit/package.json @@ -19,7 +19,6 @@ "devDependencies": { "@playwright/test": "^1.44.1", "@sentry-internal/test-utils": "link:../../../test-utils", - "@sentry/types": "latest || *", "@sentry/core": "latest || *", "@sveltejs/adapter-auto": "^2.0.0", "@sveltejs/adapter-node": "^1.2.4", diff --git a/dev-packages/e2e-tests/test-applications/vue-3/package.json b/dev-packages/e2e-tests/test-applications/vue-3/package.json index 4f3125b81eb2..364c67996c76 100644 --- a/dev-packages/e2e-tests/test-applications/vue-3/package.json +++ b/dev-packages/e2e-tests/test-applications/vue-3/package.json @@ -23,7 +23,6 @@ "devDependencies": { "@playwright/test": "^1.44.1", "@sentry-internal/test-utils": "link:../../../test-utils", - "@sentry/types": "latest || *", "@sentry/core": "latest || *", "@tsconfig/node20": "^20.1.2", "@types/node": "^20.11.10", diff --git a/dev-packages/e2e-tests/verdaccio-config/config.yaml b/dev-packages/e2e-tests/verdaccio-config/config.yaml index 67ee55a9d9ce..585cbbfa10a5 100644 --- a/dev-packages/e2e-tests/verdaccio-config/config.yaml +++ b/dev-packages/e2e-tests/verdaccio-config/config.yaml @@ -164,12 +164,14 @@ packages: unpublish: $all # proxy: npmjs # Don't proxy for E2E tests! + # TODO(v9): Remove '@sentry/types': access: $all publish: $all unpublish: $all # proxy: npmjs # Don't proxy for E2E tests! + # TODO(v9): Remove '@sentry/utils': access: $all publish: $all diff --git a/dev-packages/node-integration-tests/package.json b/dev-packages/node-integration-tests/package.json index f58bef2a0e45..241127d49c01 100644 --- a/dev-packages/node-integration-tests/package.json +++ b/dev-packages/node-integration-tests/package.json @@ -34,7 +34,6 @@ "@sentry/aws-serverless": "8.40.0", "@sentry/core": "8.40.0", "@sentry/node": "8.40.0", - "@sentry/types": "8.40.0", "@types/mongodb": "^3.6.20", "@types/mysql": "^2.15.21", "@types/pg": "^8.6.5", diff --git a/dev-packages/node-integration-tests/src/index.ts b/dev-packages/node-integration-tests/src/index.ts index 4bd0a9ccce25..18c443203926 100644 --- a/dev-packages/node-integration-tests/src/index.ts +++ b/dev-packages/node-integration-tests/src/index.ts @@ -1,5 +1,5 @@ import type { AddressInfo } from 'net'; -import type { BaseTransportOptions, Envelope, Transport, TransportMakeRequestResponse } from '@sentry/types'; +import type { BaseTransportOptions, Envelope, Transport, TransportMakeRequestResponse } from '@sentry/core'; import type { Express } from 'express'; /** diff --git a/dev-packages/node-integration-tests/suites/anr/test.ts b/dev-packages/node-integration-tests/suites/anr/test.ts index 0352212a8293..93080c35a54d 100644 --- a/dev-packages/node-integration-tests/suites/anr/test.ts +++ b/dev-packages/node-integration-tests/suites/anr/test.ts @@ -1,4 +1,4 @@ -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { conditionalTest } from '../../utils'; import { cleanupChildProcesses, createRunner } from '../../utils/runner'; diff --git a/dev-packages/node-integration-tests/suites/breadcrumbs/process-thread/test.ts b/dev-packages/node-integration-tests/suites/breadcrumbs/process-thread/test.ts index f675ca4250dd..632568fa85d1 100644 --- a/dev-packages/node-integration-tests/suites/breadcrumbs/process-thread/test.ts +++ b/dev-packages/node-integration-tests/suites/breadcrumbs/process-thread/test.ts @@ -1,4 +1,4 @@ -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { conditionalTest } from '../../../utils'; import { cleanupChildProcesses, createRunner } from '../../../utils/runner'; diff --git a/dev-packages/node-integration-tests/suites/public-api/startSpan/with-nested-spans/test.ts b/dev-packages/node-integration-tests/suites/public-api/startSpan/with-nested-spans/test.ts index 5cf4dc8c8c40..ffa693c4752d 100644 --- a/dev-packages/node-integration-tests/suites/public-api/startSpan/with-nested-spans/test.ts +++ b/dev-packages/node-integration-tests/suites/public-api/startSpan/with-nested-spans/test.ts @@ -1,4 +1,4 @@ -import type { SpanJSON } from '@sentry/types'; +import type { SpanJSON } from '@sentry/core'; import { assertSentryTransaction } from '../../../../utils/assertions'; import { cleanupChildProcesses, createRunner } from '../../../../utils/runner'; diff --git a/dev-packages/node-integration-tests/suites/tracing/amqplib/test.ts b/dev-packages/node-integration-tests/suites/tracing/amqplib/test.ts index 38b3c26dd95e..7a3eb6414237 100644 --- a/dev-packages/node-integration-tests/suites/tracing/amqplib/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/amqplib/test.ts @@ -1,4 +1,4 @@ -import type { TransactionEvent } from '@sentry/types'; +import type { TransactionEvent } from '@sentry/core'; import { cleanupChildProcesses, createRunner } from '../../../utils/runner'; // When running docker compose, we need a larger timeout, as this takes some time. diff --git a/dev-packages/node-integration-tests/suites/tracing/maxSpans/test.ts b/dev-packages/node-integration-tests/suites/tracing/maxSpans/test.ts index 2554a9b790b6..b705bfc71ea4 100644 --- a/dev-packages/node-integration-tests/suites/tracing/maxSpans/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/maxSpans/test.ts @@ -1,4 +1,4 @@ -import type { SpanJSON } from '@sentry/types'; +import type { SpanJSON } from '@sentry/core'; import { createRunner } from '../../../utils/runner'; test('it limits spans to 1000', done => { diff --git a/dev-packages/node-integration-tests/utils/assertions.ts b/dev-packages/node-integration-tests/utils/assertions.ts index 0f2713280282..1d4e7d1b321a 100644 --- a/dev-packages/node-integration-tests/utils/assertions.ts +++ b/dev-packages/node-integration-tests/utils/assertions.ts @@ -7,7 +7,7 @@ import type { SerializedSession, SessionAggregates, TransactionEvent, -} from '@sentry/types'; +} from '@sentry/core'; /** * Asserts against a Sentry Event ignoring non-deterministic properties diff --git a/dev-packages/node-integration-tests/utils/index.ts b/dev-packages/node-integration-tests/utils/index.ts index 473a69c78cd8..b51a0a8f83c8 100644 --- a/dev-packages/node-integration-tests/utils/index.ts +++ b/dev-packages/node-integration-tests/utils/index.ts @@ -1,6 +1,6 @@ import type * as http from 'http'; import { parseSemver } from '@sentry/core'; -import type { EnvelopeItemType } from '@sentry/types'; +import type { EnvelopeItemType } from '@sentry/core'; const NODE_VERSION = parseSemver(process.versions.node).major; diff --git a/dev-packages/node-integration-tests/utils/runner.ts b/dev-packages/node-integration-tests/utils/runner.ts index 2b0a83f3c63e..4a32cb8ca1fc 100644 --- a/dev-packages/node-integration-tests/utils/runner.ts +++ b/dev-packages/node-integration-tests/utils/runner.ts @@ -13,7 +13,7 @@ import type { SerializedSession, SessionAggregates, TransactionEvent, -} from '@sentry/types'; +} from '@sentry/core'; import axios from 'axios'; import { assertEnvelopeHeader, diff --git a/dev-packages/node-integration-tests/utils/server.ts b/dev-packages/node-integration-tests/utils/server.ts index f46338d7de63..761ec1cd2429 100644 --- a/dev-packages/node-integration-tests/utils/server.ts +++ b/dev-packages/node-integration-tests/utils/server.ts @@ -1,6 +1,6 @@ import type { AddressInfo } from 'net'; import { parseEnvelope } from '@sentry/core'; -import type { Envelope } from '@sentry/types'; +import type { Envelope } from '@sentry/core'; import express from 'express'; /** diff --git a/dev-packages/test-utils/package.json b/dev-packages/test-utils/package.json index f96285c9613b..dcea25576fb6 100644 --- a/dev-packages/test-utils/package.json +++ b/dev-packages/test-utils/package.json @@ -45,8 +45,7 @@ }, "devDependencies": { "@playwright/test": "^1.44.1", - "@sentry/core": "8.40.0", - "@sentry/types": "8.40.0" + "@sentry/core": "8.40.0" }, "volta": { "extends": "../../package.json" diff --git a/dev-packages/test-utils/src/event-proxy-server.ts b/dev-packages/test-utils/src/event-proxy-server.ts index 73ced8df7053..07be845bc553 100644 --- a/dev-packages/test-utils/src/event-proxy-server.ts +++ b/dev-packages/test-utils/src/event-proxy-server.ts @@ -7,7 +7,7 @@ import * as path from 'path'; import * as util from 'util'; import * as zlib from 'zlib'; import { parseEnvelope } from '@sentry/core'; -import type { Envelope, EnvelopeItem, Event, SerializedSession } from '@sentry/types'; +import type { Envelope, EnvelopeItem, Event, SerializedSession } from '@sentry/core'; const readFile = util.promisify(fs.readFile); const writeFile = util.promisify(fs.writeFile); diff --git a/packages/angular/package.json b/packages/angular/package.json index 66971da85773..7264a70d1a0a 100644 --- a/packages/angular/package.json +++ b/packages/angular/package.json @@ -23,7 +23,6 @@ "dependencies": { "@sentry/browser": "8.40.0", "@sentry/core": "8.40.0", - "@sentry/types": "8.40.0", "tslib": "^2.4.1" }, "devDependencies": { diff --git a/packages/angular/src/errorhandler.ts b/packages/angular/src/errorhandler.ts index fdb765934ea1..09ff9a187c55 100644 --- a/packages/angular/src/errorhandler.ts +++ b/packages/angular/src/errorhandler.ts @@ -4,7 +4,7 @@ import { Inject, Injectable } from '@angular/core'; import * as Sentry from '@sentry/browser'; import type { ReportDialogOptions } from '@sentry/browser'; import { consoleSandbox, isString } from '@sentry/core'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { runOutsideAngular } from './zone'; diff --git a/packages/angular/src/sdk.ts b/packages/angular/src/sdk.ts index d7cef5f55fdd..072045e635ad 100755 --- a/packages/angular/src/sdk.ts +++ b/packages/angular/src/sdk.ts @@ -14,7 +14,7 @@ import { inboundFiltersIntegration, } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { Client, Integration } from '@sentry/types'; +import type { Client, Integration } from '@sentry/core'; import { IS_DEBUG_BUILD } from './flags'; diff --git a/packages/angular/src/tracing.ts b/packages/angular/src/tracing.ts index 0f5d3d49d211..4fcfbeffb0af 100644 --- a/packages/angular/src/tracing.ts +++ b/packages/angular/src/tracing.ts @@ -19,7 +19,7 @@ import { startInactiveSpan, } from '@sentry/browser'; import { logger, stripUrlQueryAndFragment, timestampInSeconds } from '@sentry/core'; -import type { Integration, Span } from '@sentry/types'; +import type { Integration, Span } from '@sentry/core'; import type { Observable } from 'rxjs'; import { Subscription } from 'rxjs'; import { filter, tap } from 'rxjs/operators'; diff --git a/packages/angular/test/errorhandler.test.ts b/packages/angular/test/errorhandler.test.ts index 1ae415c5706d..d2a65e86b51c 100644 --- a/packages/angular/test/errorhandler.test.ts +++ b/packages/angular/test/errorhandler.test.ts @@ -1,6 +1,6 @@ import { HttpErrorResponse } from '@angular/common/http'; import * as SentryBrowser from '@sentry/browser'; -import type { Client, Event } from '@sentry/types'; +import type { Client, Event } from '@sentry/core'; import { vi } from 'vitest'; import { SentryErrorHandler, createErrorHandler } from '../src/errorhandler'; diff --git a/packages/astro/package.json b/packages/astro/package.json index b000de7d211c..20b46d5ac4ca 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -59,7 +59,6 @@ "@sentry/browser": "8.40.0", "@sentry/core": "8.40.0", "@sentry/node": "8.40.0", - "@sentry/types": "8.40.0", "@sentry/vite-plugin": "^2.22.6" }, "devDependencies": { diff --git a/packages/astro/src/client/sdk.ts b/packages/astro/src/client/sdk.ts index 8a4617c652cf..24d29b3cc109 100644 --- a/packages/astro/src/client/sdk.ts +++ b/packages/astro/src/client/sdk.ts @@ -5,7 +5,7 @@ import { init as initBrowserSdk, } from '@sentry/browser'; import { applySdkMetadata } from '@sentry/core'; -import type { Client, Integration } from '@sentry/types'; +import type { Client, Integration } from '@sentry/core'; // Tree-shakable guard to remove all code related to tracing declare const __SENTRY_TRACING__: boolean; diff --git a/packages/astro/src/index.types.ts b/packages/astro/src/index.types.ts index c05cfb4a3215..ce87a51c3af7 100644 --- a/packages/astro/src/index.types.ts +++ b/packages/astro/src/index.types.ts @@ -7,7 +7,7 @@ export * from '@sentry/node'; import type { NodeOptions } from '@sentry/node'; -import type { Client, Integration, Options, StackParser } from '@sentry/types'; +import type { Client, Integration, Options, StackParser } from '@sentry/core'; import type * as clientSdk from './index.client'; import type * as serverSdk from './index.server'; diff --git a/packages/astro/src/integration/types.ts b/packages/astro/src/integration/types.ts index ede2f49ff732..0a5baa535bc7 100644 --- a/packages/astro/src/integration/types.ts +++ b/packages/astro/src/integration/types.ts @@ -1,5 +1,5 @@ import type { BrowserOptions } from '@sentry/browser'; -import type { Options } from '@sentry/types'; +import type { Options } from '@sentry/core'; type SdkInitPaths = { /** diff --git a/packages/astro/src/server/middleware.ts b/packages/astro/src/server/middleware.ts index 14b48706c2cf..de381de9d5ed 100644 --- a/packages/astro/src/server/middleware.ts +++ b/packages/astro/src/server/middleware.ts @@ -7,6 +7,7 @@ import { vercelWaitUntil, winterCGRequestToRequestData, } from '@sentry/core'; +import type { RequestEventData, Scope, SpanAttributes } from '@sentry/core'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, @@ -21,7 +22,6 @@ import { startSpan, withIsolationScope, } from '@sentry/node'; -import type { RequestEventData, Scope, SpanAttributes } from '@sentry/types'; import type { APIContext, MiddlewareResponseHandler } from 'astro'; type MiddlewareOptions = { diff --git a/packages/astro/test/server/middleware.test.ts b/packages/astro/test/server/middleware.test.ts index 87fcb611eab2..eff473d4401f 100644 --- a/packages/astro/test/server/middleware.test.ts +++ b/packages/astro/test/server/middleware.test.ts @@ -1,7 +1,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core'; import * as SentryCore from '@sentry/core'; +import type { Client, Span } from '@sentry/core'; import * as SentryNode from '@sentry/node'; -import type { Client, Span } from '@sentry/types'; import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; import { handleRequest, interpolateRouteFromUrlAndParams } from '../../src/server/middleware'; diff --git a/packages/aws-serverless/package.json b/packages/aws-serverless/package.json index c6d231e12821..d35baecb0b43 100644 --- a/packages/aws-serverless/package.json +++ b/packages/aws-serverless/package.json @@ -68,7 +68,6 @@ "@opentelemetry/instrumentation-aws-sdk": "0.45.0", "@sentry/core": "8.40.0", "@sentry/node": "8.40.0", - "@sentry/types": "8.40.0", "@types/aws-lambda": "^8.10.62" }, "devDependencies": { diff --git a/packages/aws-serverless/src/integration/aws.ts b/packages/aws-serverless/src/integration/aws.ts index bfbe16bac16c..341c0531cc08 100644 --- a/packages/aws-serverless/src/integration/aws.ts +++ b/packages/aws-serverless/src/integration/aws.ts @@ -1,7 +1,7 @@ import { AwsInstrumentation } from '@opentelemetry/instrumentation-aws-sdk'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration } from '@sentry/core'; +import type { IntegrationFn } from '@sentry/core'; import { addOpenTelemetryInstrumentation } from '@sentry/node'; -import type { IntegrationFn } from '@sentry/types'; const _awsIntegration = (() => { return { diff --git a/packages/aws-serverless/src/integration/awslambda.ts b/packages/aws-serverless/src/integration/awslambda.ts index 2e1479914471..61776daed18c 100644 --- a/packages/aws-serverless/src/integration/awslambda.ts +++ b/packages/aws-serverless/src/integration/awslambda.ts @@ -1,7 +1,7 @@ import { AwsLambdaInstrumentation } from '@opentelemetry/instrumentation-aws-lambda'; import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration } from '@sentry/core'; +import type { IntegrationFn } from '@sentry/core'; import { generateInstrumentOnce } from '@sentry/node'; -import type { IntegrationFn } from '@sentry/types'; import { eventContextExtractor } from '../utils'; interface AwsLambdaOptions { diff --git a/packages/aws-serverless/src/sdk.ts b/packages/aws-serverless/src/sdk.ts index 68522927b0a9..ccb776a9e199 100644 --- a/packages/aws-serverless/src/sdk.ts +++ b/packages/aws-serverless/src/sdk.ts @@ -3,6 +3,7 @@ import { hostname } from 'os'; import { basename, resolve } from 'path'; import { types } from 'util'; import { logger } from '@sentry/core'; +import type { Integration, Options, Scope, SdkMetadata, Span } from '@sentry/core'; import type { NodeClient, NodeOptions } from '@sentry/node'; import { SDK_VERSION, @@ -16,7 +17,6 @@ import { startSpanManual, withScope, } from '@sentry/node'; -import type { Integration, Options, Scope, SdkMetadata, Span } from '@sentry/types'; import type { Context, Handler } from 'aws-lambda'; import { performance } from 'perf_hooks'; diff --git a/packages/aws-serverless/src/utils.ts b/packages/aws-serverless/src/utils.ts index b8a3e69dc0a9..e330fb01dc13 100644 --- a/packages/aws-serverless/src/utils.ts +++ b/packages/aws-serverless/src/utils.ts @@ -2,7 +2,7 @@ import type { TextMapGetter } from '@opentelemetry/api'; import type { Context as OtelContext } from '@opentelemetry/api'; import { context as otelContext, propagation } from '@opentelemetry/api'; import { addExceptionMechanism, isString } from '@sentry/core'; -import type { Scope } from '@sentry/types'; +import type { Scope } from '@sentry/core'; import type { Handler } from 'aws-lambda'; import type { APIGatewayProxyEventHeaders } from 'aws-lambda'; diff --git a/packages/aws-serverless/test/sdk.test.ts b/packages/aws-serverless/test/sdk.test.ts index 4f5daf3b94a9..7ab59670cdf2 100644 --- a/packages/aws-serverless/test/sdk.test.ts +++ b/packages/aws-serverless/test/sdk.test.ts @@ -1,6 +1,6 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import type { Callback, Handler } from 'aws-lambda'; import { init, wrapHandler } from '../src/sdk'; diff --git a/packages/browser-utils/package.json b/packages/browser-utils/package.json index 0ea618225e51..363de0963ed3 100644 --- a/packages/browser-utils/package.json +++ b/packages/browser-utils/package.json @@ -39,8 +39,7 @@ "access": "public" }, "dependencies": { - "@sentry/core": "8.40.0", - "@sentry/types": "8.40.0" + "@sentry/core": "8.40.0" }, "scripts": { "build": "run-p build:transpile build:types", diff --git a/packages/browser-utils/src/instrument/dom.ts b/packages/browser-utils/src/instrument/dom.ts index 7ae8b0d04441..0da1ec4052e2 100644 --- a/packages/browser-utils/src/instrument/dom.ts +++ b/packages/browser-utils/src/instrument/dom.ts @@ -1,4 +1,4 @@ -import type { HandlerDataDom } from '@sentry/types'; +import type { HandlerDataDom } from '@sentry/core'; import { addHandler, addNonEnumerableProperty, fill, maybeInstrument, triggerHandlers, uuid4 } from '@sentry/core'; import { WINDOW } from '../types'; diff --git a/packages/browser-utils/src/instrument/history.ts b/packages/browser-utils/src/instrument/history.ts index be74cde68871..0a166c6fe111 100644 --- a/packages/browser-utils/src/instrument/history.ts +++ b/packages/browser-utils/src/instrument/history.ts @@ -1,5 +1,5 @@ import { addHandler, fill, maybeInstrument, supportsHistory, triggerHandlers } from '@sentry/core'; -import type { HandlerDataHistory } from '@sentry/types'; +import type { HandlerDataHistory } from '@sentry/core'; import { WINDOW } from '../types'; let lastHref: string | undefined; diff --git a/packages/browser-utils/src/instrument/xhr.ts b/packages/browser-utils/src/instrument/xhr.ts index e97b7e54be60..df67d1c1f1be 100644 --- a/packages/browser-utils/src/instrument/xhr.ts +++ b/packages/browser-utils/src/instrument/xhr.ts @@ -1,4 +1,4 @@ -import type { HandlerDataXhr, SentryWrappedXMLHttpRequest } from '@sentry/types'; +import type { HandlerDataXhr, SentryWrappedXMLHttpRequest } from '@sentry/core'; import { addHandler, isString, maybeInstrument, timestampInSeconds, triggerHandlers } from '@sentry/core'; import { WINDOW } from '../types'; diff --git a/packages/browser-utils/src/metrics/browserMetrics.ts b/packages/browser-utils/src/metrics/browserMetrics.ts index 4352fe3d5f27..525ad701bd7d 100644 --- a/packages/browser-utils/src/metrics/browserMetrics.ts +++ b/packages/browser-utils/src/metrics/browserMetrics.ts @@ -2,7 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, getActiveSpan } from '@sentry/core'; import { setMeasurement } from '@sentry/core'; import { browserPerformanceTimeOrigin, getComponentName, htmlTreeAsString, parseUrl } from '@sentry/core'; -import type { Measurements, Span, SpanAttributes, StartSpanOptions } from '@sentry/types'; +import type { Measurements, Span, SpanAttributes, StartSpanOptions } from '@sentry/core'; import { spanToJSON } from '@sentry/core'; import { WINDOW } from '../types'; diff --git a/packages/browser-utils/src/metrics/cls.ts b/packages/browser-utils/src/metrics/cls.ts index 05d2f934eb8c..43ff84c01965 100644 --- a/packages/browser-utils/src/metrics/cls.ts +++ b/packages/browser-utils/src/metrics/cls.ts @@ -11,7 +11,7 @@ import { spanToJSON, } from '@sentry/core'; import { browserPerformanceTimeOrigin, dropUndefinedKeys, htmlTreeAsString, logger } from '@sentry/core'; -import type { SpanAttributes } from '@sentry/types'; +import type { SpanAttributes } from '@sentry/core'; import { DEBUG_BUILD } from '../debug-build'; import { addClsInstrumentationHandler } from './instrument'; import { msToSec, startStandaloneWebVitalSpan } from './utils'; diff --git a/packages/browser-utils/src/metrics/inp.ts b/packages/browser-utils/src/metrics/inp.ts index 4e90c89619d9..c8b517515eff 100644 --- a/packages/browser-utils/src/metrics/inp.ts +++ b/packages/browser-utils/src/metrics/inp.ts @@ -10,7 +10,7 @@ import { spanToJSON, } from '@sentry/core'; import { browserPerformanceTimeOrigin, dropUndefinedKeys, htmlTreeAsString } from '@sentry/core'; -import type { Span, SpanAttributes } from '@sentry/types'; +import type { Span, SpanAttributes } from '@sentry/core'; import { addInpInstrumentationHandler, addPerformanceInstrumentationHandler, diff --git a/packages/browser-utils/src/metrics/utils.ts b/packages/browser-utils/src/metrics/utils.ts index 70327aeca838..613c31f6b7b9 100644 --- a/packages/browser-utils/src/metrics/utils.ts +++ b/packages/browser-utils/src/metrics/utils.ts @@ -1,6 +1,6 @@ import type { SentrySpan } from '@sentry/core'; import { getClient, getCurrentScope, spanToJSON, startInactiveSpan, withActiveSpan } from '@sentry/core'; -import type { Integration, Span, SpanAttributes, SpanTimeInput, StartSpanOptions } from '@sentry/types'; +import type { Integration, Span, SpanAttributes, SpanTimeInput, StartSpanOptions } from '@sentry/core'; import { WINDOW } from '../types'; /** diff --git a/packages/browser-utils/test/browser/browserMetrics.test.ts b/packages/browser-utils/test/browser/browserMetrics.test.ts index be78df6920fc..6ca155bccfc2 100644 --- a/packages/browser-utils/test/browser/browserMetrics.test.ts +++ b/packages/browser-utils/test/browser/browserMetrics.test.ts @@ -8,7 +8,7 @@ import { setCurrentClient, spanToJSON, } from '@sentry/core'; -import type { Span } from '@sentry/types'; +import type { Span } from '@sentry/core'; import type { ResourceEntry } from '../../src/metrics/browserMetrics'; import { _addMeasureSpans, _addResourceSpans } from '../../src/metrics/browserMetrics'; import { WINDOW } from '../../src/types'; diff --git a/packages/browser-utils/test/utils/TestClient.ts b/packages/browser-utils/test/utils/TestClient.ts index b3e3c29cb8cd..6e8f01c6d3e8 100644 --- a/packages/browser-utils/test/utils/TestClient.ts +++ b/packages/browser-utils/test/utils/TestClient.ts @@ -6,7 +6,7 @@ import type { Event, ParameterizedString, SeverityLevel, -} from '@sentry/types'; +} from '@sentry/core'; export interface TestClientOptions extends ClientOptions, BrowserClientReplayOptions {} diff --git a/packages/browser/package.json b/packages/browser/package.json index 72f8921e411e..77f929010b34 100644 --- a/packages/browser/package.json +++ b/packages/browser/package.json @@ -43,8 +43,7 @@ "@sentry-internal/feedback": "8.40.0", "@sentry-internal/replay": "8.40.0", "@sentry-internal/replay-canvas": "8.40.0", - "@sentry/core": "8.40.0", - "@sentry/types": "8.40.0" + "@sentry/core": "8.40.0" }, "devDependencies": { "@sentry-internal/integration-shims": "8.40.0", diff --git a/packages/browser/src/client.ts b/packages/browser/src/client.ts index 8746fe6fda76..8d0056dbfb77 100644 --- a/packages/browser/src/client.ts +++ b/packages/browser/src/client.ts @@ -12,7 +12,7 @@ import type { ParameterizedString, SeverityLevel, UserFeedback, -} from '@sentry/types'; +} from '@sentry/core'; import { DEBUG_BUILD } from './debug-build'; import { eventFromException, eventFromMessage } from './eventbuilder'; @@ -22,7 +22,7 @@ import { createUserFeedbackEnvelope } from './userfeedback'; /** * Configuration options for the Sentry Browser SDK. - * @see @sentry/types Options for more information. + * @see @sentry/core Options for more information. */ export type BrowserOptions = Options & BrowserClientReplayOptions & diff --git a/packages/browser/src/eventbuilder.ts b/packages/browser/src/eventbuilder.ts index b4ee8d581eb9..ec3c9b95ef7d 100644 --- a/packages/browser/src/eventbuilder.ts +++ b/packages/browser/src/eventbuilder.ts @@ -21,7 +21,7 @@ import type { SeverityLevel, StackFrame, StackParser, -} from '@sentry/types'; +} from '@sentry/core'; type Prototype = { constructor: (...args: unknown[]) => unknown }; diff --git a/packages/browser/src/exports.ts b/packages/browser/src/exports.ts index ebea58f1fa7c..492f9da23b38 100644 --- a/packages/browser/src/exports.ts +++ b/packages/browser/src/exports.ts @@ -15,7 +15,7 @@ export type { Thread, User, Session, -} from '@sentry/types'; +} from '@sentry/core'; export type { BrowserOptions } from './client'; diff --git a/packages/browser/src/helpers.ts b/packages/browser/src/helpers.ts index 8871b1ba2c68..1cbf2e6eebb4 100644 --- a/packages/browser/src/helpers.ts +++ b/packages/browser/src/helpers.ts @@ -7,7 +7,7 @@ import { getOriginalFunction, markFunctionWrapped, } from '@sentry/core'; -import type { Mechanism, WrappedFunction } from '@sentry/types'; +import type { Mechanism, WrappedFunction } from '@sentry/core'; export const WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ & Window; diff --git a/packages/browser/src/index.ts b/packages/browser/src/index.ts index bc720295b090..827d2a90c993 100644 --- a/packages/browser/src/index.ts +++ b/packages/browser/src/index.ts @@ -73,7 +73,7 @@ export { zodErrorsIntegration, thirdPartyErrorFilterIntegration, } from '@sentry/core'; -export type { Span } from '@sentry/types'; +export type { Span } from '@sentry/core'; export { makeBrowserOfflineTransport } from './transports/offline'; export { browserProfilingIntegration } from './profiling/integration'; export { spotlightBrowserIntegration } from './integrations/spotlight'; diff --git a/packages/browser/src/integrations/breadcrumbs.ts b/packages/browser/src/integrations/breadcrumbs.ts index 889e1a54c201..ed2ceb8f462d 100644 --- a/packages/browser/src/integrations/breadcrumbs.ts +++ b/packages/browser/src/integrations/breadcrumbs.ts @@ -31,7 +31,7 @@ import type { IntegrationFn, XhrBreadcrumbData, XhrBreadcrumbHint, -} from '@sentry/types'; +} from '@sentry/core'; import { DEBUG_BUILD } from '../debug-build'; import { WINDOW } from '../helpers'; diff --git a/packages/browser/src/integrations/browserapierrors.ts b/packages/browser/src/integrations/browserapierrors.ts index 2290c1a45d66..eb456cd200c9 100644 --- a/packages/browser/src/integrations/browserapierrors.ts +++ b/packages/browser/src/integrations/browserapierrors.ts @@ -1,6 +1,6 @@ import { defineIntegration } from '@sentry/core'; import { fill, getFunctionName, getOriginalFunction } from '@sentry/core'; -import type { IntegrationFn, WrappedFunction } from '@sentry/types'; +import type { IntegrationFn, WrappedFunction } from '@sentry/core'; import { WINDOW, wrap } from '../helpers'; diff --git a/packages/browser/src/integrations/contextlines.ts b/packages/browser/src/integrations/contextlines.ts index eb4dd7e7f748..8da7cfa024a1 100644 --- a/packages/browser/src/integrations/contextlines.ts +++ b/packages/browser/src/integrations/contextlines.ts @@ -1,6 +1,6 @@ import { defineIntegration } from '@sentry/core'; import { GLOBAL_OBJ, addContextToFrame, stripUrlQueryAndFragment } from '@sentry/core'; -import type { Event, IntegrationFn, StackFrame } from '@sentry/types'; +import type { Event, IntegrationFn, StackFrame } from '@sentry/core'; const WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ & Window; diff --git a/packages/browser/src/integrations/globalhandlers.ts b/packages/browser/src/integrations/globalhandlers.ts index 2b9278adf767..13d89dd4eb69 100644 --- a/packages/browser/src/integrations/globalhandlers.ts +++ b/packages/browser/src/integrations/globalhandlers.ts @@ -8,7 +8,7 @@ import { isString, logger, } from '@sentry/core'; -import type { Client, Event, IntegrationFn, Primitive, StackParser } from '@sentry/types'; +import type { Client, Event, IntegrationFn, Primitive, StackParser } from '@sentry/core'; import type { BrowserClient } from '../client'; import { DEBUG_BUILD } from '../debug-build'; diff --git a/packages/browser/src/integrations/httpclient.ts b/packages/browser/src/integrations/httpclient.ts index 88c1418ab4af..cf1dc6ab6896 100644 --- a/packages/browser/src/integrations/httpclient.ts +++ b/packages/browser/src/integrations/httpclient.ts @@ -7,7 +7,7 @@ import { logger, supportsNativeFetch, } from '@sentry/core'; -import type { Client, Event as SentryEvent, IntegrationFn, SentryWrappedXMLHttpRequest } from '@sentry/types'; +import type { Client, Event as SentryEvent, IntegrationFn, SentryWrappedXMLHttpRequest } from '@sentry/core'; import { DEBUG_BUILD } from '../debug-build'; diff --git a/packages/browser/src/integrations/linkederrors.ts b/packages/browser/src/integrations/linkederrors.ts index 41d15566f7a2..efc56dfcb7bc 100644 --- a/packages/browser/src/integrations/linkederrors.ts +++ b/packages/browser/src/integrations/linkederrors.ts @@ -1,6 +1,6 @@ import { defineIntegration } from '@sentry/core'; import { applyAggregateErrorsToEvent } from '@sentry/core'; -import type { IntegrationFn } from '@sentry/types'; +import type { IntegrationFn } from '@sentry/core'; import { exceptionFromError } from '../eventbuilder'; interface LinkedErrorsOptions { diff --git a/packages/browser/src/integrations/reportingobserver.ts b/packages/browser/src/integrations/reportingobserver.ts index 0e65216e3043..ee12f5adc5c9 100644 --- a/packages/browser/src/integrations/reportingobserver.ts +++ b/packages/browser/src/integrations/reportingobserver.ts @@ -1,6 +1,6 @@ import { captureMessage, defineIntegration, getClient, withScope } from '@sentry/core'; import { GLOBAL_OBJ, supportsReportingObserver } from '@sentry/core'; -import type { Client, IntegrationFn } from '@sentry/types'; +import type { Client, IntegrationFn } from '@sentry/core'; const WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ & Window; diff --git a/packages/browser/src/integrations/spotlight.ts b/packages/browser/src/integrations/spotlight.ts index 3c50939833d6..eb8f64a5d0dc 100644 --- a/packages/browser/src/integrations/spotlight.ts +++ b/packages/browser/src/integrations/spotlight.ts @@ -1,7 +1,7 @@ import { getNativeImplementation } from '@sentry-internal/browser-utils'; import { defineIntegration } from '@sentry/core'; import { logger, serializeEnvelope } from '@sentry/core'; -import type { Client, Envelope, Event, IntegrationFn } from '@sentry/types'; +import type { Client, Envelope, Event, IntegrationFn } from '@sentry/core'; import type { WINDOW } from '../helpers'; import { DEBUG_BUILD } from '../debug-build'; diff --git a/packages/browser/src/metrics.ts b/packages/browser/src/metrics.ts index 00d73ec33b1c..96f56988c485 100644 --- a/packages/browser/src/metrics.ts +++ b/packages/browser/src/metrics.ts @@ -1,5 +1,5 @@ import { BrowserMetricsAggregator, metrics as metricsCore } from '@sentry/core'; -import type { DurationUnit, MetricData, Metrics } from '@sentry/types'; +import type { DurationUnit, MetricData, Metrics } from '@sentry/core'; /** * Adds a value to a counter metric diff --git a/packages/browser/src/profiling/integration.ts b/packages/browser/src/profiling/integration.ts index 1648fbf77a43..b0ca69a37b00 100644 --- a/packages/browser/src/profiling/integration.ts +++ b/packages/browser/src/profiling/integration.ts @@ -1,6 +1,6 @@ import { defineIntegration, getActiveSpan, getRootSpan } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { EventEnvelope, IntegrationFn, Profile, Span } from '@sentry/types'; +import type { EventEnvelope, IntegrationFn, Profile, Span } from '@sentry/core'; import { DEBUG_BUILD } from '../debug-build'; import { startProfileForSpan } from './startProfileForSpan'; diff --git a/packages/browser/src/profiling/startProfileForSpan.ts b/packages/browser/src/profiling/startProfileForSpan.ts index fea01e6b64ae..35a8ab45ea82 100644 --- a/packages/browser/src/profiling/startProfileForSpan.ts +++ b/packages/browser/src/profiling/startProfileForSpan.ts @@ -1,6 +1,6 @@ import { getCurrentScope, spanToJSON } from '@sentry/core'; import { logger, timestampInSeconds, uuid4 } from '@sentry/core'; -import type { Span } from '@sentry/types'; +import type { Span } from '@sentry/core'; import { DEBUG_BUILD } from '../debug-build'; import { WINDOW } from '../helpers'; diff --git a/packages/browser/src/profiling/utils.ts b/packages/browser/src/profiling/utils.ts index 56ae15691aaf..e088ed281152 100644 --- a/packages/browser/src/profiling/utils.ts +++ b/packages/browser/src/profiling/utils.ts @@ -9,7 +9,7 @@ import { timestampInSeconds, uuid4, } from '@sentry/core'; -import type { DebugImage, Envelope, Event, EventEnvelope, Profile, Span, ThreadCpuProfile } from '@sentry/types'; +import type { DebugImage, Envelope, Event, EventEnvelope, Profile, Span, ThreadCpuProfile } from '@sentry/core'; import { DEBUG_BUILD } from '../debug-build'; import { WINDOW } from '../helpers'; diff --git a/packages/browser/src/sdk.ts b/packages/browser/src/sdk.ts index d758aae4b229..adf1d4da8d1a 100644 --- a/packages/browser/src/sdk.ts +++ b/packages/browser/src/sdk.ts @@ -10,7 +10,7 @@ import { startSession, } from '@sentry/core'; import { consoleSandbox, logger, stackParserFromStackParserOptions, supportsFetch } from '@sentry/core'; -import type { Client, DsnLike, Integration, Options, UserFeedback } from '@sentry/types'; +import type { Client, DsnLike, Integration, Options, UserFeedback } from '@sentry/core'; import { addHistoryInstrumentationHandler } from '@sentry-internal/browser-utils'; import { dedupeIntegration } from '@sentry/core'; diff --git a/packages/browser/src/stack-parsers.ts b/packages/browser/src/stack-parsers.ts index 1ac53e898349..8089ace5663d 100644 --- a/packages/browser/src/stack-parsers.ts +++ b/packages/browser/src/stack-parsers.ts @@ -24,7 +24,7 @@ // OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. import { UNKNOWN_FUNCTION, createStackParser } from '@sentry/core'; -import type { StackFrame, StackLineParser, StackLineParserFn } from '@sentry/types'; +import type { StackFrame, StackLineParser, StackLineParserFn } from '@sentry/core'; const OPERA10_PRIORITY = 10; const OPERA11_PRIORITY = 20; diff --git a/packages/browser/src/tracing/browserTracingIntegration.ts b/packages/browser/src/tracing/browserTracingIntegration.ts index cfe78e1aac2c..f13f44b22ffd 100644 --- a/packages/browser/src/tracing/browserTracingIntegration.ts +++ b/packages/browser/src/tracing/browserTracingIntegration.ts @@ -33,8 +33,8 @@ import { logger, propagationContextFromHeaders, } from '@sentry/core'; -import type { Client, IntegrationFn, StartSpanOptions, TransactionSource } from '@sentry/types'; -import type { Span } from '@sentry/types'; +import type { Client, IntegrationFn, StartSpanOptions, TransactionSource } from '@sentry/core'; +import type { Span } from '@sentry/core'; import { DEBUG_BUILD } from '../debug-build'; import { WINDOW } from '../helpers'; diff --git a/packages/browser/src/tracing/request.ts b/packages/browser/src/tracing/request.ts index 63b0c1f7049b..ca47c7e28c34 100644 --- a/packages/browser/src/tracing/request.ts +++ b/packages/browser/src/tracing/request.ts @@ -23,7 +23,7 @@ import { parseUrl, stringMatchesSomePattern, } from '@sentry/core'; -import type { Client, HandlerDataXhr, SentryWrappedXMLHttpRequest, Span } from '@sentry/types'; +import type { Client, HandlerDataXhr, SentryWrappedXMLHttpRequest, Span } from '@sentry/core'; import { WINDOW } from '../helpers'; /** Options for Request Instrumentation */ diff --git a/packages/browser/src/transports/fetch.ts b/packages/browser/src/transports/fetch.ts index efbe132afe1f..e3af7976c18b 100644 --- a/packages/browser/src/transports/fetch.ts +++ b/packages/browser/src/transports/fetch.ts @@ -1,7 +1,7 @@ import { clearCachedImplementation, getNativeImplementation } from '@sentry-internal/browser-utils'; import { createTransport } from '@sentry/core'; import { rejectedSyncPromise } from '@sentry/core'; -import type { Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types'; +import type { Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/core'; import type { WINDOW } from '../helpers'; import type { BrowserTransportOptions } from './types'; diff --git a/packages/browser/src/transports/offline.ts b/packages/browser/src/transports/offline.ts index 152539ce85f9..530d77046239 100644 --- a/packages/browser/src/transports/offline.ts +++ b/packages/browser/src/transports/offline.ts @@ -1,7 +1,7 @@ import type { OfflineStore, OfflineTransportOptions } from '@sentry/core'; import { makeOfflineTransport } from '@sentry/core'; import { parseEnvelope, serializeEnvelope } from '@sentry/core'; -import type { BaseTransportOptions, Envelope, Transport } from '@sentry/types'; +import type { BaseTransportOptions, Envelope, Transport } from '@sentry/core'; import { makeFetchTransport } from './fetch'; // 'Store', 'promisifyRequest' and 'createStore' were originally copied from the 'idb-keyval' package before being diff --git a/packages/browser/src/transports/types.ts b/packages/browser/src/transports/types.ts index e0ed666cc787..fd8c4a93fdd6 100644 --- a/packages/browser/src/transports/types.ts +++ b/packages/browser/src/transports/types.ts @@ -1,4 +1,4 @@ -import type { BaseTransportOptions } from '@sentry/types'; +import type { BaseTransportOptions } from '@sentry/core'; export interface BrowserTransportOptions extends BaseTransportOptions { /** Fetch API init parameters. Used by the FetchTransport */ diff --git a/packages/browser/src/userfeedback.ts b/packages/browser/src/userfeedback.ts index a406e31d2e25..dcafa6c3c98c 100644 --- a/packages/browser/src/userfeedback.ts +++ b/packages/browser/src/userfeedback.ts @@ -1,5 +1,5 @@ import { createEnvelope, dsnToString } from '@sentry/core'; -import type { DsnComponents, EventEnvelope, SdkMetadata, UserFeedback, UserFeedbackItem } from '@sentry/types'; +import type { DsnComponents, EventEnvelope, SdkMetadata, UserFeedback, UserFeedbackItem } from '@sentry/core'; /** * Creates an envelope from a user feedback. diff --git a/packages/browser/src/utils/lazyLoadIntegration.ts b/packages/browser/src/utils/lazyLoadIntegration.ts index 5b78f646c577..768431316cdd 100644 --- a/packages/browser/src/utils/lazyLoadIntegration.ts +++ b/packages/browser/src/utils/lazyLoadIntegration.ts @@ -1,5 +1,5 @@ import { SDK_VERSION, getClient } from '@sentry/core'; -import type { IntegrationFn } from '@sentry/types'; +import type { IntegrationFn } from '@sentry/core'; import type { BrowserClient } from '../client'; import { WINDOW } from '../helpers'; diff --git a/packages/browser/test/integrations/contextlines.test.ts b/packages/browser/test/integrations/contextlines.test.ts index 783cc36fec89..9e41659746f7 100644 --- a/packages/browser/test/integrations/contextlines.test.ts +++ b/packages/browser/test/integrations/contextlines.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import type { StackFrame } from '@sentry/types'; +import type { StackFrame } from '@sentry/core'; import { applySourceContextToFrame } from '../../src/integrations/contextlines'; diff --git a/packages/browser/test/integrations/helpers.test.ts b/packages/browser/test/integrations/helpers.test.ts index ebfabd475e09..324e3450a53d 100644 --- a/packages/browser/test/integrations/helpers.test.ts +++ b/packages/browser/test/integrations/helpers.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest'; -import type { WrappedFunction } from '@sentry/types'; +import type { WrappedFunction } from '@sentry/core'; import { wrap } from '../../src/helpers'; diff --git a/packages/browser/test/integrations/reportingobserver.test.ts b/packages/browser/test/integrations/reportingobserver.test.ts index 9571d59d03d0..a9ceff983049 100644 --- a/packages/browser/test/integrations/reportingobserver.test.ts +++ b/packages/browser/test/integrations/reportingobserver.test.ts @@ -1,7 +1,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; import * as SentryCore from '@sentry/core'; -import type { Client } from '@sentry/types'; +import type { Client } from '@sentry/core'; import { reportingObserverIntegration } from '../../src/integrations/reportingobserver'; diff --git a/packages/browser/test/sdk.test.ts b/packages/browser/test/sdk.test.ts index 4929ee0f83d2..e00974ab0f5d 100644 --- a/packages/browser/test/sdk.test.ts +++ b/packages/browser/test/sdk.test.ts @@ -9,7 +9,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; import * as SentryCore from '@sentry/core'; import { Scope, createTransport } from '@sentry/core'; import { resolvedSyncPromise } from '@sentry/core'; -import type { Client, Integration } from '@sentry/types'; +import type { Client, Integration } from '@sentry/core'; import type { BrowserOptions } from '../src'; import { WINDOW } from '../src'; diff --git a/packages/browser/test/tracing/browserTracingIntegration.test.ts b/packages/browser/test/tracing/browserTracingIntegration.test.ts index 605b46919580..e86a011ff95d 100644 --- a/packages/browser/test/tracing/browserTracingIntegration.test.ts +++ b/packages/browser/test/tracing/browserTracingIntegration.test.ts @@ -30,7 +30,7 @@ import { spanToJSON, startInactiveSpan, } from '@sentry/core'; -import type { Span, StartSpanOptions } from '@sentry/types'; +import type { Span, StartSpanOptions } from '@sentry/core'; import { JSDOM } from 'jsdom'; import { BrowserClient } from '../../src/client'; import { WINDOW } from '../../src/helpers'; diff --git a/packages/browser/test/tracing/request.test.ts b/packages/browser/test/tracing/request.test.ts index cf11e59a013c..337d08caff24 100644 --- a/packages/browser/test/tracing/request.test.ts +++ b/packages/browser/test/tracing/request.test.ts @@ -2,7 +2,7 @@ import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vites import * as browserUtils from '@sentry-internal/browser-utils'; import * as utils from '@sentry/core'; -import type { Client } from '@sentry/types'; +import type { Client } from '@sentry/core'; import { WINDOW } from '../../src/helpers'; import { extractNetworkProtocol, instrumentOutgoingRequests, shouldAttachHeaders } from '../../src/tracing/request'; diff --git a/packages/browser/test/transports/fetch.test.ts b/packages/browser/test/transports/fetch.test.ts index 1b88e6263820..9a760439733b 100644 --- a/packages/browser/test/transports/fetch.test.ts +++ b/packages/browser/test/transports/fetch.test.ts @@ -2,7 +2,7 @@ import type { Mock } from 'vitest'; import { describe, expect, it, vi } from 'vitest'; import { createEnvelope, serializeEnvelope } from '@sentry/core'; -import type { EventEnvelope, EventItem } from '@sentry/types'; +import type { EventEnvelope, EventItem } from '@sentry/core'; import { makeFetchTransport } from '../../src/transports/fetch'; import type { BrowserTransportOptions } from '../../src/transports/types'; diff --git a/packages/browser/test/transports/offline.test.ts b/packages/browser/test/transports/offline.test.ts index 9f0e5ae5cdba..a9a396949588 100644 --- a/packages/browser/test/transports/offline.test.ts +++ b/packages/browser/test/transports/offline.test.ts @@ -10,7 +10,7 @@ import type { EventItem, InternalBaseTransportOptions, TransportMakeRequestResponse, -} from '@sentry/types'; +} from '@sentry/core'; import { createStore, makeBrowserOfflineTransport, push, shift, unshift } from '../../src/transports/offline'; diff --git a/packages/bun/package.json b/packages/bun/package.json index e2877c9444c3..7e5a8e5b5508 100644 --- a/packages/bun/package.json +++ b/packages/bun/package.json @@ -41,8 +41,7 @@ "dependencies": { "@sentry/core": "8.40.0", "@sentry/node": "8.40.0", - "@sentry/opentelemetry": "8.40.0", - "@sentry/types": "8.40.0" + "@sentry/opentelemetry": "8.40.0" }, "devDependencies": { "bun-types": "latest" diff --git a/packages/bun/src/index.ts b/packages/bun/src/index.ts index 02718da1153c..a88f56ab7cf8 100644 --- a/packages/bun/src/index.ts +++ b/packages/bun/src/index.ts @@ -17,7 +17,7 @@ export type { Stacktrace, Thread, User, -} from '@sentry/types'; +} from '@sentry/core'; export type { AddRequestDataToEventOptions } from '@sentry/core'; export { diff --git a/packages/bun/src/integrations/bunserver.ts b/packages/bun/src/integrations/bunserver.ts index f2811a026919..cb24df548dce 100644 --- a/packages/bun/src/integrations/bunserver.ts +++ b/packages/bun/src/integrations/bunserver.ts @@ -10,7 +10,7 @@ import { withIsolationScope, } from '@sentry/core'; import { extractQueryParamsFromUrl, getSanitizedUrlString, parseUrl } from '@sentry/core'; -import type { IntegrationFn, RequestEventData, SpanAttributes } from '@sentry/types'; +import type { IntegrationFn, RequestEventData, SpanAttributes } from '@sentry/core'; const INTEGRATION_NAME = 'BunServer'; diff --git a/packages/bun/src/sdk.ts b/packages/bun/src/sdk.ts index 534592a9ebb9..8bded2d492af 100644 --- a/packages/bun/src/sdk.ts +++ b/packages/bun/src/sdk.ts @@ -4,6 +4,7 @@ import { linkedErrorsIntegration, requestDataIntegration, } from '@sentry/core'; +import type { Integration, Options } from '@sentry/core'; import type { NodeClient } from '@sentry/node'; import { consoleIntegration, @@ -16,7 +17,6 @@ import { onUncaughtExceptionIntegration, onUnhandledRejectionIntegration, } from '@sentry/node'; -import type { Integration, Options } from '@sentry/types'; import { BunClient } from './client'; import { bunServerIntegration } from './integrations/bunserver'; diff --git a/packages/bun/src/transports/index.ts b/packages/bun/src/transports/index.ts index 0dd3da97638b..32ed837db668 100644 --- a/packages/bun/src/transports/index.ts +++ b/packages/bun/src/transports/index.ts @@ -1,6 +1,6 @@ import { createTransport, suppressTracing } from '@sentry/core'; import { rejectedSyncPromise } from '@sentry/core'; -import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types'; +import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/core'; export interface BunTransportOptions extends BaseTransportOptions { /** Custom headers for the transport. Used by the XHRTransport and FetchTransport */ diff --git a/packages/bun/src/types.ts b/packages/bun/src/types.ts index 933edef42627..fa0e2171214f 100644 --- a/packages/bun/src/types.ts +++ b/packages/bun/src/types.ts @@ -1,4 +1,4 @@ -import type { ClientOptions, Options, TracePropagationTargets } from '@sentry/types'; +import type { ClientOptions, Options, TracePropagationTargets } from '@sentry/core'; import type { BunClient } from './client'; import type { BunTransportOptions } from './transports'; @@ -39,7 +39,7 @@ export interface BaseBunOptions { /** * Configuration options for the Sentry Bun SDK - * @see @sentry/types Options for more information. + * @see @sentry/core Options for more information. */ export interface BunOptions extends Options, BaseBunOptions {} diff --git a/packages/cloudflare/package.json b/packages/cloudflare/package.json index 052f56a6bb3f..a39b29efe44c 100644 --- a/packages/cloudflare/package.json +++ b/packages/cloudflare/package.json @@ -39,8 +39,7 @@ "access": "public" }, "dependencies": { - "@sentry/core": "8.40.0", - "@sentry/types": "8.40.0" + "@sentry/core": "8.40.0" }, "optionalDependencies": { "@cloudflare/workers-types": "^4.x" diff --git a/packages/cloudflare/src/async.ts b/packages/cloudflare/src/async.ts index c287a04474eb..462912b8756f 100644 --- a/packages/cloudflare/src/async.ts +++ b/packages/cloudflare/src/async.ts @@ -1,5 +1,5 @@ import { getDefaultCurrentScope, getDefaultIsolationScope, setAsyncContextStrategy } from '@sentry/core'; -import type { Scope } from '@sentry/types'; +import type { Scope } from '@sentry/core'; // Need to use node: prefix for cloudflare workers compatibility // Note: Because we are using node:async_hooks, we need to set `node_compat` in the wrangler.toml diff --git a/packages/cloudflare/src/client.ts b/packages/cloudflare/src/client.ts index 22b6859d9bf8..3ef090953a62 100644 --- a/packages/cloudflare/src/client.ts +++ b/packages/cloudflare/src/client.ts @@ -1,6 +1,6 @@ import type { ServerRuntimeClientOptions } from '@sentry/core'; import { ServerRuntimeClient, applySdkMetadata } from '@sentry/core'; -import type { ClientOptions, Options } from '@sentry/types'; +import type { ClientOptions, Options } from '@sentry/core'; import type { CloudflareTransportOptions } from './transport'; @@ -37,7 +37,7 @@ interface BaseCloudflareOptions {} /** * Configuration options for the Sentry Cloudflare SDK * - * @see @sentry/types Options for more information. + * @see @sentry/core Options for more information. */ export interface CloudflareOptions extends Options, BaseCloudflareOptions {} diff --git a/packages/cloudflare/src/d1.ts b/packages/cloudflare/src/d1.ts index a67574fabb9e..7dc5e8c60f4c 100644 --- a/packages/cloudflare/src/d1.ts +++ b/packages/cloudflare/src/d1.ts @@ -1,6 +1,6 @@ import type { D1Database, D1PreparedStatement, D1Response } from '@cloudflare/workers-types'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SPAN_STATUS_ERROR, addBreadcrumb, startSpan } from '@sentry/core'; -import type { Span, SpanAttributes, StartSpanOptions } from '@sentry/types'; +import type { Span, SpanAttributes, StartSpanOptions } from '@sentry/core'; // Patching is based on internal Cloudflare D1 API // https://github.com/cloudflare/workerd/blob/cd5279e7b305003f1d9c851e73efa9d67e4b68b2/src/cloudflare/internal/d1-api.ts diff --git a/packages/cloudflare/src/index.ts b/packages/cloudflare/src/index.ts index 106cf4ab22fb..f3c80b8ddf32 100644 --- a/packages/cloudflare/src/index.ts +++ b/packages/cloudflare/src/index.ts @@ -17,7 +17,7 @@ export type { Stacktrace, Thread, User, -} from '@sentry/types'; +} from '@sentry/core'; export type { AddRequestDataToEventOptions } from '@sentry/core'; export type { CloudflareOptions } from './client'; diff --git a/packages/cloudflare/src/integrations/fetch.ts b/packages/cloudflare/src/integrations/fetch.ts index 2fbb93315795..87e194846281 100644 --- a/packages/cloudflare/src/integrations/fetch.ts +++ b/packages/cloudflare/src/integrations/fetch.ts @@ -12,7 +12,7 @@ import type { HandlerDataFetch, IntegrationFn, Span, -} from '@sentry/types'; +} from '@sentry/core'; const INTEGRATION_NAME = 'Fetch'; diff --git a/packages/cloudflare/src/request.ts b/packages/cloudflare/src/request.ts index cda67bfb7314..b315651e620a 100644 --- a/packages/cloudflare/src/request.ts +++ b/packages/cloudflare/src/request.ts @@ -14,7 +14,7 @@ import { withIsolationScope, } from '@sentry/core'; import { stripUrlQueryAndFragment } from '@sentry/core'; -import type { SpanAttributes } from '@sentry/types'; +import type { SpanAttributes } from '@sentry/core'; import type { CloudflareOptions } from './client'; import { addCloudResourceContext, addCultureContext, addRequest } from './scope-utils'; import { init } from './sdk'; diff --git a/packages/cloudflare/src/scope-utils.ts b/packages/cloudflare/src/scope-utils.ts index afa155907766..018cb0a27c6b 100644 --- a/packages/cloudflare/src/scope-utils.ts +++ b/packages/cloudflare/src/scope-utils.ts @@ -1,7 +1,7 @@ import type { IncomingRequestCfProperties } from '@cloudflare/workers-types'; import { winterCGRequestToRequestData } from '@sentry/core'; -import type { Scope } from '@sentry/types'; +import type { Scope } from '@sentry/core'; /** * Set cloud resource context on scope. diff --git a/packages/cloudflare/src/sdk.ts b/packages/cloudflare/src/sdk.ts index 0c8a50c4e44d..98d741473cb8 100644 --- a/packages/cloudflare/src/sdk.ts +++ b/packages/cloudflare/src/sdk.ts @@ -8,7 +8,7 @@ import { requestDataIntegration, } from '@sentry/core'; import { stackParserFromStackParserOptions } from '@sentry/core'; -import type { Integration } from '@sentry/types'; +import type { Integration } from '@sentry/core'; import type { CloudflareClientOptions, CloudflareOptions } from './client'; import { CloudflareClient } from './client'; diff --git a/packages/cloudflare/src/transport.ts b/packages/cloudflare/src/transport.ts index 9854a9050b51..a525cb0192b9 100644 --- a/packages/cloudflare/src/transport.ts +++ b/packages/cloudflare/src/transport.ts @@ -1,6 +1,6 @@ import { createTransport, suppressTracing } from '@sentry/core'; import { SentryError } from '@sentry/core'; -import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types'; +import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/core'; export interface CloudflareTransportOptions extends BaseTransportOptions { /** Fetch API init parameters. */ diff --git a/packages/cloudflare/src/vendor/stacktrace.ts b/packages/cloudflare/src/vendor/stacktrace.ts index 303600d495df..62e16bcea835 100644 --- a/packages/cloudflare/src/vendor/stacktrace.ts +++ b/packages/cloudflare/src/vendor/stacktrace.ts @@ -22,7 +22,7 @@ // SOFTWARE. import { basename, createStackParser, nodeStackLineParser } from '@sentry/core'; -import type { StackLineParser, StackLineParserFn, StackParser } from '@sentry/types'; +import type { StackLineParser, StackLineParserFn, StackParser } from '@sentry/core'; type GetModuleFn = (filename: string | undefined) => string | undefined; diff --git a/packages/cloudflare/test/handler.test.ts b/packages/cloudflare/test/handler.test.ts index 861360c7906f..3f44844e0b15 100644 --- a/packages/cloudflare/test/handler.test.ts +++ b/packages/cloudflare/test/handler.test.ts @@ -5,7 +5,7 @@ import { beforeEach, describe, expect, test, vi } from 'vitest'; import type { ScheduledController } from '@cloudflare/workers-types'; import * as SentryCore from '@sentry/core'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { CloudflareClient } from '../src/client'; import { withSentry } from '../src/handler'; diff --git a/packages/cloudflare/test/integrations/fetch.test.ts b/packages/cloudflare/test/integrations/fetch.test.ts index 86bb092facc8..43a3c749e64b 100644 --- a/packages/cloudflare/test/integrations/fetch.test.ts +++ b/packages/cloudflare/test/integrations/fetch.test.ts @@ -3,7 +3,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'; import * as sentryCore from '@sentry/core'; import * as sentryUtils from '@sentry/core'; import { createStackParser } from '@sentry/core'; -import type { HandlerDataFetch, Integration } from '@sentry/types'; +import type { HandlerDataFetch, Integration } from '@sentry/core'; import { CloudflareClient } from '../../src/client'; import { fetchIntegration } from '../../src/integrations/fetch'; diff --git a/packages/cloudflare/test/request.test.ts b/packages/cloudflare/test/request.test.ts index d35ccf3d50a7..52610fbdf27c 100644 --- a/packages/cloudflare/test/request.test.ts +++ b/packages/cloudflare/test/request.test.ts @@ -4,7 +4,7 @@ import { beforeAll, beforeEach, describe, expect, test, vi } from 'vitest'; import * as SentryCore from '@sentry/core'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { setAsyncLocalStorageAsyncContextStrategy } from '../src/async'; import type { CloudflareOptions } from '../src/client'; import { CloudflareClient } from '../src/client'; diff --git a/packages/cloudflare/test/transport.test.ts b/packages/cloudflare/test/transport.test.ts index 069bc119dc37..d3aca638eba1 100644 --- a/packages/cloudflare/test/transport.test.ts +++ b/packages/cloudflare/test/transport.test.ts @@ -1,5 +1,5 @@ import { createEnvelope, serializeEnvelope } from '@sentry/core'; -import type { EventEnvelope, EventItem } from '@sentry/types'; +import type { EventEnvelope, EventItem } from '@sentry/core'; import { afterAll, describe, expect, it, vi } from 'vitest'; import type { CloudflareTransportOptions } from '../src/transport'; diff --git a/packages/core/src/api.ts b/packages/core/src/api.ts index b7cd786d215a..548b40a3ce30 100644 --- a/packages/core/src/api.ts +++ b/packages/core/src/api.ts @@ -1,4 +1,4 @@ -import type { DsnComponents, DsnLike, SdkInfo } from '@sentry/types'; +import type { DsnComponents, DsnLike, SdkInfo } from './types-hoist'; import { dsnToString, makeDsn } from './utils-hoist/dsn'; const SENTRY_API_VERSION = '7'; diff --git a/packages/core/src/asyncContext/stackStrategy.ts b/packages/core/src/asyncContext/stackStrategy.ts index 256efb4a79e2..8879461c8fc3 100644 --- a/packages/core/src/asyncContext/stackStrategy.ts +++ b/packages/core/src/asyncContext/stackStrategy.ts @@ -1,6 +1,6 @@ -import type { Client, Scope as ScopeInterface } from '@sentry/types'; import { getDefaultCurrentScope, getDefaultIsolationScope } from '../defaultScopes'; import { Scope } from '../scope'; +import type { Client, Scope as ScopeInterface } from '../types-hoist'; import { isThenable } from '../utils-hoist'; import { getMainCarrier, getSentryCarrier } from './../carrier'; diff --git a/packages/core/src/asyncContext/types.ts b/packages/core/src/asyncContext/types.ts index 9fb9f9f4bec8..7b5bf8acc54c 100644 --- a/packages/core/src/asyncContext/types.ts +++ b/packages/core/src/asyncContext/types.ts @@ -1,4 +1,4 @@ -import type { Scope } from '@sentry/types'; +import type { Scope } from '../types-hoist'; import type { getTraceData } from '../utils/traceData'; import type { startInactiveSpan, diff --git a/packages/core/src/baseclient.ts b/packages/core/src/baseclient.ts index 23010505a7dc..5d06d539b6ec 100644 --- a/packages/core/src/baseclient.ts +++ b/packages/core/src/baseclient.ts @@ -29,7 +29,7 @@ import type { TransactionEvent, Transport, TransportMakeRequestResponse, -} from '@sentry/types'; +} from './types-hoist'; import { getEnvelopeEndpointWithUrlEncodedAuth } from './api'; import { getCurrentScope, getIsolationScope, getTraceContextFromScope } from './currentScopes'; @@ -260,7 +260,7 @@ export abstract class BaseClient implements Client { } /** - * @see SdkMetadata in @sentry/types + * @see SdkMetadata * * @return The metadata of the SDK */ diff --git a/packages/core/src/breadcrumbs.ts b/packages/core/src/breadcrumbs.ts index 2b1f78b50e8d..b4a167a6f4d3 100644 --- a/packages/core/src/breadcrumbs.ts +++ b/packages/core/src/breadcrumbs.ts @@ -1,5 +1,5 @@ -import type { Breadcrumb, BreadcrumbHint } from '@sentry/types'; import { getClient, getIsolationScope } from './currentScopes'; +import type { Breadcrumb, BreadcrumbHint } from './types-hoist'; import { consoleSandbox } from './utils-hoist/logger'; import { dateTimestampInSeconds } from './utils-hoist/time'; diff --git a/packages/core/src/carrier.ts b/packages/core/src/carrier.ts index 6f212fc67edb..d053234b4929 100644 --- a/packages/core/src/carrier.ts +++ b/packages/core/src/carrier.ts @@ -1,6 +1,6 @@ -import type { Client, Integration, MetricsAggregator, Scope } from '@sentry/types'; import type { AsyncContextStack } from './asyncContext/stackStrategy'; import type { AsyncContextStrategy } from './asyncContext/types'; +import type { Client, Integration, MetricsAggregator, Scope } from './types-hoist'; import { SDK_VERSION } from './utils-hoist/version'; import { GLOBAL_OBJ } from './utils-hoist/worldwide'; diff --git a/packages/core/src/checkin.ts b/packages/core/src/checkin.ts index f9e16f8d8cd1..34f2428cbcfb 100644 --- a/packages/core/src/checkin.ts +++ b/packages/core/src/checkin.ts @@ -5,7 +5,7 @@ import type { DynamicSamplingContext, SdkMetadata, SerializedCheckIn, -} from '@sentry/types'; +} from './types-hoist'; import { dsnToString } from './utils-hoist/dsn'; import { createEnvelope } from './utils-hoist/envelope'; import { dropUndefinedKeys } from './utils-hoist/object'; diff --git a/packages/core/src/currentScopes.ts b/packages/core/src/currentScopes.ts index c39b5ace41a3..85b148738467 100644 --- a/packages/core/src/currentScopes.ts +++ b/packages/core/src/currentScopes.ts @@ -1,8 +1,7 @@ -import type { Scope, TraceContext } from '@sentry/types'; -import type { Client } from '@sentry/types'; import { getAsyncContextStrategy } from './asyncContext'; import { getMainCarrier } from './carrier'; import { Scope as ScopeClass } from './scope'; +import type { Client, Scope, TraceContext } from './types-hoist'; import { dropUndefinedKeys } from './utils-hoist/object'; import { getGlobalSingleton } from './utils-hoist/worldwide'; diff --git a/packages/core/src/defaultScopes.ts b/packages/core/src/defaultScopes.ts index fa2f4700fdf9..c9fb32c2049e 100644 --- a/packages/core/src/defaultScopes.ts +++ b/packages/core/src/defaultScopes.ts @@ -1,5 +1,5 @@ -import type { Scope } from '@sentry/types'; import { Scope as ScopeClass } from './scope'; +import type { Scope } from './types-hoist'; import { getGlobalSingleton } from './utils-hoist/worldwide'; /** Get the default current scope. */ diff --git a/packages/core/src/envelope.ts b/packages/core/src/envelope.ts index 8ecdeb0d604f..7281f2d2ea7f 100644 --- a/packages/core/src/envelope.ts +++ b/packages/core/src/envelope.ts @@ -1,3 +1,5 @@ +import { getDynamicSamplingContextFromSpan } from './tracing/dynamicSamplingContext'; +import type { SentrySpan } from './tracing/sentrySpan'; import type { Client, DsnComponents, @@ -14,9 +16,7 @@ import type { SpanEnvelope, SpanItem, SpanJSON, -} from '@sentry/types'; -import { getDynamicSamplingContextFromSpan } from './tracing/dynamicSamplingContext'; -import type { SentrySpan } from './tracing/sentrySpan'; +} from './types-hoist'; import { dsnToString } from './utils-hoist/dsn'; import { createEnvelope, diff --git a/packages/core/src/eventProcessors.ts b/packages/core/src/eventProcessors.ts index 5886384879c5..0691fac89680 100644 --- a/packages/core/src/eventProcessors.ts +++ b/packages/core/src/eventProcessors.ts @@ -1,6 +1,5 @@ -import type { Event, EventHint, EventProcessor } from '@sentry/types'; - import { DEBUG_BUILD } from './debug-build'; +import type { Event, EventHint, EventProcessor } from './types-hoist'; import { isThenable } from './utils-hoist/is'; import { logger } from './utils-hoist/logger'; import { SyncPromise } from './utils-hoist/syncpromise'; diff --git a/packages/core/src/exports.ts b/packages/core/src/exports.ts index 5e2be168487c..0ae3fa3d2775 100644 --- a/packages/core/src/exports.ts +++ b/packages/core/src/exports.ts @@ -13,7 +13,7 @@ import type { SessionContext, SeverityLevel, User, -} from '@sentry/types'; +} from './types-hoist'; import { DEFAULT_ENVIRONMENT } from './constants'; import { getClient, getCurrentScope, getIsolationScope, withIsolationScope } from './currentScopes'; diff --git a/packages/core/src/feedback.ts b/packages/core/src/feedback.ts index e49f8ddc27a9..95a5bc4fa2a9 100644 --- a/packages/core/src/feedback.ts +++ b/packages/core/src/feedback.ts @@ -1,5 +1,5 @@ -import type { EventHint, FeedbackEvent, SendFeedbackParams } from '@sentry/types'; import { getClient, getCurrentScope } from './currentScopes'; +import type { EventHint, FeedbackEvent, SendFeedbackParams } from './types-hoist'; import { dropUndefinedKeys } from './utils-hoist/object'; /** diff --git a/packages/core/src/fetch.ts b/packages/core/src/fetch.ts index 1dbb84423678..7385298f925c 100644 --- a/packages/core/src/fetch.ts +++ b/packages/core/src/fetch.ts @@ -1,7 +1,7 @@ -import type { Client, HandlerDataFetch, Scope, Span, SpanOrigin } from '@sentry/types'; import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from './semanticAttributes'; import { SPAN_STATUS_ERROR, setHttpStatus, startInactiveSpan } from './tracing'; import { SentryNonRecordingSpan } from './tracing/sentryNonRecordingSpan'; +import type { Client, HandlerDataFetch, Scope, Span, SpanOrigin } from './types-hoist'; import { SENTRY_BAGGAGE_KEY_PREFIX } from './utils-hoist/baggage'; import { isInstanceOf } from './utils-hoist/is'; import { parseUrl } from './utils-hoist/url'; diff --git a/packages/core/src/getCurrentHubShim.ts b/packages/core/src/getCurrentHubShim.ts index 46f8f94cb490..ceea470a727c 100644 --- a/packages/core/src/getCurrentHubShim.ts +++ b/packages/core/src/getCurrentHubShim.ts @@ -1,4 +1,3 @@ -import type { Client, EventHint, Hub, Integration, IntegrationClass, SeverityLevel } from '@sentry/types'; import { addBreadcrumb } from './breadcrumbs'; import { getClient, getCurrentScope, getIsolationScope, withScope } from './currentScopes'; import { @@ -12,6 +11,7 @@ import { setUser, startSession, } from './exports'; +import type { Client, EventHint, Hub, Integration, IntegrationClass, SeverityLevel } from './types-hoist'; /** * This is for legacy reasons, and returns a proxy object instead of a hub to be used. diff --git a/packages/core/src/integration.ts b/packages/core/src/integration.ts index 9f447163d8f0..9c72e7baad4c 100644 --- a/packages/core/src/integration.ts +++ b/packages/core/src/integration.ts @@ -1,15 +1,9 @@ -import type { Client, Event, EventHint, Integration, IntegrationFn, Options } from '@sentry/types'; import { getClient } from './currentScopes'; +import type { Client, Event, EventHint, Integration, IntegrationFn, Options } from './types-hoist'; import { DEBUG_BUILD } from './debug-build'; import { logger } from './utils-hoist/logger'; -declare module '@sentry/types' { - interface Integration { - isDefaultInstance?: boolean; - } -} - export const installedIntegrations: string[] = []; /** Map of integrations assigned to a client */ diff --git a/packages/core/src/integrations/captureconsole.ts b/packages/core/src/integrations/captureconsole.ts index aec865320d52..563296511fd6 100644 --- a/packages/core/src/integrations/captureconsole.ts +++ b/packages/core/src/integrations/captureconsole.ts @@ -1,7 +1,7 @@ -import type { CaptureContext, IntegrationFn } from '@sentry/types'; import { getClient, withScope } from '../currentScopes'; import { captureException, captureMessage } from '../exports'; import { defineIntegration } from '../integration'; +import type { CaptureContext, IntegrationFn } from '../types-hoist'; import { addConsoleInstrumentationHandler } from '../utils-hoist/instrument/console'; import { CONSOLE_LEVELS } from '../utils-hoist/logger'; import { addExceptionMechanism } from '../utils-hoist/misc'; diff --git a/packages/core/src/integrations/debug.ts b/packages/core/src/integrations/debug.ts index 4c372e2942bb..66c70571365a 100644 --- a/packages/core/src/integrations/debug.ts +++ b/packages/core/src/integrations/debug.ts @@ -1,5 +1,5 @@ -import type { Event, EventHint, IntegrationFn } from '@sentry/types'; import { defineIntegration } from '../integration'; +import type { Event, EventHint, IntegrationFn } from '../types-hoist'; import { consoleSandbox } from '../utils-hoist/logger'; const INTEGRATION_NAME = 'Debug'; diff --git a/packages/core/src/integrations/dedupe.ts b/packages/core/src/integrations/dedupe.ts index d0a3b75e9f0c..7687c1f5b73e 100644 --- a/packages/core/src/integrations/dedupe.ts +++ b/packages/core/src/integrations/dedupe.ts @@ -1,5 +1,5 @@ -import type { Event, Exception, IntegrationFn, StackFrame } from '@sentry/types'; import { defineIntegration } from '../integration'; +import type { Event, Exception, IntegrationFn, StackFrame } from '../types-hoist'; import { DEBUG_BUILD } from '../debug-build'; import { logger } from '../utils-hoist/logger'; diff --git a/packages/core/src/integrations/extraerrordata.ts b/packages/core/src/integrations/extraerrordata.ts index d56d82daa2c1..9a74135db2a8 100644 --- a/packages/core/src/integrations/extraerrordata.ts +++ b/packages/core/src/integrations/extraerrordata.ts @@ -1,5 +1,5 @@ -import type { Contexts, Event, EventHint, ExtendedError, IntegrationFn } from '@sentry/types'; import { defineIntegration } from '../integration'; +import type { Contexts, Event, EventHint, ExtendedError, IntegrationFn } from '../types-hoist'; import { DEBUG_BUILD } from '../debug-build'; import { isError, isPlainObject } from '../utils-hoist/is'; diff --git a/packages/core/src/integrations/functiontostring.ts b/packages/core/src/integrations/functiontostring.ts index b43c882f381f..ddac187ac7c9 100644 --- a/packages/core/src/integrations/functiontostring.ts +++ b/packages/core/src/integrations/functiontostring.ts @@ -1,6 +1,6 @@ -import type { Client, IntegrationFn, WrappedFunction } from '@sentry/types'; import { getClient } from '../currentScopes'; import { defineIntegration } from '../integration'; +import type { Client, IntegrationFn, WrappedFunction } from '../types-hoist'; import { getOriginalFunction } from '../utils-hoist/object'; let originalFunctionToString: () => void; diff --git a/packages/core/src/integrations/inboundfilters.ts b/packages/core/src/integrations/inboundfilters.ts index f03068cabf26..c78b602d3304 100644 --- a/packages/core/src/integrations/inboundfilters.ts +++ b/packages/core/src/integrations/inboundfilters.ts @@ -1,4 +1,4 @@ -import type { Event, IntegrationFn, StackFrame } from '@sentry/types'; +import type { Event, IntegrationFn, StackFrame } from '../types-hoist'; import { DEBUG_BUILD } from '../debug-build'; import { defineIntegration } from '../integration'; diff --git a/packages/core/src/integrations/linkederrors.ts b/packages/core/src/integrations/linkederrors.ts index fc2f62ec120e..caaefae1a6d5 100644 --- a/packages/core/src/integrations/linkederrors.ts +++ b/packages/core/src/integrations/linkederrors.ts @@ -1,5 +1,5 @@ -import type { IntegrationFn } from '@sentry/types'; import { defineIntegration } from '../integration'; +import type { IntegrationFn } from '../types-hoist'; import { applyAggregateErrorsToEvent } from '../utils-hoist/aggregate-errors'; import { exceptionFromError } from '../utils-hoist/eventbuilder'; diff --git a/packages/core/src/integrations/metadata.ts b/packages/core/src/integrations/metadata.ts index 1f02b57461b5..dc1107d5d423 100644 --- a/packages/core/src/integrations/metadata.ts +++ b/packages/core/src/integrations/metadata.ts @@ -1,5 +1,5 @@ -import type { EventItem } from '@sentry/types'; import { defineIntegration } from '../integration'; +import type { EventItem } from '../types-hoist'; import { addMetadataToStackFrames, stripMetadataFromStackFrames } from '../metadata'; import { forEachEnvelopeItem } from '../utils-hoist/envelope'; diff --git a/packages/core/src/integrations/requestdata.ts b/packages/core/src/integrations/requestdata.ts index cce86a8966c8..8f23912c5b58 100644 --- a/packages/core/src/integrations/requestdata.ts +++ b/packages/core/src/integrations/requestdata.ts @@ -1,5 +1,5 @@ -import type { IntegrationFn } from '@sentry/types'; import { defineIntegration } from '../integration'; +import type { IntegrationFn } from '../types-hoist'; import { type AddRequestDataToEventOptions, addNormalizedRequestDataToEvent, diff --git a/packages/core/src/integrations/rewriteframes.ts b/packages/core/src/integrations/rewriteframes.ts index 88e9038cfd47..ab9d1b812987 100644 --- a/packages/core/src/integrations/rewriteframes.ts +++ b/packages/core/src/integrations/rewriteframes.ts @@ -1,5 +1,5 @@ -import type { Event, StackFrame, Stacktrace } from '@sentry/types'; import { defineIntegration } from '../integration'; +import type { Event, StackFrame, Stacktrace } from '../types-hoist'; import { basename, relative } from '../utils-hoist/path'; import { GLOBAL_OBJ } from '../utils-hoist/worldwide'; diff --git a/packages/core/src/integrations/sessiontiming.ts b/packages/core/src/integrations/sessiontiming.ts index e52cb3c97482..a7112c4f939c 100644 --- a/packages/core/src/integrations/sessiontiming.ts +++ b/packages/core/src/integrations/sessiontiming.ts @@ -1,5 +1,5 @@ -import type { IntegrationFn } from '@sentry/types'; import { defineIntegration } from '../integration'; +import type { IntegrationFn } from '../types-hoist'; import { timestampInSeconds } from '../utils-hoist/time'; const INTEGRATION_NAME = 'SessionTiming'; diff --git a/packages/core/src/integrations/third-party-errors-filter.ts b/packages/core/src/integrations/third-party-errors-filter.ts index 5e64a8736826..9e5e776a5b0f 100644 --- a/packages/core/src/integrations/third-party-errors-filter.ts +++ b/packages/core/src/integrations/third-party-errors-filter.ts @@ -1,6 +1,6 @@ -import type { Event, EventItem } from '@sentry/types'; import { defineIntegration } from '../integration'; import { addMetadataToStackFrames, stripMetadataFromStackFrames } from '../metadata'; +import type { Event, EventItem } from '../types-hoist'; import { forEachEnvelopeItem } from '../utils-hoist/envelope'; import { getFramesFromEvent } from '../utils-hoist/stacktrace'; diff --git a/packages/core/src/integrations/zoderrors.ts b/packages/core/src/integrations/zoderrors.ts index 1c2cb8e59b56..fc36925eb0ea 100644 --- a/packages/core/src/integrations/zoderrors.ts +++ b/packages/core/src/integrations/zoderrors.ts @@ -1,6 +1,5 @@ -import type { IntegrationFn } from '@sentry/types'; -import type { Event, EventHint } from '@sentry/types'; import { defineIntegration } from '../integration'; +import type { Event, EventHint, IntegrationFn } from '../types-hoist'; import { isError } from '../utils-hoist/is'; import { truncate } from '../utils-hoist/string'; diff --git a/packages/core/src/metadata.ts b/packages/core/src/metadata.ts index 11a0af6eaadb..a3933dc2a45f 100644 --- a/packages/core/src/metadata.ts +++ b/packages/core/src/metadata.ts @@ -1,4 +1,4 @@ -import type { Event, StackParser } from '@sentry/types'; +import type { Event, StackParser } from './types-hoist'; import { GLOBAL_OBJ } from './utils-hoist/worldwide'; /** Keys are source filename/url, values are metadata objects. */ diff --git a/packages/core/src/metrics/aggregator.ts b/packages/core/src/metrics/aggregator.ts index 0fee0551fc66..899597e30d06 100644 --- a/packages/core/src/metrics/aggregator.ts +++ b/packages/core/src/metrics/aggregator.ts @@ -1,4 +1,4 @@ -import type { Client, MeasurementUnit, MetricsAggregator as MetricsAggregatorBase, Primitive } from '@sentry/types'; +import type { Client, MeasurementUnit, MetricsAggregator as MetricsAggregatorBase, Primitive } from '../types-hoist'; import { timestampInSeconds } from '../utils-hoist/time'; import { updateMetricSummaryOnActiveSpan } from '../utils/spanUtils'; import { DEFAULT_FLUSH_INTERVAL, MAX_WEIGHT, SET_METRIC_TYPE } from './constants'; diff --git a/packages/core/src/metrics/browser-aggregator.ts b/packages/core/src/metrics/browser-aggregator.ts index 0818f691f313..fca72f48f40f 100644 --- a/packages/core/src/metrics/browser-aggregator.ts +++ b/packages/core/src/metrics/browser-aggregator.ts @@ -1,4 +1,4 @@ -import type { Client, MeasurementUnit, MetricsAggregator, Primitive } from '@sentry/types'; +import type { Client, MeasurementUnit, MetricsAggregator, Primitive } from '../types-hoist'; import { timestampInSeconds } from '../utils-hoist/time'; import { updateMetricSummaryOnActiveSpan } from '../utils/spanUtils'; import { DEFAULT_BROWSER_FLUSH_INTERVAL, SET_METRIC_TYPE } from './constants'; diff --git a/packages/core/src/metrics/envelope.ts b/packages/core/src/metrics/envelope.ts index 8924df587771..7c1a4d612577 100644 --- a/packages/core/src/metrics/envelope.ts +++ b/packages/core/src/metrics/envelope.ts @@ -1,4 +1,4 @@ -import type { Client, DsnComponents, MetricBucketItem, SdkMetadata, StatsdEnvelope, StatsdItem } from '@sentry/types'; +import type { Client, DsnComponents, MetricBucketItem, SdkMetadata, StatsdEnvelope, StatsdItem } from '../types-hoist'; import { dsnToString } from '../utils-hoist/dsn'; import { createEnvelope } from '../utils-hoist/envelope'; import { logger } from '../utils-hoist/logger'; diff --git a/packages/core/src/metrics/exports-default.ts b/packages/core/src/metrics/exports-default.ts index 7a271696f025..e071015b73f1 100644 --- a/packages/core/src/metrics/exports-default.ts +++ b/packages/core/src/metrics/exports-default.ts @@ -4,7 +4,7 @@ import type { MetricData, Metrics, MetricsAggregator as MetricsAggregatorInterface, -} from '@sentry/types'; +} from '../types-hoist'; import { MetricsAggregator } from './aggregator'; import { metrics as metricsCore } from './exports'; diff --git a/packages/core/src/metrics/exports.ts b/packages/core/src/metrics/exports.ts index 96a52f62e5c9..00f100bcaeb2 100644 --- a/packages/core/src/metrics/exports.ts +++ b/packages/core/src/metrics/exports.ts @@ -1,7 +1,7 @@ -import type { Client, DurationUnit, MetricData, MetricsAggregator as MetricsAggregatorInterface } from '@sentry/types'; import { getClient } from '../currentScopes'; import { DEBUG_BUILD } from '../debug-build'; import { startSpanManual } from '../tracing'; +import type { Client, DurationUnit, MetricData, MetricsAggregator as MetricsAggregatorInterface } from '../types-hoist'; import { logger } from '../utils-hoist/logger'; import { timestampInSeconds } from '../utils-hoist/time'; import { getGlobalSingleton } from '../utils-hoist/worldwide'; diff --git a/packages/core/src/metrics/instance.ts b/packages/core/src/metrics/instance.ts index f7d37d8118ed..28b57ae7f75c 100644 --- a/packages/core/src/metrics/instance.ts +++ b/packages/core/src/metrics/instance.ts @@ -1,4 +1,4 @@ -import type { MetricInstance } from '@sentry/types'; +import type { MetricInstance } from '../types-hoist'; import { COUNTER_METRIC_TYPE, DISTRIBUTION_METRIC_TYPE, GAUGE_METRIC_TYPE, SET_METRIC_TYPE } from './constants'; import { simpleHash } from './utils'; diff --git a/packages/core/src/metrics/metric-summary.ts b/packages/core/src/metrics/metric-summary.ts index 90a3365ccdaf..e7a8a00c289a 100644 --- a/packages/core/src/metrics/metric-summary.ts +++ b/packages/core/src/metrics/metric-summary.ts @@ -1,6 +1,6 @@ -import type { MeasurementUnit, Span } from '@sentry/types'; -import type { MetricSummary } from '@sentry/types'; -import type { Primitive } from '@sentry/types'; +import type { MeasurementUnit, Span } from '../types-hoist'; +import type { MetricSummary } from '../types-hoist'; +import type { Primitive } from '../types-hoist'; import { dropUndefinedKeys } from '../utils-hoist/object'; import type { MetricType } from './types'; diff --git a/packages/core/src/metrics/types.ts b/packages/core/src/metrics/types.ts index 000c401e7a34..d1d01cd1abab 100644 --- a/packages/core/src/metrics/types.ts +++ b/packages/core/src/metrics/types.ts @@ -1,4 +1,4 @@ -import type { MetricBucketItem } from '@sentry/types'; +import type { MetricBucketItem } from '../types-hoist'; import type { COUNTER_METRIC_TYPE, DISTRIBUTION_METRIC_TYPE, GAUGE_METRIC_TYPE, SET_METRIC_TYPE } from './constants'; export type MetricType = diff --git a/packages/core/src/metrics/utils.ts b/packages/core/src/metrics/utils.ts index 06df4a96bced..903a185e27f3 100644 --- a/packages/core/src/metrics/utils.ts +++ b/packages/core/src/metrics/utils.ts @@ -1,4 +1,4 @@ -import type { MeasurementUnit, MetricBucketItem, Primitive } from '@sentry/types'; +import type { MeasurementUnit, MetricBucketItem, Primitive } from '../types-hoist'; import { dropUndefinedKeys } from '../utils-hoist/object'; import type { MetricType } from './types'; diff --git a/packages/core/src/profiling.ts b/packages/core/src/profiling.ts index 877f9d71ac15..9f55a3879b8d 100644 --- a/packages/core/src/profiling.ts +++ b/packages/core/src/profiling.ts @@ -1,4 +1,4 @@ -import type { Profiler, ProfilingIntegration } from '@sentry/types'; +import type { Profiler, ProfilingIntegration } from './types-hoist'; import { getClient } from './currentScopes'; import { DEBUG_BUILD } from './debug-build'; diff --git a/packages/core/src/scope.ts b/packages/core/src/scope.ts index 43a818bad08d..656ada3d6355 100644 --- a/packages/core/src/scope.ts +++ b/packages/core/src/scope.ts @@ -20,7 +20,7 @@ import type { Session, SeverityLevel, User, -} from '@sentry/types'; +} from './types-hoist'; import { updateSession } from './session'; import { isPlainObject } from './utils-hoist/is'; @@ -600,10 +600,6 @@ class ScopeClass implements ScopeInterface { } } -// NOTE: By exporting this here as const & type, instead of doing `export class`, -// We can get the correct class when importing from `@sentry/core`, but the original type (from `@sentry/types`) -// This is helpful for interop, e.g. when doing `import type { Scope } from '@sentry/node';` (which re-exports this) - /** * Holds additional event information. */ diff --git a/packages/core/src/sdk.ts b/packages/core/src/sdk.ts index 82895b9a03f9..64037fa37d5c 100644 --- a/packages/core/src/sdk.ts +++ b/packages/core/src/sdk.ts @@ -1,5 +1,5 @@ -import type { Client, ClientOptions } from '@sentry/types'; import { getCurrentScope } from './currentScopes'; +import type { Client, ClientOptions } from './types-hoist'; import { DEBUG_BUILD } from './debug-build'; import { consoleSandbox, logger } from './utils-hoist/logger'; diff --git a/packages/core/src/server-runtime-client.ts b/packages/core/src/server-runtime-client.ts index c044c1be7bc1..5435d5c8fff0 100644 --- a/packages/core/src/server-runtime-client.ts +++ b/packages/core/src/server-runtime-client.ts @@ -10,7 +10,7 @@ import type { SerializedCheckIn, SeverityLevel, TraceContext, -} from '@sentry/types'; +} from './types-hoist'; import { BaseClient } from './baseclient'; import { createCheckInEnvelope } from './checkin'; diff --git a/packages/core/src/session.ts b/packages/core/src/session.ts index bf584482e87b..058fd7d68c14 100644 --- a/packages/core/src/session.ts +++ b/packages/core/src/session.ts @@ -1,4 +1,4 @@ -import type { SerializedSession, Session, SessionContext, SessionStatus } from '@sentry/types'; +import type { SerializedSession, Session, SessionContext, SessionStatus } from './types-hoist'; import { dropUndefinedKeys, timestampInSeconds, uuid4 } from './utils-hoist'; /** diff --git a/packages/core/src/sessionflusher.ts b/packages/core/src/sessionflusher.ts index 8734c0de2f12..e35b8f70785d 100644 --- a/packages/core/src/sessionflusher.ts +++ b/packages/core/src/sessionflusher.ts @@ -1,11 +1,11 @@ +import { getIsolationScope } from './currentScopes'; import type { AggregationCounts, Client, RequestSessionStatus, SessionAggregates, SessionFlusherLike, -} from '@sentry/types'; -import { getIsolationScope } from './currentScopes'; +} from './types-hoist'; import { dropUndefinedKeys } from './utils-hoist/object'; type ReleaseHealthAttributes = { diff --git a/packages/core/src/tracing/dynamicSamplingContext.ts b/packages/core/src/tracing/dynamicSamplingContext.ts index a1bb008a2572..cdf6951fe95b 100644 --- a/packages/core/src/tracing/dynamicSamplingContext.ts +++ b/packages/core/src/tracing/dynamicSamplingContext.ts @@ -1,4 +1,4 @@ -import type { Client, DynamicSamplingContext, Scope, Span } from '@sentry/types'; +import type { Client, DynamicSamplingContext, Scope, Span } from '../types-hoist'; import { DEFAULT_ENVIRONMENT } from '../constants'; import { getClient } from '../currentScopes'; diff --git a/packages/core/src/tracing/idleSpan.ts b/packages/core/src/tracing/idleSpan.ts index 6a6dd12fc6e8..690e9aba4e83 100644 --- a/packages/core/src/tracing/idleSpan.ts +++ b/packages/core/src/tracing/idleSpan.ts @@ -1,5 +1,5 @@ -import type { Span, SpanAttributes, StartSpanOptions } from '@sentry/types'; import { getClient, getCurrentScope } from '../currentScopes'; +import type { Span, SpanAttributes, StartSpanOptions } from '../types-hoist'; import { DEBUG_BUILD } from '../debug-build'; import { SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON } from '../semanticAttributes'; diff --git a/packages/core/src/tracing/logSpans.ts b/packages/core/src/tracing/logSpans.ts index f7b0522bf6dc..669f0a4f2477 100644 --- a/packages/core/src/tracing/logSpans.ts +++ b/packages/core/src/tracing/logSpans.ts @@ -1,5 +1,5 @@ -import type { Span } from '@sentry/types'; import { DEBUG_BUILD } from '../debug-build'; +import type { Span } from '../types-hoist'; import { logger } from '../utils-hoist/logger'; import { getRootSpan, spanIsSampled, spanToJSON } from '../utils/spanUtils'; diff --git a/packages/core/src/tracing/measurement.ts b/packages/core/src/tracing/measurement.ts index f6581471e4e2..80b6be8a26bc 100644 --- a/packages/core/src/tracing/measurement.ts +++ b/packages/core/src/tracing/measurement.ts @@ -1,9 +1,9 @@ -import type { MeasurementUnit, Measurements, TimedEvent } from '@sentry/types'; import { DEBUG_BUILD } from '../debug-build'; import { SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_UNIT, SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_VALUE, } from '../semanticAttributes'; +import type { MeasurementUnit, Measurements, TimedEvent } from '../types-hoist'; import { logger } from '../utils-hoist'; import { getActiveSpan, getRootSpan } from '../utils/spanUtils'; diff --git a/packages/core/src/tracing/sampling.ts b/packages/core/src/tracing/sampling.ts index de737d3d5776..9109e78e0343 100644 --- a/packages/core/src/tracing/sampling.ts +++ b/packages/core/src/tracing/sampling.ts @@ -1,4 +1,4 @@ -import type { Options, SamplingContext } from '@sentry/types'; +import type { Options, SamplingContext } from '../types-hoist'; import { DEBUG_BUILD } from '../debug-build'; import { logger } from '../utils-hoist/logger'; diff --git a/packages/core/src/tracing/sentryNonRecordingSpan.ts b/packages/core/src/tracing/sentryNonRecordingSpan.ts index 6f1365671bc0..89997cb0ad35 100644 --- a/packages/core/src/tracing/sentryNonRecordingSpan.ts +++ b/packages/core/src/tracing/sentryNonRecordingSpan.ts @@ -6,7 +6,7 @@ import type { SpanContextData, SpanStatus, SpanTimeInput, -} from '@sentry/types'; +} from '../types-hoist'; import { uuid4 } from '../utils-hoist/misc'; import { TRACE_FLAG_NONE } from '../utils/spanUtils'; diff --git a/packages/core/src/tracing/sentrySpan.ts b/packages/core/src/tracing/sentrySpan.ts index 4e0b0fb07e73..fb3e8f842244 100644 --- a/packages/core/src/tracing/sentrySpan.ts +++ b/packages/core/src/tracing/sentrySpan.ts @@ -1,3 +1,5 @@ +import { getClient, getCurrentScope } from '../currentScopes'; +import { DEBUG_BUILD } from '../debug-build'; import type { SentrySpanArguments, Span, @@ -12,9 +14,7 @@ import type { TimedEvent, TransactionEvent, TransactionSource, -} from '@sentry/types'; -import { getClient, getCurrentScope } from '../currentScopes'; -import { DEBUG_BUILD } from '../debug-build'; +} from '../types-hoist'; import { createSpanEnvelope } from '../envelope'; import { getMetricSummaryJsonForSpan } from '../metrics/metric-summary'; diff --git a/packages/core/src/tracing/spanstatus.ts b/packages/core/src/tracing/spanstatus.ts index 81983e1ad599..9cebe0f27284 100644 --- a/packages/core/src/tracing/spanstatus.ts +++ b/packages/core/src/tracing/spanstatus.ts @@ -1,4 +1,4 @@ -import type { Span, SpanStatus } from '@sentry/types'; +import type { Span, SpanStatus } from '../types-hoist'; export const SPAN_STATUS_UNSET = 0; export const SPAN_STATUS_OK = 1; diff --git a/packages/core/src/tracing/trace.ts b/packages/core/src/tracing/trace.ts index 311959cbe4d4..d44d0b216db3 100644 --- a/packages/core/src/tracing/trace.ts +++ b/packages/core/src/tracing/trace.ts @@ -1,8 +1,8 @@ /* eslint-disable max-lines */ -import type { ClientOptions, Scope, SentrySpanArguments, Span, SpanTimeInput, StartSpanOptions } from '@sentry/types'; import type { AsyncContextStrategy } from '../asyncContext/types'; import { getMainCarrier } from '../carrier'; +import type { ClientOptions, Scope, SentrySpanArguments, Span, SpanTimeInput, StartSpanOptions } from '../types-hoist'; import { getClient, getCurrentScope, getIsolationScope, withScope } from '../currentScopes'; diff --git a/packages/core/src/tracing/utils.ts b/packages/core/src/tracing/utils.ts index 80ad6762dfb8..a0442aa0eeec 100644 --- a/packages/core/src/tracing/utils.ts +++ b/packages/core/src/tracing/utils.ts @@ -1,5 +1,5 @@ -import type { Span } from '@sentry/types'; -import type { Scope } from '@sentry/types'; +import type { Span } from '../types-hoist'; +import type { Scope } from '../types-hoist'; import { addNonEnumerableProperty } from '../utils-hoist/object'; const SCOPE_ON_START_SPAN_FIELD = '_sentryScope'; diff --git a/packages/core/src/transports/base.ts b/packages/core/src/transports/base.ts index d2f02fc32a82..e9c5753c3147 100644 --- a/packages/core/src/transports/base.ts +++ b/packages/core/src/transports/base.ts @@ -9,7 +9,7 @@ import type { Transport, TransportMakeRequestResponse, TransportRequestExecutor, -} from '@sentry/types'; +} from '../types-hoist'; import { DEBUG_BUILD } from '../debug-build'; import { diff --git a/packages/core/src/transports/multiplexed.ts b/packages/core/src/transports/multiplexed.ts index afb839b15863..29534fd13d9b 100644 --- a/packages/core/src/transports/multiplexed.ts +++ b/packages/core/src/transports/multiplexed.ts @@ -6,7 +6,7 @@ import type { EventItem, Transport, TransportMakeRequestResponse, -} from '@sentry/types'; +} from '../types-hoist'; import { getEnvelopeEndpointWithUrlEncodedAuth } from '../api'; import { dsnFromString } from '../utils-hoist/dsn'; diff --git a/packages/core/src/transports/offline.ts b/packages/core/src/transports/offline.ts index f8d3196dd7b5..cf8902739db7 100644 --- a/packages/core/src/transports/offline.ts +++ b/packages/core/src/transports/offline.ts @@ -1,4 +1,4 @@ -import type { Envelope, InternalBaseTransportOptions, Transport, TransportMakeRequestResponse } from '@sentry/types'; +import type { Envelope, InternalBaseTransportOptions, Transport, TransportMakeRequestResponse } from '../types-hoist'; import { DEBUG_BUILD } from '../debug-build'; import { envelopeContainsItemType } from '../utils-hoist/envelope'; diff --git a/packages/core/src/types-hoist/browseroptions.ts b/packages/core/src/types-hoist/browseroptions.ts index 63341322ff56..1df40c6fd614 100644 --- a/packages/core/src/types-hoist/browseroptions.ts +++ b/packages/core/src/types-hoist/browseroptions.ts @@ -1,6 +1,6 @@ /** * Options added to the Browser SDK's init options that are specific for Replay. - * Note: This type was moved to @sentry/types to avoid a circular dependency between Browser and Replay. + * Note: This type was moved to @sentry/core to avoid a circular dependency between Browser and Replay. */ export type BrowserClientReplayOptions = { /** diff --git a/packages/core/src/utils-hoist/aggregate-errors.ts b/packages/core/src/utils-hoist/aggregate-errors.ts index 864956ad4716..5f791183f02b 100644 --- a/packages/core/src/utils-hoist/aggregate-errors.ts +++ b/packages/core/src/utils-hoist/aggregate-errors.ts @@ -1,4 +1,4 @@ -import type { Event, EventHint, Exception, ExtendedError, StackParser } from '@sentry/types'; +import type { Event, EventHint, Exception, ExtendedError, StackParser } from '../types-hoist'; import { isInstanceOf } from './is'; import { truncate } from './string'; diff --git a/packages/core/src/utils-hoist/anr.ts b/packages/core/src/utils-hoist/anr.ts index 839903de062c..0602321117bf 100644 --- a/packages/core/src/utils-hoist/anr.ts +++ b/packages/core/src/utils-hoist/anr.ts @@ -1,4 +1,4 @@ -import type { StackFrame } from '@sentry/types'; +import type { StackFrame } from '../types-hoist'; import { filenameIsInApp } from './node-stack-trace'; import { dropUndefinedKeys } from './object'; import { UNKNOWN_FUNCTION } from './stacktrace'; diff --git a/packages/core/src/utils-hoist/baggage.ts b/packages/core/src/utils-hoist/baggage.ts index 93c8c3918748..5fb60af8a203 100644 --- a/packages/core/src/utils-hoist/baggage.ts +++ b/packages/core/src/utils-hoist/baggage.ts @@ -1,4 +1,4 @@ -import type { DynamicSamplingContext } from '@sentry/types'; +import type { DynamicSamplingContext } from '../types-hoist'; import { DEBUG_BUILD } from './debug-build'; import { isString } from './is'; diff --git a/packages/core/src/utils-hoist/breadcrumb-log-level.ts b/packages/core/src/utils-hoist/breadcrumb-log-level.ts index a19d70e00412..584e43d63364 100644 --- a/packages/core/src/utils-hoist/breadcrumb-log-level.ts +++ b/packages/core/src/utils-hoist/breadcrumb-log-level.ts @@ -1,4 +1,4 @@ -import type { SeverityLevel } from '@sentry/types'; +import type { SeverityLevel } from '../types-hoist'; /** * Determine a breadcrumb's log level (only `warning` or `error`) based on an HTTP status code. diff --git a/packages/core/src/utils-hoist/buildPolyfills/types.ts b/packages/core/src/utils-hoist/buildPolyfills/types.ts index 806f302460a8..10e2f4a944a4 100644 --- a/packages/core/src/utils-hoist/buildPolyfills/types.ts +++ b/packages/core/src/utils-hoist/buildPolyfills/types.ts @@ -1,4 +1,4 @@ -import type { Primitive } from '@sentry/types'; +import type { Primitive } from '../../types-hoist'; export type GenericObject = { [key: string]: Value }; export type GenericFunction = (...args: unknown[]) => Value; diff --git a/packages/core/src/utils-hoist/clientreport.ts b/packages/core/src/utils-hoist/clientreport.ts index c0dbb6cb3aba..65ca239a166d 100644 --- a/packages/core/src/utils-hoist/clientreport.ts +++ b/packages/core/src/utils-hoist/clientreport.ts @@ -1,4 +1,4 @@ -import type { ClientReport, ClientReportEnvelope, ClientReportItem } from '@sentry/types'; +import type { ClientReport, ClientReportEnvelope, ClientReportItem } from '../types-hoist'; import { createEnvelope } from './envelope'; import { dateTimestampInSeconds } from './time'; diff --git a/packages/core/src/utils-hoist/debug-ids.ts b/packages/core/src/utils-hoist/debug-ids.ts index d407e6176e45..859f8c10ba2b 100644 --- a/packages/core/src/utils-hoist/debug-ids.ts +++ b/packages/core/src/utils-hoist/debug-ids.ts @@ -1,4 +1,4 @@ -import type { DebugImage, StackParser } from '@sentry/types'; +import type { DebugImage, StackParser } from '../types-hoist'; import { GLOBAL_OBJ } from './worldwide'; type StackString = string; diff --git a/packages/core/src/utils-hoist/dsn.ts b/packages/core/src/utils-hoist/dsn.ts index 5ca4aa96c180..abce9a5d6be7 100644 --- a/packages/core/src/utils-hoist/dsn.ts +++ b/packages/core/src/utils-hoist/dsn.ts @@ -1,4 +1,4 @@ -import type { DsnComponents, DsnLike, DsnProtocol } from '@sentry/types'; +import type { DsnComponents, DsnLike, DsnProtocol } from '../types-hoist'; import { DEBUG_BUILD } from './debug-build'; import { consoleSandbox, logger } from './logger'; diff --git a/packages/core/src/utils-hoist/envelope.ts b/packages/core/src/utils-hoist/envelope.ts index 945bd4d66366..5014d6fe130d 100644 --- a/packages/core/src/utils-hoist/envelope.ts +++ b/packages/core/src/utils-hoist/envelope.ts @@ -13,7 +13,7 @@ import type { SdkMetadata, SpanItem, SpanJSON, -} from '@sentry/types'; +} from '../types-hoist'; import { dsnToString } from './dsn'; import { normalize } from './normalize'; diff --git a/packages/core/src/utils-hoist/error.ts b/packages/core/src/utils-hoist/error.ts index af0f80e9dce7..03fc404656dc 100644 --- a/packages/core/src/utils-hoist/error.ts +++ b/packages/core/src/utils-hoist/error.ts @@ -1,4 +1,4 @@ -import type { ConsoleLevel } from '@sentry/types'; +import type { ConsoleLevel } from '../types-hoist'; /** An error emitted by Sentry SDKs and related utilities. */ export class SentryError extends Error { diff --git a/packages/core/src/utils-hoist/eventbuilder.ts b/packages/core/src/utils-hoist/eventbuilder.ts index ecfb98e80783..42d23927f081 100644 --- a/packages/core/src/utils-hoist/eventbuilder.ts +++ b/packages/core/src/utils-hoist/eventbuilder.ts @@ -9,7 +9,7 @@ import type { SeverityLevel, StackFrame, StackParser, -} from '@sentry/types'; +} from '../types-hoist'; import { isError, isErrorEvent, isParameterizedString, isPlainObject } from './is'; import { addExceptionMechanism, addExceptionTypeValue } from './misc'; diff --git a/packages/core/src/utils-hoist/instrument/console.ts b/packages/core/src/utils-hoist/instrument/console.ts index f75faa3346c2..955407e5573b 100644 --- a/packages/core/src/utils-hoist/instrument/console.ts +++ b/packages/core/src/utils-hoist/instrument/console.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/ban-types */ -import type { ConsoleLevel, HandlerDataConsole } from '@sentry/types'; +import type { ConsoleLevel, HandlerDataConsole } from '../../types-hoist'; import { CONSOLE_LEVELS, originalConsoleMethods } from '../logger'; import { fill } from '../object'; diff --git a/packages/core/src/utils-hoist/instrument/fetch.ts b/packages/core/src/utils-hoist/instrument/fetch.ts index ad28edf81e3f..39c8862ba618 100644 --- a/packages/core/src/utils-hoist/instrument/fetch.ts +++ b/packages/core/src/utils-hoist/instrument/fetch.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import type { HandlerDataFetch } from '@sentry/types'; +import type { HandlerDataFetch } from '../../types-hoist'; import { isError } from '../is'; import { addNonEnumerableProperty, fill } from '../object'; diff --git a/packages/core/src/utils-hoist/instrument/globalError.ts b/packages/core/src/utils-hoist/instrument/globalError.ts index a3ee2149817f..6565f42c2329 100644 --- a/packages/core/src/utils-hoist/instrument/globalError.ts +++ b/packages/core/src/utils-hoist/instrument/globalError.ts @@ -1,4 +1,4 @@ -import type { HandlerDataError } from '@sentry/types'; +import type { HandlerDataError } from '../../types-hoist'; import { GLOBAL_OBJ } from '../worldwide'; import { addHandler, maybeInstrument, triggerHandlers } from './handlers'; diff --git a/packages/core/src/utils-hoist/instrument/globalUnhandledRejection.ts b/packages/core/src/utils-hoist/instrument/globalUnhandledRejection.ts index 878540500dac..5e47cd125a35 100644 --- a/packages/core/src/utils-hoist/instrument/globalUnhandledRejection.ts +++ b/packages/core/src/utils-hoist/instrument/globalUnhandledRejection.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import type { HandlerDataUnhandledRejection } from '@sentry/types'; +import type { HandlerDataUnhandledRejection } from '../../types-hoist'; import { GLOBAL_OBJ } from '../worldwide'; import { addHandler, maybeInstrument, triggerHandlers } from './handlers'; diff --git a/packages/core/src/utils-hoist/is.ts b/packages/core/src/utils-hoist/is.ts index f019508662cd..28ebfd7be2f7 100644 --- a/packages/core/src/utils-hoist/is.ts +++ b/packages/core/src/utils-hoist/is.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import type { ParameterizedString, PolymorphicEvent, Primitive } from '@sentry/types'; +import type { ParameterizedString, PolymorphicEvent, Primitive } from '../types-hoist'; // eslint-disable-next-line @typescript-eslint/unbound-method const objectToString = Object.prototype.toString; diff --git a/packages/core/src/utils-hoist/logger.ts b/packages/core/src/utils-hoist/logger.ts index c56dc2fff699..a18b19be6db6 100644 --- a/packages/core/src/utils-hoist/logger.ts +++ b/packages/core/src/utils-hoist/logger.ts @@ -1,4 +1,4 @@ -import type { ConsoleLevel } from '@sentry/types'; +import type { ConsoleLevel } from '../types-hoist'; import { DEBUG_BUILD } from './debug-build'; import { GLOBAL_OBJ, getGlobalSingleton } from './worldwide'; diff --git a/packages/core/src/utils-hoist/misc.ts b/packages/core/src/utils-hoist/misc.ts index 0f02b5ba14de..8f1cfe371ece 100644 --- a/packages/core/src/utils-hoist/misc.ts +++ b/packages/core/src/utils-hoist/misc.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import type { Event, Exception, Mechanism, StackFrame } from '@sentry/types'; +import type { Event, Exception, Mechanism, StackFrame } from '../types-hoist'; import { addNonEnumerableProperty } from './object'; import { snipLine } from './string'; diff --git a/packages/core/src/utils-hoist/node-stack-trace.ts b/packages/core/src/utils-hoist/node-stack-trace.ts index fc96fccc8847..946492ede855 100644 --- a/packages/core/src/utils-hoist/node-stack-trace.ts +++ b/packages/core/src/utils-hoist/node-stack-trace.ts @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -import type { StackLineParser, StackLineParserFn } from '@sentry/types'; +import type { StackLineParser, StackLineParserFn } from '../types-hoist'; import { UNKNOWN_FUNCTION } from './stacktrace'; export type GetModuleFn = (filename: string | undefined) => string | undefined; diff --git a/packages/core/src/utils-hoist/normalize.ts b/packages/core/src/utils-hoist/normalize.ts index fe108fdbdd0e..c1e8e2c630ad 100644 --- a/packages/core/src/utils-hoist/normalize.ts +++ b/packages/core/src/utils-hoist/normalize.ts @@ -1,4 +1,4 @@ -import type { Primitive } from '@sentry/types'; +import type { Primitive } from '../types-hoist'; import { isSyntheticEvent, isVueViewModel } from './is'; import type { MemoFunc } from './memo'; diff --git a/packages/core/src/utils-hoist/object.ts b/packages/core/src/utils-hoist/object.ts index d3e785f7639d..b5b814067b3e 100644 --- a/packages/core/src/utils-hoist/object.ts +++ b/packages/core/src/utils-hoist/object.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import type { WrappedFunction } from '@sentry/types'; +import type { WrappedFunction } from '../types-hoist'; import { htmlTreeAsString } from './browser'; import { DEBUG_BUILD } from './debug-build'; diff --git a/packages/core/src/utils-hoist/propagationContext.ts b/packages/core/src/utils-hoist/propagationContext.ts index 6613f1f96302..9c045034606e 100644 --- a/packages/core/src/utils-hoist/propagationContext.ts +++ b/packages/core/src/utils-hoist/propagationContext.ts @@ -1,4 +1,4 @@ -import type { PropagationContext } from '@sentry/types'; +import type { PropagationContext } from '../types-hoist'; import { uuid4 } from './misc'; /** diff --git a/packages/core/src/utils-hoist/ratelimit.ts b/packages/core/src/utils-hoist/ratelimit.ts index 6131cff2bb2c..db2053bdabd6 100644 --- a/packages/core/src/utils-hoist/ratelimit.ts +++ b/packages/core/src/utils-hoist/ratelimit.ts @@ -1,4 +1,4 @@ -import type { DataCategory, TransportMakeRequestResponse } from '@sentry/types'; +import type { DataCategory, TransportMakeRequestResponse } from '../types-hoist'; // Intentionally keeping the key broad, as we don't know for sure what rate limit headers get returned from backend export type RateLimits = Record; diff --git a/packages/core/src/utils-hoist/requestdata.ts b/packages/core/src/utils-hoist/requestdata.ts index 975b993f69c7..bff0f3f629bd 100644 --- a/packages/core/src/utils-hoist/requestdata.ts +++ b/packages/core/src/utils-hoist/requestdata.ts @@ -7,7 +7,7 @@ import type { TransactionSource, WebFetchHeaders, WebFetchRequest, -} from '@sentry/types'; +} from '../types-hoist'; import { parseCookie } from './cookie'; import { DEBUG_BUILD } from './debug-build'; diff --git a/packages/core/src/utils-hoist/severity.ts b/packages/core/src/utils-hoist/severity.ts index f5217b8b87c9..cdf25f6104d0 100644 --- a/packages/core/src/utils-hoist/severity.ts +++ b/packages/core/src/utils-hoist/severity.ts @@ -1,4 +1,4 @@ -import type { SeverityLevel } from '@sentry/types'; +import type { SeverityLevel } from '../types-hoist'; /** * @deprecated This variable has been deprecated and will be removed in the next major version. diff --git a/packages/core/src/utils-hoist/stacktrace.ts b/packages/core/src/utils-hoist/stacktrace.ts index 7fddda6db158..f7713fb50744 100644 --- a/packages/core/src/utils-hoist/stacktrace.ts +++ b/packages/core/src/utils-hoist/stacktrace.ts @@ -1,4 +1,4 @@ -import type { Event, StackFrame, StackLineParser, StackParser } from '@sentry/types'; +import type { Event, StackFrame, StackLineParser, StackParser } from '../types-hoist'; const STACKTRACE_FRAME_LIMIT = 50; export const UNKNOWN_FUNCTION = '?'; diff --git a/packages/core/src/utils-hoist/tracing.ts b/packages/core/src/utils-hoist/tracing.ts index ae1aace50c02..e3f984048ae8 100644 --- a/packages/core/src/utils-hoist/tracing.ts +++ b/packages/core/src/utils-hoist/tracing.ts @@ -1,4 +1,4 @@ -import type { PropagationContext, TraceparentData } from '@sentry/types'; +import type { PropagationContext, TraceparentData } from '../types-hoist'; import { baggageHeaderToDynamicSamplingContext } from './baggage'; import { uuid4 } from './misc'; diff --git a/packages/core/src/utils-hoist/worldwide.ts b/packages/core/src/utils-hoist/worldwide.ts index 62b2d3d397b6..0338cfc4940b 100644 --- a/packages/core/src/utils-hoist/worldwide.ts +++ b/packages/core/src/utils-hoist/worldwide.ts @@ -12,7 +12,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import type { Client, MetricsAggregator, Scope } from '@sentry/types'; +import type { Client, MetricsAggregator, Scope } from '../types-hoist'; import type { SdkSource } from './env'; import type { logger } from './logger'; diff --git a/packages/core/src/utils/applyScopeDataToEvent.ts b/packages/core/src/utils/applyScopeDataToEvent.ts index ccf3f62ae153..3984d9a44436 100644 --- a/packages/core/src/utils/applyScopeDataToEvent.ts +++ b/packages/core/src/utils/applyScopeDataToEvent.ts @@ -1,5 +1,5 @@ -import type { Breadcrumb, Event, ScopeData, Span } from '@sentry/types'; import { getDynamicSamplingContextFromSpan } from '../tracing/dynamicSamplingContext'; +import type { Breadcrumb, Event, ScopeData, Span } from '../types-hoist'; import { dropUndefinedKeys } from '../utils-hoist'; import { merge } from './merge'; import { getRootSpan, spanToJSON, spanToTraceContext } from './spanUtils'; diff --git a/packages/core/src/utils/hasTracingEnabled.ts b/packages/core/src/utils/hasTracingEnabled.ts index 9441a0fc7bed..6d99eede931e 100644 --- a/packages/core/src/utils/hasTracingEnabled.ts +++ b/packages/core/src/utils/hasTracingEnabled.ts @@ -1,5 +1,5 @@ -import type { Options } from '@sentry/types'; import { getClient } from '../currentScopes'; +import type { Options } from '../types-hoist'; // Treeshakable guard to remove all code related to tracing declare const __SENTRY_TRACING__: boolean | undefined; diff --git a/packages/core/src/utils/isSentryRequestUrl.ts b/packages/core/src/utils/isSentryRequestUrl.ts index a3f3e08be3e0..614c98bf4081 100644 --- a/packages/core/src/utils/isSentryRequestUrl.ts +++ b/packages/core/src/utils/isSentryRequestUrl.ts @@ -1,4 +1,4 @@ -import type { Client, DsnComponents } from '@sentry/types'; +import type { Client, DsnComponents } from '../types-hoist'; /** * Checks whether given url points to Sentry server diff --git a/packages/core/src/utils/parameterize.ts b/packages/core/src/utils/parameterize.ts index 1ad880618a48..392f4b70b444 100644 --- a/packages/core/src/utils/parameterize.ts +++ b/packages/core/src/utils/parameterize.ts @@ -1,4 +1,4 @@ -import type { ParameterizedString } from '@sentry/types'; +import type { ParameterizedString } from '../types-hoist'; /** * Tagged template function which returns parameterized representation of the message diff --git a/packages/core/src/utils/prepareEvent.ts b/packages/core/src/utils/prepareEvent.ts index 14358d4e3101..4c1c848a1a57 100644 --- a/packages/core/src/utils/prepareEvent.ts +++ b/packages/core/src/utils/prepareEvent.ts @@ -7,7 +7,7 @@ import type { Scope as ScopeInterface, ScopeContext, StackParser, -} from '@sentry/types'; +} from '../types-hoist'; import { DEFAULT_ENVIRONMENT } from '../constants'; import { getGlobalScope } from '../currentScopes'; diff --git a/packages/core/src/utils/sdkMetadata.ts b/packages/core/src/utils/sdkMetadata.ts index 7d2905abf84f..74c2f2e75e1c 100644 --- a/packages/core/src/utils/sdkMetadata.ts +++ b/packages/core/src/utils/sdkMetadata.ts @@ -1,4 +1,4 @@ -import type { Options } from '@sentry/types'; +import type { Options } from '../types-hoist'; import { SDK_VERSION } from '../utils-hoist/version'; /** diff --git a/packages/core/src/utils/spanOnScope.ts b/packages/core/src/utils/spanOnScope.ts index e7607f0fa090..bdc47b66d208 100644 --- a/packages/core/src/utils/spanOnScope.ts +++ b/packages/core/src/utils/spanOnScope.ts @@ -1,4 +1,4 @@ -import type { Scope, Span } from '@sentry/types'; +import type { Scope, Span } from '../types-hoist'; import { addNonEnumerableProperty } from '../utils-hoist/object'; const SCOPE_SPAN_FIELD = '_sentrySpan'; diff --git a/packages/core/src/utils/spanUtils.ts b/packages/core/src/utils/spanUtils.ts index d9232b1f48bc..0926117ae7b0 100644 --- a/packages/core/src/utils/spanUtils.ts +++ b/packages/core/src/utils/spanUtils.ts @@ -1,3 +1,11 @@ +import { getAsyncContextStrategy } from '../asyncContext'; +import { getMainCarrier } from '../carrier'; +import { getCurrentScope } from '../currentScopes'; +import { getMetricSummaryJsonForSpan, updateMetricSummaryOnSpan } from '../metrics/metric-summary'; +import type { MetricType } from '../metrics/types'; +import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../semanticAttributes'; +import type { SentrySpan } from '../tracing/sentrySpan'; +import { SPAN_STATUS_OK, SPAN_STATUS_UNSET } from '../tracing/spanstatus'; import type { MeasurementUnit, Primitive, @@ -8,15 +16,7 @@ import type { SpanStatus, SpanTimeInput, TraceContext, -} from '@sentry/types'; -import { getAsyncContextStrategy } from '../asyncContext'; -import { getMainCarrier } from '../carrier'; -import { getCurrentScope } from '../currentScopes'; -import { getMetricSummaryJsonForSpan, updateMetricSummaryOnSpan } from '../metrics/metric-summary'; -import type { MetricType } from '../metrics/types'; -import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../semanticAttributes'; -import type { SentrySpan } from '../tracing/sentrySpan'; -import { SPAN_STATUS_OK, SPAN_STATUS_UNSET } from '../tracing/spanstatus'; +} from '../types-hoist'; import { consoleSandbox } from '../utils-hoist/logger'; import { addNonEnumerableProperty, dropUndefinedKeys } from '../utils-hoist/object'; import { timestampInSeconds } from '../utils-hoist/time'; diff --git a/packages/core/src/utils/traceData.ts b/packages/core/src/utils/traceData.ts index a50cbe22af30..b73ddf2828bf 100644 --- a/packages/core/src/utils/traceData.ts +++ b/packages/core/src/utils/traceData.ts @@ -1,9 +1,9 @@ -import type { Scope, SerializedTraceData, Span } from '@sentry/types'; import { getAsyncContextStrategy } from '../asyncContext'; import { getMainCarrier } from '../carrier'; import { getClient, getCurrentScope } from '../currentScopes'; import { isEnabled } from '../exports'; import { getDynamicSamplingContextFromScope, getDynamicSamplingContextFromSpan } from '../tracing'; +import type { Scope, SerializedTraceData, Span } from '../types-hoist'; import { dynamicSamplingContextToSentryBaggageHeader } from '../utils-hoist/baggage'; import { logger } from '../utils-hoist/logger'; import { TRACEPARENT_REGEXP, generateSentryTraceHeader } from '../utils-hoist/tracing'; diff --git a/packages/core/test/lib/api.test.ts b/packages/core/test/lib/api.test.ts index 89a8ad3cf20f..37e67e5a8da1 100644 --- a/packages/core/test/lib/api.test.ts +++ b/packages/core/test/lib/api.test.ts @@ -1,6 +1,5 @@ -import type { DsnComponents, SdkInfo } from '@sentry/types'; - import { getEnvelopeEndpointWithUrlEncodedAuth, getReportDialogEndpoint } from '../../src/api'; +import type { DsnComponents, SdkInfo } from '../../src/types-hoist'; import { makeDsn } from '../../src/utils-hoist/dsn'; const ingestDsn = 'https://abc@xxxx.ingest.sentry.io:1234/subpath/123'; diff --git a/packages/core/test/lib/baseclient.test.ts b/packages/core/test/lib/baseclient.test.ts index 4e2bcdb334ef..2c8918f3e41c 100644 --- a/packages/core/test/lib/baseclient.test.ts +++ b/packages/core/test/lib/baseclient.test.ts @@ -1,5 +1,5 @@ import { SentryError, SyncPromise, dsnToString } from '@sentry/core'; -import type { Client, Envelope, ErrorEvent, Event, TransactionEvent } from '@sentry/types'; +import type { Client, Envelope, ErrorEvent, Event, TransactionEvent } from '../../src/types-hoist'; import * as loggerModule from '../../src/utils-hoist/logger'; import * as miscModule from '../../src/utils-hoist/misc'; diff --git a/packages/core/test/lib/checkin.test.ts b/packages/core/test/lib/checkin.test.ts index 5ae6bac6b5f3..14a699ced3e6 100644 --- a/packages/core/test/lib/checkin.test.ts +++ b/packages/core/test/lib/checkin.test.ts @@ -1,4 +1,4 @@ -import type { SerializedCheckIn } from '@sentry/types'; +import type { SerializedCheckIn } from '../../src/types-hoist'; import { createCheckInEnvelope } from '../../src/checkin'; diff --git a/packages/core/test/lib/envelope.test.ts b/packages/core/test/lib/envelope.test.ts index 253ac07d96c2..8909fb8df202 100644 --- a/packages/core/test/lib/envelope.test.ts +++ b/packages/core/test/lib/envelope.test.ts @@ -1,4 +1,4 @@ -import type { Client, DsnComponents, DynamicSamplingContext, Event } from '@sentry/types'; +import type { Client, DsnComponents, DynamicSamplingContext, Event } from '../../src/types-hoist'; import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, diff --git a/packages/core/test/lib/feedback.test.ts b/packages/core/test/lib/feedback.test.ts index cd9e99e43bdb..ed6fc0be874a 100644 --- a/packages/core/test/lib/feedback.test.ts +++ b/packages/core/test/lib/feedback.test.ts @@ -1,4 +1,3 @@ -import type { Span } from '@sentry/types'; import { Scope, addBreadcrumb, @@ -9,6 +8,7 @@ import { withScope, } from '../../src'; import { captureFeedback } from '../../src/feedback'; +import type { Span } from '../../src/types-hoist'; import { TestClient, getDefaultTestClientOptions } from '../mocks/client'; describe('captureFeedback', () => { diff --git a/packages/core/test/lib/integration.test.ts b/packages/core/test/lib/integration.test.ts index 128c46984d90..3a4d41089116 100644 --- a/packages/core/test/lib/integration.test.ts +++ b/packages/core/test/lib/integration.test.ts @@ -1,5 +1,5 @@ -import type { Integration, Options } from '@sentry/types'; import { getCurrentScope } from '../../src/currentScopes'; +import type { Integration, Options } from '../../src/types-hoist'; import { addIntegration, getIntegrationsToSetup, installedIntegrations, setupIntegration } from '../../src/integration'; import { setCurrentClient } from '../../src/sdk'; diff --git a/packages/core/test/lib/integrations/captureconsole.test.ts b/packages/core/test/lib/integrations/captureconsole.test.ts index 18fe7e637499..3c646d378f88 100644 --- a/packages/core/test/lib/integrations/captureconsole.test.ts +++ b/packages/core/test/lib/integrations/captureconsole.test.ts @@ -1,8 +1,8 @@ /* eslint-disable @typescript-eslint/unbound-method */ -import type { Client, ConsoleLevel, Event } from '@sentry/types'; import * as CurrentScopes from '../../../src/currentScopes'; import * as SentryCore from '../../../src/exports'; +import type { Client, ConsoleLevel, Event } from '../../../src/types-hoist'; import { captureConsoleIntegration } from '../../../src/integrations/captureconsole'; import { addConsoleInstrumentationHandler } from '../../../src/utils-hoist/instrument/console'; diff --git a/packages/core/test/lib/integrations/debug.test.ts b/packages/core/test/lib/integrations/debug.test.ts index 87e1027af6e0..00a938a185e6 100644 --- a/packages/core/test/lib/integrations/debug.test.ts +++ b/packages/core/test/lib/integrations/debug.test.ts @@ -1,4 +1,4 @@ -import type { Client, Event, EventHint } from '@sentry/types'; +import type { Client, Event, EventHint } from '../../../src/types-hoist'; import { debugIntegration } from '../../../src/integrations/debug'; diff --git a/packages/core/test/lib/integrations/dedupe.test.ts b/packages/core/test/lib/integrations/dedupe.test.ts index 9478f41a6492..2e7b10fe1c4c 100644 --- a/packages/core/test/lib/integrations/dedupe.test.ts +++ b/packages/core/test/lib/integrations/dedupe.test.ts @@ -1,4 +1,4 @@ -import type { Event as SentryEvent, Exception, StackFrame, Stacktrace } from '@sentry/types'; +import type { Event as SentryEvent, Exception, StackFrame, Stacktrace } from '../../../src/types-hoist'; import { _shouldDropEvent, dedupeIntegration } from '../../../src/integrations/dedupe'; diff --git a/packages/core/test/lib/integrations/extraerrordata.test.ts b/packages/core/test/lib/integrations/extraerrordata.test.ts index d38f8fff25ee..c4048f3122b1 100644 --- a/packages/core/test/lib/integrations/extraerrordata.test.ts +++ b/packages/core/test/lib/integrations/extraerrordata.test.ts @@ -1,4 +1,4 @@ -import type { Event as SentryEvent, ExtendedError } from '@sentry/types'; +import type { Event as SentryEvent, ExtendedError } from '../../../src/types-hoist'; import { extraErrorDataIntegration } from '../../../src/integrations/extraerrordata'; diff --git a/packages/core/test/lib/integrations/inboundfilters.test.ts b/packages/core/test/lib/integrations/inboundfilters.test.ts index eb68c8c14d3b..13d6d783adf6 100644 --- a/packages/core/test/lib/integrations/inboundfilters.test.ts +++ b/packages/core/test/lib/integrations/inboundfilters.test.ts @@ -1,4 +1,4 @@ -import type { Event, EventProcessor } from '@sentry/types'; +import type { Event, EventProcessor } from '../../../src/types-hoist'; import type { InboundFiltersOptions } from '../../../src/integrations/inboundfilters'; import { inboundFiltersIntegration } from '../../../src/integrations/inboundfilters'; diff --git a/packages/core/test/lib/integrations/metadata.test.ts b/packages/core/test/lib/integrations/metadata.test.ts index 2e4a70bfa848..c93f930ca273 100644 --- a/packages/core/test/lib/integrations/metadata.test.ts +++ b/packages/core/test/lib/integrations/metadata.test.ts @@ -1,4 +1,4 @@ -import type { Event } from '@sentry/types'; +import type { Event } from '../../../src/types-hoist'; import { GLOBAL_OBJ, diff --git a/packages/core/test/lib/integrations/requestdata.test.ts b/packages/core/test/lib/integrations/requestdata.test.ts index 4603d5b290cf..aebd140b2bf3 100644 --- a/packages/core/test/lib/integrations/requestdata.test.ts +++ b/packages/core/test/lib/integrations/requestdata.test.ts @@ -1,7 +1,7 @@ import type { IncomingMessage } from 'http'; -import type { Event, EventProcessor } from '@sentry/types'; import type { RequestDataIntegrationOptions } from '../../../src'; import { requestDataIntegration, setCurrentClient } from '../../../src'; +import type { Event, EventProcessor } from '../../../src/types-hoist'; import { TestClient, getDefaultTestClientOptions } from '../../mocks/client'; diff --git a/packages/core/test/lib/integrations/rewriteframes.test.ts b/packages/core/test/lib/integrations/rewriteframes.test.ts index f3ea865b459d..e31976ba5785 100644 --- a/packages/core/test/lib/integrations/rewriteframes.test.ts +++ b/packages/core/test/lib/integrations/rewriteframes.test.ts @@ -1,4 +1,4 @@ -import type { Event, StackFrame } from '@sentry/types'; +import type { Event, StackFrame } from '../../../src/types-hoist'; import { generateIteratee, rewriteFramesIntegration } from '../../../src/integrations/rewriteframes'; diff --git a/packages/core/test/lib/integrations/sessiontiming.test.ts b/packages/core/test/lib/integrations/sessiontiming.test.ts index 1fd2fa53e361..fb694fe8be0f 100644 --- a/packages/core/test/lib/integrations/sessiontiming.test.ts +++ b/packages/core/test/lib/integrations/sessiontiming.test.ts @@ -1,5 +1,5 @@ -import type { Event } from '@sentry/types'; import { sessionTimingIntegration } from '../../../src/integrations/sessiontiming'; +import type { Event } from '../../../src/types-hoist'; // eslint-disable-next-line deprecation/deprecation const sessionTiming = sessionTimingIntegration(); diff --git a/packages/core/test/lib/integrations/third-party-errors-filter.test.ts b/packages/core/test/lib/integrations/third-party-errors-filter.test.ts index 91cfe7d4900b..ec35cf07f6ab 100644 --- a/packages/core/test/lib/integrations/third-party-errors-filter.test.ts +++ b/packages/core/test/lib/integrations/third-party-errors-filter.test.ts @@ -1,6 +1,6 @@ -import type { Client, Event } from '@sentry/types'; import { thirdPartyErrorFilterIntegration } from '../../../src/integrations/third-party-errors-filter'; import { addMetadataToStackFrames } from '../../../src/metadata'; +import type { Client, Event } from '../../../src/types-hoist'; import { nodeStackLineParser } from '../../../src/utils-hoist/node-stack-trace'; import { createStackParser } from '../../../src/utils-hoist/stacktrace'; import { GLOBAL_OBJ } from '../../../src/utils-hoist/worldwide'; diff --git a/packages/core/test/lib/integrations/zoderrrors.test.ts b/packages/core/test/lib/integrations/zoderrrors.test.ts index 33dc2609ac09..d5583fb57380 100644 --- a/packages/core/test/lib/integrations/zoderrrors.test.ts +++ b/packages/core/test/lib/integrations/zoderrrors.test.ts @@ -1,4 +1,4 @@ -import type { Event, EventHint } from '@sentry/types'; +import type { Event, EventHint } from '../../../src/types-hoist'; import { applyZodErrorsToEvent } from '../../../src/integrations/zoderrors'; diff --git a/packages/core/test/lib/metadata.test.ts b/packages/core/test/lib/metadata.test.ts index c3b31b68423f..7dbbe8a0ea1b 100644 --- a/packages/core/test/lib/metadata.test.ts +++ b/packages/core/test/lib/metadata.test.ts @@ -1,4 +1,4 @@ -import type { Event } from '@sentry/types'; +import type { Event } from '../../src/types-hoist'; import { addMetadataToStackFrames, getMetadataForUrl, stripMetadataFromStackFrames } from '../../src/metadata'; import { nodeStackLineParser } from '../../src/utils-hoist/node-stack-trace'; diff --git a/packages/core/test/lib/prepareEvent.test.ts b/packages/core/test/lib/prepareEvent.test.ts index 0322afb7e7a8..bd0798cc0898 100644 --- a/packages/core/test/lib/prepareEvent.test.ts +++ b/packages/core/test/lib/prepareEvent.test.ts @@ -1,3 +1,4 @@ +import { GLOBAL_OBJ, createStackParser, getGlobalScope, getIsolationScope } from '../../src'; import type { Attachment, Breadcrumb, @@ -7,8 +8,7 @@ import type { EventHint, EventProcessor, ScopeContext, -} from '@sentry/types'; -import { GLOBAL_OBJ, createStackParser, getGlobalScope, getIsolationScope } from '../../src'; +} from '../../src/types-hoist'; import { Scope } from '../../src/scope'; import { diff --git a/packages/core/test/lib/scope.test.ts b/packages/core/test/lib/scope.test.ts index c6a081948453..df95e08dcb97 100644 --- a/packages/core/test/lib/scope.test.ts +++ b/packages/core/test/lib/scope.test.ts @@ -1,4 +1,3 @@ -import type { Breadcrumb, Client, Event, RequestSessionStatus } from '@sentry/types'; import { applyScopeDataToEvent, getCurrentScope, @@ -7,6 +6,7 @@ import { withIsolationScope, withScope, } from '../../src'; +import type { Breadcrumb, Client, Event, RequestSessionStatus } from '../../src/types-hoist'; import { Scope } from '../../src/scope'; import { TestClient, getDefaultTestClientOptions } from '../mocks/client'; @@ -1002,15 +1002,4 @@ describe('withIsolationScope()', () => { done(); }); }); - - it('Scope type is equal to Scope from @sentry/types', () => { - // We pass the Scope _class_ here to the callback, - // Which actually is typed as using the Scope from @sentry/types - // This should not TS-error, as we export the type from core as well - const scope = withScope((scope: Scope) => { - return scope; - }); - - expect(scope).toBeDefined(); - }); }); diff --git a/packages/core/test/lib/sdk.test.ts b/packages/core/test/lib/sdk.test.ts index 74213cd8d99f..9da1dec65789 100644 --- a/packages/core/test/lib/sdk.test.ts +++ b/packages/core/test/lib/sdk.test.ts @@ -1,5 +1,5 @@ -import type { Client, Integration } from '@sentry/types'; import { captureCheckIn, getCurrentScope, setCurrentClient } from '../../src'; +import type { Client, Integration } from '../../src/types-hoist'; import { installedIntegrations } from '../../src/integration'; import { initAndBind } from '../../src/sdk'; diff --git a/packages/core/test/lib/serverruntimeclient.test.ts b/packages/core/test/lib/serverruntimeclient.test.ts index 8b149f7f2aaa..40be09bf011c 100644 --- a/packages/core/test/lib/serverruntimeclient.test.ts +++ b/packages/core/test/lib/serverruntimeclient.test.ts @@ -1,4 +1,4 @@ -import type { Event, EventHint } from '@sentry/types'; +import type { Event, EventHint } from '../../src/types-hoist'; import { createTransport } from '../../src'; import type { ServerRuntimeClientOptions } from '../../src/server-runtime-client'; diff --git a/packages/core/test/lib/session.test.ts b/packages/core/test/lib/session.test.ts index 55524866dcc2..dfe96e135088 100644 --- a/packages/core/test/lib/session.test.ts +++ b/packages/core/test/lib/session.test.ts @@ -1,4 +1,4 @@ -import type { SessionContext } from '@sentry/types'; +import type { SessionContext } from '../../src/types-hoist'; import { closeSession, makeSession, updateSession } from '../../src/session'; import { timestampInSeconds } from '../../src/utils-hoist/time'; diff --git a/packages/core/test/lib/sessionflusher.test.ts b/packages/core/test/lib/sessionflusher.test.ts index 808ba6308069..00f9becfdbf0 100644 --- a/packages/core/test/lib/sessionflusher.test.ts +++ b/packages/core/test/lib/sessionflusher.test.ts @@ -1,4 +1,4 @@ -import type { Client } from '@sentry/types'; +import type { Client } from '../../src/types-hoist'; import { SessionFlusher } from '../../src/sessionflusher'; diff --git a/packages/core/test/lib/tracing/dynamicSamplingContext.test.ts b/packages/core/test/lib/tracing/dynamicSamplingContext.test.ts index 628aec7e5fb7..579f90fbad56 100644 --- a/packages/core/test/lib/tracing/dynamicSamplingContext.test.ts +++ b/packages/core/test/lib/tracing/dynamicSamplingContext.test.ts @@ -1,4 +1,3 @@ -import type { Span, SpanContextData, TransactionSource } from '@sentry/types'; import { SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, @@ -7,6 +6,7 @@ import { } from '../../../src'; import { SentrySpan, getDynamicSamplingContextFromSpan, startInactiveSpan } from '../../../src/tracing'; import { freezeDscOnSpan } from '../../../src/tracing/dynamicSamplingContext'; +import type { Span, SpanContextData, TransactionSource } from '../../../src/types-hoist'; import { TestClient, getDefaultTestClientOptions } from '../../mocks/client'; describe('getDynamicSamplingContextFromSpan', () => { diff --git a/packages/core/test/lib/tracing/errors.test.ts b/packages/core/test/lib/tracing/errors.test.ts index 68a3463b7878..7b3f08a6765b 100644 --- a/packages/core/test/lib/tracing/errors.test.ts +++ b/packages/core/test/lib/tracing/errors.test.ts @@ -1,5 +1,5 @@ -import type { HandlerDataError, HandlerDataUnhandledRejection } from '@sentry/types'; import { setCurrentClient, spanToJSON, startInactiveSpan, startSpan } from '../../../src'; +import type { HandlerDataError, HandlerDataUnhandledRejection } from '../../../src/types-hoist'; import { _resetErrorsInstrumented, registerSpanErrorInstrumentation } from '../../../src/tracing/errors'; import * as globalErrorModule from '../../../src/utils-hoist/instrument/globalError'; diff --git a/packages/core/test/lib/tracing/idleSpan.test.ts b/packages/core/test/lib/tracing/idleSpan.test.ts index 7a59fc790f0a..3d720f383173 100644 --- a/packages/core/test/lib/tracing/idleSpan.test.ts +++ b/packages/core/test/lib/tracing/idleSpan.test.ts @@ -1,6 +1,5 @@ import { TestClient, getDefaultTestClientOptions } from '../../mocks/client'; -import type { Event, Span } from '@sentry/types'; import { SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON, SentryNonRecordingSpan, @@ -17,6 +16,7 @@ import { startSpanManual, } from '../../../src'; import { TRACING_DEFAULTS, startIdleSpan } from '../../../src/tracing/idleSpan'; +import type { Event, Span } from '../../../src/types-hoist'; const dsn = 'https://123@sentry.io/42'; diff --git a/packages/core/test/lib/tracing/sentryNonRecordingSpan.test.ts b/packages/core/test/lib/tracing/sentryNonRecordingSpan.test.ts index d5643c3d3651..c4469fe0c31c 100644 --- a/packages/core/test/lib/tracing/sentryNonRecordingSpan.test.ts +++ b/packages/core/test/lib/tracing/sentryNonRecordingSpan.test.ts @@ -1,6 +1,6 @@ -import type { Span } from '@sentry/types'; import { SPAN_STATUS_ERROR } from '../../../src/tracing'; import { SentryNonRecordingSpan } from '../../../src/tracing/sentryNonRecordingSpan'; +import type { Span } from '../../../src/types-hoist'; import { TRACE_FLAG_NONE, spanIsSampled, spanToJSON } from '../../../src/utils/spanUtils'; describe('SentryNonRecordingSpan', () => { diff --git a/packages/core/test/lib/tracing/trace.test.ts b/packages/core/test/lib/tracing/trace.test.ts index fe58ce6f9f7d..23b3e754f670 100644 --- a/packages/core/test/lib/tracing/trace.test.ts +++ b/packages/core/test/lib/tracing/trace.test.ts @@ -1,4 +1,3 @@ -import type { Event, Span, StartSpanOptions } from '@sentry/types'; import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, @@ -25,6 +24,7 @@ import { } from '../../../src/tracing'; import { SentryNonRecordingSpan } from '../../../src/tracing/sentryNonRecordingSpan'; import { startNewTrace } from '../../../src/tracing/trace'; +import type { Event, Span, StartSpanOptions } from '../../../src/types-hoist'; import { _setSpanForScope } from '../../../src/utils/spanOnScope'; import { getActiveSpan, getRootSpan, getSpanDescendants, spanIsSampled } from '../../../src/utils/spanUtils'; import { TestClient, getDefaultTestClientOptions } from '../../mocks/client'; diff --git a/packages/core/test/lib/transports/base.test.ts b/packages/core/test/lib/transports/base.test.ts index 438dbb93c836..3c21c8bd70ed 100644 --- a/packages/core/test/lib/transports/base.test.ts +++ b/packages/core/test/lib/transports/base.test.ts @@ -1,4 +1,4 @@ -import type { AttachmentItem, EventEnvelope, EventItem, TransportMakeRequestResponse } from '@sentry/types'; +import type { AttachmentItem, EventEnvelope, EventItem, TransportMakeRequestResponse } from '../../../src/types-hoist'; import { createTransport } from '../../../src/transports/base'; import { createEnvelope, serializeEnvelope } from '../../../src/utils-hoist/envelope'; diff --git a/packages/core/test/lib/transports/multiplexed.test.ts b/packages/core/test/lib/transports/multiplexed.test.ts index 97d69e5a6113..647acbdc856e 100644 --- a/packages/core/test/lib/transports/multiplexed.test.ts +++ b/packages/core/test/lib/transports/multiplexed.test.ts @@ -6,7 +6,7 @@ import type { EventItem, TransactionEvent, Transport, -} from '@sentry/types'; +} from '../../../src/types-hoist'; import { createClientReportEnvelope, diff --git a/packages/core/test/lib/transports/offline.test.ts b/packages/core/test/lib/transports/offline.test.ts index c266a00d1378..5aa29596fa25 100644 --- a/packages/core/test/lib/transports/offline.test.ts +++ b/packages/core/test/lib/transports/offline.test.ts @@ -7,7 +7,7 @@ import type { ReplayEnvelope, ReplayEvent, TransportMakeRequestResponse, -} from '@sentry/types'; +} from '../../../src/types-hoist'; import { createClientReportEnvelope, diff --git a/packages/core/test/lib/utils/applyScopeDataToEvent.test.ts b/packages/core/test/lib/utils/applyScopeDataToEvent.test.ts index 7fb7befcd2a7..cb2757c95301 100644 --- a/packages/core/test/lib/utils/applyScopeDataToEvent.test.ts +++ b/packages/core/test/lib/utils/applyScopeDataToEvent.test.ts @@ -1,5 +1,5 @@ -import type { Attachment, Breadcrumb, Event, EventProcessor, EventType, ScopeData } from '@sentry/types'; import { startInactiveSpan } from '../../../src'; +import type { Attachment, Breadcrumb, Event, EventProcessor, EventType, ScopeData } from '../../../src/types-hoist'; import { applyScopeDataToEvent, mergeAndOverwriteScopeData, diff --git a/packages/core/test/lib/utils/isSentryRequestUrl.test.ts b/packages/core/test/lib/utils/isSentryRequestUrl.test.ts index b223f856b95e..a8d7c43a0784 100644 --- a/packages/core/test/lib/utils/isSentryRequestUrl.test.ts +++ b/packages/core/test/lib/utils/isSentryRequestUrl.test.ts @@ -1,4 +1,4 @@ -import type { Client } from '@sentry/types'; +import type { Client } from '../../../src/types-hoist'; import { isSentryRequestUrl } from '../../../src'; diff --git a/packages/core/test/lib/utils/parameterize.test.ts b/packages/core/test/lib/utils/parameterize.test.ts index 413ba8043c49..c772c2a410c3 100644 --- a/packages/core/test/lib/utils/parameterize.test.ts +++ b/packages/core/test/lib/utils/parameterize.test.ts @@ -1,4 +1,4 @@ -import type { ParameterizedString } from '@sentry/types'; +import type { ParameterizedString } from '../../../src/types-hoist'; import { parameterize } from '../../../src/utils/parameterize'; diff --git a/packages/core/test/lib/utils/spanUtils.test.ts b/packages/core/test/lib/utils/spanUtils.test.ts index 4f763a5edba6..edd594bfac5b 100644 --- a/packages/core/test/lib/utils/spanUtils.test.ts +++ b/packages/core/test/lib/utils/spanUtils.test.ts @@ -1,4 +1,3 @@ -import type { Span, SpanAttributes, SpanStatus, SpanTimeInput } from '@sentry/types'; import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, @@ -13,6 +12,7 @@ import { startSpan, timestampInSeconds, } from '../../../src'; +import type { Span, SpanAttributes, SpanStatus, SpanTimeInput } from '../../../src/types-hoist'; import type { OpenTelemetrySdkTraceBaseSpan } from '../../../src/utils/spanUtils'; import { getRootSpan, spanIsSampled, spanTimeInputToSeconds, spanToJSON } from '../../../src/utils/spanUtils'; import { TestClient, getDefaultTestClientOptions } from '../../mocks/client'; diff --git a/packages/core/test/lib/utils/traceData.test.ts b/packages/core/test/lib/utils/traceData.test.ts index d73ab091d8eb..aad060b462de 100644 --- a/packages/core/test/lib/utils/traceData.test.ts +++ b/packages/core/test/lib/utils/traceData.test.ts @@ -1,4 +1,3 @@ -import type { Client, Span } from '@sentry/types'; import { SentrySpan, getCurrentScope, @@ -12,6 +11,7 @@ import { } from '../../../src/'; import { getAsyncContextStrategy } from '../../../src/asyncContext'; import { freezeDscOnSpan } from '../../../src/tracing/dynamicSamplingContext'; +import type { Client, Span } from '../../../src/types-hoist'; import type { TestClientOptions } from '../../mocks/client'; import { TestClient, getDefaultTestClientOptions } from '../../mocks/client'; diff --git a/packages/core/test/mocks/client.ts b/packages/core/test/mocks/client.ts index 712134388aef..eaf06909c9ab 100644 --- a/packages/core/test/mocks/client.ts +++ b/packages/core/test/mocks/client.ts @@ -7,7 +7,7 @@ import type { ParameterizedString, Session, SeverityLevel, -} from '@sentry/types'; +} from '../../src/types-hoist'; import { BaseClient } from '../../src/baseclient'; import { initAndBind } from '../../src/sdk'; diff --git a/packages/core/test/mocks/integration.ts b/packages/core/test/mocks/integration.ts index 1962596ce79c..5028bfa71ac7 100644 --- a/packages/core/test/mocks/integration.ts +++ b/packages/core/test/mocks/integration.ts @@ -1,4 +1,4 @@ -import type { Client, Event, EventProcessor, Integration } from '@sentry/types'; +import type { Client, Event, EventProcessor, Integration } from '../../src/types-hoist'; import { getClient, getCurrentScope } from '../../src'; diff --git a/packages/core/test/mocks/transport.ts b/packages/core/test/mocks/transport.ts index af6863237562..a0670700076a 100644 --- a/packages/core/test/mocks/transport.ts +++ b/packages/core/test/mocks/transport.ts @@ -1,4 +1,4 @@ -import type { Transport } from '@sentry/types'; +import type { Transport } from '../../src/types-hoist'; import { createTransport } from '../../src/transports/base'; import { SyncPromise } from '../../src/utils-hoist/syncpromise'; diff --git a/packages/core/test/utils-hoist/aggregate-errors.test.ts b/packages/core/test/utils-hoist/aggregate-errors.test.ts index 3d13a4d29b21..535325bd0491 100644 --- a/packages/core/test/utils-hoist/aggregate-errors.test.ts +++ b/packages/core/test/utils-hoist/aggregate-errors.test.ts @@ -1,4 +1,4 @@ -import type { Event, EventHint, Exception, ExtendedError, StackParser } from '@sentry/types'; +import type { Event, EventHint, Exception, ExtendedError, StackParser } from '../../src/types-hoist'; import { applyAggregateErrorsToEvent } from '../../src/utils-hoist/aggregate-errors'; import { createStackParser } from '../../src/utils-hoist/stacktrace'; diff --git a/packages/core/test/utils-hoist/clientreport.test.ts b/packages/core/test/utils-hoist/clientreport.test.ts index 698ad195d7fa..f925d74fa50c 100644 --- a/packages/core/test/utils-hoist/clientreport.test.ts +++ b/packages/core/test/utils-hoist/clientreport.test.ts @@ -1,4 +1,4 @@ -import type { ClientReport } from '@sentry/types'; +import type { ClientReport } from '../../src/types-hoist'; import { createClientReportEnvelope } from '../../src/utils-hoist/clientreport'; import { parseEnvelope, serializeEnvelope } from '../../src/utils-hoist/envelope'; diff --git a/packages/core/test/utils-hoist/envelope.test.ts b/packages/core/test/utils-hoist/envelope.test.ts index 9ebfd447fb14..bf9ed61ebea7 100644 --- a/packages/core/test/utils-hoist/envelope.test.ts +++ b/packages/core/test/utils-hoist/envelope.test.ts @@ -1,4 +1,4 @@ -import type { Event, EventEnvelope, SpanAttributes } from '@sentry/types'; +import type { Event, EventEnvelope, SpanAttributes } from '../../src/types-hoist'; import { SEMANTIC_ATTRIBUTE_EXCLUSIVE_TIME, diff --git a/packages/core/test/utils-hoist/eventbuilder.test.ts b/packages/core/test/utils-hoist/eventbuilder.test.ts index e12726746e04..afc193a343e3 100644 --- a/packages/core/test/utils-hoist/eventbuilder.test.ts +++ b/packages/core/test/utils-hoist/eventbuilder.test.ts @@ -1,4 +1,4 @@ -import type { Client } from '@sentry/types'; +import type { Client } from '../../src/types-hoist'; import { eventFromUnknownInput } from '../../src/utils-hoist/eventbuilder'; import { nodeStackLineParser } from '../../src/utils-hoist/node-stack-trace'; import { createStackParser } from '../../src/utils-hoist/stacktrace'; diff --git a/packages/core/test/utils-hoist/misc.test.ts b/packages/core/test/utils-hoist/misc.test.ts index 679f0173ffca..a042215fbcb9 100644 --- a/packages/core/test/utils-hoist/misc.test.ts +++ b/packages/core/test/utils-hoist/misc.test.ts @@ -1,4 +1,4 @@ -import type { Event, Mechanism, StackFrame } from '@sentry/types'; +import type { Event, Mechanism, StackFrame } from '../../src/types-hoist'; import { addContextToFrame, diff --git a/packages/core/test/utils-hoist/object.test.ts b/packages/core/test/utils-hoist/object.test.ts index 2fadb530bdf2..ed83b5d87aef 100644 --- a/packages/core/test/utils-hoist/object.test.ts +++ b/packages/core/test/utils-hoist/object.test.ts @@ -2,7 +2,7 @@ * @jest-environment jsdom */ -import type { WrappedFunction } from '@sentry/types'; +import type { WrappedFunction } from '../../src/types-hoist'; import { addNonEnumerableProperty, diff --git a/packages/core/test/utils-hoist/requestdata.test.ts b/packages/core/test/utils-hoist/requestdata.test.ts index 3df3ee7e84eb..a36a0669dc7b 100644 --- a/packages/core/test/utils-hoist/requestdata.test.ts +++ b/packages/core/test/utils-hoist/requestdata.test.ts @@ -1,7 +1,7 @@ /* eslint-disable deprecation/deprecation */ import type * as net from 'net'; import { addRequestDataToEvent, extractPathForTransaction, extractRequestData } from '@sentry/core'; -import type { Event, PolymorphicRequest, TransactionSource, User } from '@sentry/types'; +import type { Event, PolymorphicRequest, TransactionSource, User } from '../../src/types-hoist'; import { getClientIPAddress } from '../../src/utils-hoist/vendor/getIpAddress'; describe('addRequestDataToEvent', () => { diff --git a/packages/deno/package.json b/packages/deno/package.json index 2e19f129656f..54aa1741ec0d 100644 --- a/packages/deno/package.json +++ b/packages/deno/package.json @@ -24,8 +24,7 @@ "/build" ], "dependencies": { - "@sentry/core": "8.40.0", - "@sentry/types": "8.40.0" + "@sentry/core": "8.40.0" }, "devDependencies": { "@rollup/plugin-typescript": "^11.1.5", diff --git a/packages/deno/src/index.ts b/packages/deno/src/index.ts index 5538f92519a9..892f6ce681c0 100644 --- a/packages/deno/src/index.ts +++ b/packages/deno/src/index.ts @@ -17,7 +17,7 @@ export type { Stacktrace, Thread, User, -} from '@sentry/types'; +} from '@sentry/core'; export type { AddRequestDataToEventOptions } from '@sentry/core'; export type { DenoOptions } from './types'; diff --git a/packages/deno/src/integrations/breadcrumbs.ts b/packages/deno/src/integrations/breadcrumbs.ts index 77c471793ed3..923c57f99844 100644 --- a/packages/deno/src/integrations/breadcrumbs.ts +++ b/packages/deno/src/integrations/breadcrumbs.ts @@ -15,7 +15,7 @@ import type { HandlerDataConsole, HandlerDataFetch, IntegrationFn, -} from '@sentry/types'; +} from '@sentry/core'; interface BreadcrumbsOptions { console: boolean; diff --git a/packages/deno/src/integrations/context.ts b/packages/deno/src/integrations/context.ts index 926fcd065f1b..d89c129d2f75 100644 --- a/packages/deno/src/integrations/context.ts +++ b/packages/deno/src/integrations/context.ts @@ -1,5 +1,5 @@ import { defineIntegration } from '@sentry/core'; -import type { Event, IntegrationFn } from '@sentry/types'; +import type { Event, IntegrationFn } from '@sentry/core'; const INTEGRATION_NAME = 'DenoContext'; diff --git a/packages/deno/src/integrations/contextlines.ts b/packages/deno/src/integrations/contextlines.ts index 44dc400c9aa0..3e7827fb98b2 100644 --- a/packages/deno/src/integrations/contextlines.ts +++ b/packages/deno/src/integrations/contextlines.ts @@ -1,6 +1,6 @@ import { defineIntegration } from '@sentry/core'; import { LRUMap, addContextToFrame } from '@sentry/core'; -import type { Event, IntegrationFn, StackFrame } from '@sentry/types'; +import type { Event, IntegrationFn, StackFrame } from '@sentry/core'; const INTEGRATION_NAME = 'ContextLines'; const FILE_CONTENT_CACHE = new LRUMap(100); diff --git a/packages/deno/src/integrations/deno-cron.ts b/packages/deno/src/integrations/deno-cron.ts index bdf330319c4c..25d4c9e7d854 100644 --- a/packages/deno/src/integrations/deno-cron.ts +++ b/packages/deno/src/integrations/deno-cron.ts @@ -1,5 +1,5 @@ import { defineIntegration, getClient, withMonitor } from '@sentry/core'; -import type { Client, IntegrationFn } from '@sentry/types'; +import type { Client, IntegrationFn } from '@sentry/core'; import { parseScheduleToString } from './deno-cron-format'; type CronOptions = { backoffSchedule?: number[]; signal?: AbortSignal }; diff --git a/packages/deno/src/integrations/globalhandlers.ts b/packages/deno/src/integrations/globalhandlers.ts index bf985f1096c8..9c7960d85064 100644 --- a/packages/deno/src/integrations/globalhandlers.ts +++ b/packages/deno/src/integrations/globalhandlers.ts @@ -4,7 +4,7 @@ import { captureEvent } from '@sentry/core'; import { getClient } from '@sentry/core'; import { flush } from '@sentry/core'; import { eventFromUnknownInput, isPrimitive } from '@sentry/core'; -import type { Client, Event, IntegrationFn, Primitive, StackParser } from '@sentry/types'; +import type { Client, Event, IntegrationFn, Primitive, StackParser } from '@sentry/core'; type GlobalHandlersIntegrationsOptionKeys = 'error' | 'unhandledrejection'; diff --git a/packages/deno/src/integrations/normalizepaths.ts b/packages/deno/src/integrations/normalizepaths.ts index ad8b18694652..3576b387b54d 100644 --- a/packages/deno/src/integrations/normalizepaths.ts +++ b/packages/deno/src/integrations/normalizepaths.ts @@ -1,6 +1,6 @@ import { defineIntegration } from '@sentry/core'; import { createStackParser, dirname, nodeStackLineParser } from '@sentry/core'; -import type { IntegrationFn } from '@sentry/types'; +import type { IntegrationFn } from '@sentry/core'; const INTEGRATION_NAME = 'NormalizePaths'; diff --git a/packages/deno/src/sdk.ts b/packages/deno/src/sdk.ts index 57c6817c51ee..1223c8351a4c 100644 --- a/packages/deno/src/sdk.ts +++ b/packages/deno/src/sdk.ts @@ -7,7 +7,7 @@ import { } from '@sentry/core'; import { getIntegrationsToSetup, initAndBind } from '@sentry/core'; import { createStackParser, nodeStackLineParser, stackParserFromStackParserOptions } from '@sentry/core'; -import type { Client, Integration, Options, StackParser } from '@sentry/types'; +import type { Client, Integration, Options, StackParser } from '@sentry/core'; import { DenoClient } from './client'; import { breadcrumbsIntegration } from './integrations/breadcrumbs'; diff --git a/packages/deno/src/transports/index.ts b/packages/deno/src/transports/index.ts index d55c58f6054f..7690c1829714 100644 --- a/packages/deno/src/transports/index.ts +++ b/packages/deno/src/transports/index.ts @@ -1,6 +1,6 @@ import { createTransport, suppressTracing } from '@sentry/core'; import { consoleSandbox, logger, rejectedSyncPromise } from '@sentry/core'; -import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types'; +import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/core'; export interface DenoTransportOptions extends BaseTransportOptions { /** Custom headers for the transport. Used by the XHRTransport and FetchTransport */ diff --git a/packages/deno/src/types.ts b/packages/deno/src/types.ts index 92752c5b9d0b..f2444f7139b3 100644 --- a/packages/deno/src/types.ts +++ b/packages/deno/src/types.ts @@ -1,4 +1,4 @@ -import type { ClientOptions, Options, TracePropagationTargets } from '@sentry/types'; +import type { ClientOptions, Options, TracePropagationTargets } from '@sentry/core'; import type { DenoTransportOptions } from './transports'; @@ -30,7 +30,7 @@ export interface BaseDenoOptions { /** * Configuration options for the Sentry Deno SDK - * @see @sentry/types Options for more information. + * @see @sentry/core Options for more information. */ export interface DenoOptions extends Options, BaseDenoOptions {} diff --git a/packages/deno/test/build.ts b/packages/deno/test/build.ts index 86bb371afc08..2ea3d4191454 100644 --- a/packages/deno/test/build.ts +++ b/packages/deno/test/build.ts @@ -1,4 +1,4 @@ // We use this as the entry point to bundle Sentry dependencies that are used by the tests. -export * as sentryTypes from '@sentry/types'; +export * as sentryTypes from '@sentry/core'; export * as sentryUtils from '@sentry/core'; export * as sentryCore from '@sentry/core'; diff --git a/packages/ember/addon/index.ts b/packages/ember/addon/index.ts index 2080581b6138..9f1b536dc656 100644 --- a/packages/ember/addon/index.ts +++ b/packages/ember/addon/index.ts @@ -9,7 +9,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, app import { GLOBAL_OBJ } from '@sentry/core'; import Ember from 'ember'; -import type { Client, TransactionSource } from '@sentry/types'; +import type { Client, TransactionSource } from '@sentry/core'; import type { EmberSentryConfig, GlobalConfig, OwnConfig } from './types'; function _getSentryInitConfig(): EmberSentryConfig['sentry'] { diff --git a/packages/ember/addon/instance-initializers/sentry-performance.ts b/packages/ember/addon/instance-initializers/sentry-performance.ts index 614426cb47c9..73acdd28c43b 100644 --- a/packages/ember/addon/instance-initializers/sentry-performance.ts +++ b/packages/ember/addon/instance-initializers/sentry-performance.ts @@ -19,8 +19,8 @@ import { startInactiveSpan, } from '@sentry/browser'; import { GLOBAL_OBJ, browserPerformanceTimeOrigin, timestampInSeconds } from '@sentry/core'; +import type { Span } from '@sentry/core'; import type { ExtendedBackburner } from '@sentry/ember/runloop'; -import type { Span } from '@sentry/types'; import type { EmberRouterMain, EmberSentryConfig, GlobalConfig, OwnConfig } from '../types'; function getSentryConfig(): EmberSentryConfig { diff --git a/packages/ember/package.json b/packages/ember/package.json index e24ce2271cd3..f154e1129c36 100644 --- a/packages/ember/package.json +++ b/packages/ember/package.json @@ -34,7 +34,6 @@ "@embroider/macros": "^1.16.0", "@sentry/browser": "8.40.0", "@sentry/core": "8.40.0", - "@sentry/types": "8.40.0", "ember-auto-import": "^2.7.2", "ember-cli-babel": "^8.2.0", "ember-cli-htmlbars": "^6.1.1", diff --git a/packages/ember/tests/helpers/utils.ts b/packages/ember/tests/helpers/utils.ts index eaeeae0114b6..bce62a85dea1 100644 --- a/packages/ember/tests/helpers/utils.ts +++ b/packages/ember/tests/helpers/utils.ts @@ -1,4 +1,4 @@ -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; const defaultAssertOptions = { method: 'POST', diff --git a/packages/feedback/package.json b/packages/feedback/package.json index fcd961e9376e..3a5f97f011d6 100644 --- a/packages/feedback/package.json +++ b/packages/feedback/package.json @@ -39,8 +39,7 @@ "access": "public" }, "dependencies": { - "@sentry/core": "8.40.0", - "@sentry/types": "8.40.0" + "@sentry/core": "8.40.0" }, "devDependencies": { "preact": "^10.19.4" diff --git a/packages/feedback/src/core/TestClient.ts b/packages/feedback/src/core/TestClient.ts index c938acd182f5..3e128ff8d92f 100644 --- a/packages/feedback/src/core/TestClient.ts +++ b/packages/feedback/src/core/TestClient.ts @@ -1,6 +1,6 @@ import { BaseClient, createTransport, initAndBind } from '@sentry/core'; import { resolvedSyncPromise } from '@sentry/core'; -import type { BrowserClientReplayOptions, ClientOptions, Event, SeverityLevel } from '@sentry/types'; +import type { BrowserClientReplayOptions, ClientOptions, Event, SeverityLevel } from '@sentry/core'; export interface TestClientOptions extends ClientOptions, BrowserClientReplayOptions {} diff --git a/packages/feedback/src/core/createMainStyles.ts b/packages/feedback/src/core/createMainStyles.ts index 7c2b995274fc..6ed6e2e357d8 100644 --- a/packages/feedback/src/core/createMainStyles.ts +++ b/packages/feedback/src/core/createMainStyles.ts @@ -1,4 +1,4 @@ -import type { FeedbackInternalOptions } from '@sentry/types'; +import type { FeedbackInternalOptions } from '@sentry/core'; import { DOCUMENT } from '../constants'; const PURPLE = 'rgba(88, 74, 192, 1)'; diff --git a/packages/feedback/src/core/integration.ts b/packages/feedback/src/core/integration.ts index 1ff5f9778cb3..8cfcb2c8ea32 100644 --- a/packages/feedback/src/core/integration.ts +++ b/packages/feedback/src/core/integration.ts @@ -6,7 +6,7 @@ import type { FeedbackScreenshotIntegration, Integration, IntegrationFn, -} from '@sentry/types'; +} from '@sentry/core'; import { ADD_SCREENSHOT_LABEL, CANCEL_BUTTON_LABEL, diff --git a/packages/feedback/src/core/mockSdk.ts b/packages/feedback/src/core/mockSdk.ts index cb9b2a982397..24413d907fc3 100644 --- a/packages/feedback/src/core/mockSdk.ts +++ b/packages/feedback/src/core/mockSdk.ts @@ -1,4 +1,4 @@ -import type { Envelope, Transport, TransportMakeRequestResponse } from '@sentry/types'; +import type { Envelope, Transport, TransportMakeRequestResponse } from '@sentry/core'; import type { TestClientOptions } from './TestClient'; import { getDefaultClientOptions, init } from './TestClient'; diff --git a/packages/feedback/src/core/sendFeedback.ts b/packages/feedback/src/core/sendFeedback.ts index 3503c55a2ef2..4f5e1e3629b3 100644 --- a/packages/feedback/src/core/sendFeedback.ts +++ b/packages/feedback/src/core/sendFeedback.ts @@ -2,7 +2,7 @@ import { captureFeedback } from '@sentry/core'; import { getClient } from '@sentry/core'; import { getCurrentScope } from '@sentry/core'; import { getLocationHref } from '@sentry/core'; -import type { Event, EventHint, SendFeedback, SendFeedbackParams, TransportMakeRequestResponse } from '@sentry/types'; +import type { Event, EventHint, SendFeedback, SendFeedbackParams, TransportMakeRequestResponse } from '@sentry/core'; import { FEEDBACK_API_SOURCE } from '../constants'; /** diff --git a/packages/feedback/src/core/types.ts b/packages/feedback/src/core/types.ts index a85987301702..7f6b0d72e6af 100644 --- a/packages/feedback/src/core/types.ts +++ b/packages/feedback/src/core/types.ts @@ -1,4 +1,4 @@ -import type { FeedbackInternalOptions } from '@sentry/types'; +import type { FeedbackInternalOptions } from '@sentry/core'; /** * Partial configuration that overrides default configuration values diff --git a/packages/feedback/src/modal/components/Dialog.tsx b/packages/feedback/src/modal/components/Dialog.tsx index b711335a96c3..7bcde062a7c7 100644 --- a/packages/feedback/src/modal/components/Dialog.tsx +++ b/packages/feedback/src/modal/components/Dialog.tsx @@ -1,4 +1,4 @@ -import type { FeedbackFormData, FeedbackInternalOptions } from '@sentry/types'; +import type { FeedbackFormData, FeedbackInternalOptions } from '@sentry/core'; // biome-ignore lint/nursery/noUnusedImports: reason import { Fragment, h } from 'preact'; // eslint-disable-line @typescript-eslint/no-unused-vars import type { VNode } from 'preact'; diff --git a/packages/feedback/src/modal/components/DialogHeader.tsx b/packages/feedback/src/modal/components/DialogHeader.tsx index 217ce6676ee0..3615bdf5068b 100644 --- a/packages/feedback/src/modal/components/DialogHeader.tsx +++ b/packages/feedback/src/modal/components/DialogHeader.tsx @@ -1,4 +1,4 @@ -import type { FeedbackInternalOptions } from '@sentry/types'; +import type { FeedbackInternalOptions } from '@sentry/core'; // biome-ignore lint/nursery/noUnusedImports: reason import { h } from 'preact'; // eslint-disable-line @typescript-eslint/no-unused-vars import type { VNode } from 'preact'; diff --git a/packages/feedback/src/modal/components/Form.tsx b/packages/feedback/src/modal/components/Form.tsx index 4267e10f81d4..e42772875fc3 100644 --- a/packages/feedback/src/modal/components/Form.tsx +++ b/packages/feedback/src/modal/components/Form.tsx @@ -4,7 +4,7 @@ import type { FeedbackInternalOptions, FeedbackScreenshotIntegration, SendFeedback, -} from '@sentry/types'; +} from '@sentry/core'; // biome-ignore lint/nursery/noUnusedImports: reason import { h } from 'preact'; // eslint-disable-line @typescript-eslint/no-unused-vars import type { JSX, VNode } from 'preact'; diff --git a/packages/feedback/src/modal/integration.tsx b/packages/feedback/src/modal/integration.tsx index 25a782db1237..72797cdc5557 100644 --- a/packages/feedback/src/modal/integration.tsx +++ b/packages/feedback/src/modal/integration.tsx @@ -1,5 +1,5 @@ import { getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core'; -import type { FeedbackFormData, FeedbackModalIntegration, IntegrationFn, User } from '@sentry/types'; +import type { FeedbackFormData, FeedbackModalIntegration, IntegrationFn, User } from '@sentry/core'; import { h, render } from 'preact'; import * as hooks from 'preact/hooks'; import { DOCUMENT } from '../constants'; diff --git a/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx b/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx index 11e49c9692ae..57996c7dee7f 100644 --- a/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx +++ b/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx @@ -1,5 +1,5 @@ /* eslint-disable max-lines */ -import type { FeedbackInternalOptions, FeedbackModalIntegration } from '@sentry/types'; +import type { FeedbackInternalOptions, FeedbackModalIntegration } from '@sentry/core'; import type { ComponentType, VNode, h as hType } from 'preact'; // biome-ignore lint/nursery/noUnusedImports: reason import { h } from 'preact'; // eslint-disable-line @typescript-eslint/no-unused-vars diff --git a/packages/feedback/src/screenshot/integration.ts b/packages/feedback/src/screenshot/integration.ts index d4060c0071e2..8281040f7655 100644 --- a/packages/feedback/src/screenshot/integration.ts +++ b/packages/feedback/src/screenshot/integration.ts @@ -1,5 +1,5 @@ -import type { FeedbackScreenshotIntegration, IntegrationFn } from '@sentry/types'; -import type { Attachment } from '@sentry/types'; +import type { FeedbackScreenshotIntegration, IntegrationFn } from '@sentry/core'; +import type { Attachment } from '@sentry/core'; import type { h as hType } from 'preact'; import type * as Hooks from 'preact/hooks'; import { DOCUMENT } from '../constants'; diff --git a/packages/feedback/src/util/mergeOptions.ts b/packages/feedback/src/util/mergeOptions.ts index 0a30a893c777..c3a0c0508fcd 100644 --- a/packages/feedback/src/util/mergeOptions.ts +++ b/packages/feedback/src/util/mergeOptions.ts @@ -1,4 +1,4 @@ -import type { FeedbackFormData, FeedbackInternalOptions } from '@sentry/types'; +import type { FeedbackFormData, FeedbackInternalOptions } from '@sentry/core'; import type { OptionalFeedbackConfiguration } from '../core/types'; /** diff --git a/packages/feedback/src/util/validate.ts b/packages/feedback/src/util/validate.ts index 5525e191dd9d..83c54a1f19c3 100644 --- a/packages/feedback/src/util/validate.ts +++ b/packages/feedback/src/util/validate.ts @@ -1,4 +1,4 @@ -import type { FeedbackFormData, FeedbackInternalOptions } from '@sentry/types'; +import type { FeedbackFormData, FeedbackInternalOptions } from '@sentry/core'; export type Props = Pick< FeedbackInternalOptions, diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json index b19ec235a12a..f4a6d38f5d47 100644 --- a/packages/gatsby/package.json +++ b/packages/gatsby/package.json @@ -47,7 +47,6 @@ "dependencies": { "@sentry/core": "8.40.0", "@sentry/react": "8.40.0", - "@sentry/types": "8.40.0", "@sentry/webpack-plugin": "2.22.6" }, "peerDependencies": { diff --git a/packages/gatsby/src/sdk.ts b/packages/gatsby/src/sdk.ts index 93e9ee7617e4..ff2bea5b68fe 100644 --- a/packages/gatsby/src/sdk.ts +++ b/packages/gatsby/src/sdk.ts @@ -1,7 +1,7 @@ import { applySdkMetadata } from '@sentry/core'; import { init as reactInit } from '@sentry/react'; -import type { Client } from '@sentry/types'; +import type { Client } from '@sentry/core'; import type { GatsbyOptions } from './utils/types'; /** diff --git a/packages/google-cloud-serverless/package.json b/packages/google-cloud-serverless/package.json index fcbda8702504..b4fa218c2447 100644 --- a/packages/google-cloud-serverless/package.json +++ b/packages/google-cloud-serverless/package.json @@ -50,7 +50,6 @@ "dependencies": { "@sentry/core": "8.40.0", "@sentry/node": "8.40.0", - "@sentry/types": "8.40.0", "@types/express": "^4.17.14" }, "devDependencies": { diff --git a/packages/google-cloud-serverless/src/integrations/google-cloud-grpc.ts b/packages/google-cloud-serverless/src/integrations/google-cloud-grpc.ts index 11c2f1cf236a..0173e4d10442 100644 --- a/packages/google-cloud-serverless/src/integrations/google-cloud-grpc.ts +++ b/packages/google-cloud-serverless/src/integrations/google-cloud-grpc.ts @@ -1,8 +1,8 @@ import type { EventEmitter } from 'events'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration, getClient } from '@sentry/core'; import { fill } from '@sentry/core'; +import type { Client, IntegrationFn } from '@sentry/core'; import { startInactiveSpan } from '@sentry/node'; -import type { Client, IntegrationFn } from '@sentry/types'; interface GrpcFunction extends CallableFunction { (...args: unknown[]): EventEmitter; diff --git a/packages/google-cloud-serverless/src/integrations/google-cloud-http.ts b/packages/google-cloud-serverless/src/integrations/google-cloud-http.ts index fa26b03f486f..b00a583ecf02 100644 --- a/packages/google-cloud-serverless/src/integrations/google-cloud-http.ts +++ b/packages/google-cloud-serverless/src/integrations/google-cloud-http.ts @@ -1,8 +1,8 @@ import type * as common from '@google-cloud/common'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SentryNonRecordingSpan, defineIntegration, getClient } from '@sentry/core'; import { fill } from '@sentry/core'; +import type { Client, IntegrationFn } from '@sentry/core'; import { startInactiveSpan } from '@sentry/node'; -import type { Client, IntegrationFn } from '@sentry/types'; type RequestOptions = common.DecorateRequestOptions; type ResponseCallback = common.BodyResponseCallback; diff --git a/packages/google-cloud-serverless/src/sdk.ts b/packages/google-cloud-serverless/src/sdk.ts index 2f6f6162a9b5..03054d4bd1ff 100644 --- a/packages/google-cloud-serverless/src/sdk.ts +++ b/packages/google-cloud-serverless/src/sdk.ts @@ -1,6 +1,6 @@ +import type { Integration, Options, SdkMetadata } from '@sentry/core'; import type { NodeClient, NodeOptions } from '@sentry/node'; import { SDK_VERSION, getDefaultIntegrationsWithoutPerformance, init as initNode } from '@sentry/node'; -import type { Integration, Options, SdkMetadata } from '@sentry/types'; import { googleCloudGrpcIntegration } from './integrations/google-cloud-grpc'; import { googleCloudHttpIntegration } from './integrations/google-cloud-http'; diff --git a/packages/google-cloud-serverless/src/utils.ts b/packages/google-cloud-serverless/src/utils.ts index 8e33f55b51cd..a4f5ae36fb90 100644 --- a/packages/google-cloud-serverless/src/utils.ts +++ b/packages/google-cloud-serverless/src/utils.ts @@ -1,6 +1,6 @@ import { withIsolationScope } from '@sentry/core'; import { addExceptionMechanism } from '@sentry/core'; -import type { Scope } from '@sentry/types'; +import type { Scope } from '@sentry/core'; /** * @param fn function to run diff --git a/packages/google-cloud-serverless/test/gcpfunction/events.test.ts b/packages/google-cloud-serverless/test/gcpfunction/events.test.ts index b149bd1764f1..363147409fd2 100644 --- a/packages/google-cloud-serverless/test/gcpfunction/events.test.ts +++ b/packages/google-cloud-serverless/test/gcpfunction/events.test.ts @@ -1,7 +1,7 @@ import * as domain from 'domain'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { wrapEventFunction } from '../../src/gcpfunction/events'; import type { EventFunction, EventFunctionWithCallback } from '../../src/gcpfunction/general'; diff --git a/packages/google-cloud-serverless/test/gcpfunction/http.test.ts b/packages/google-cloud-serverless/test/gcpfunction/http.test.ts index d19850ce6679..5590add6f618 100644 --- a/packages/google-cloud-serverless/test/gcpfunction/http.test.ts +++ b/packages/google-cloud-serverless/test/gcpfunction/http.test.ts @@ -1,6 +1,6 @@ import * as domain from 'domain'; -import type { Integration } from '@sentry/types'; +import type { Integration } from '@sentry/core'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core'; diff --git a/packages/integration-shims/package.json b/packages/integration-shims/package.json index 5b3cb92fd290..73192db3d5dd 100644 --- a/packages/integration-shims/package.json +++ b/packages/integration-shims/package.json @@ -55,8 +55,7 @@ "url": "https://github.com/getsentry/sentry-javascript/issues" }, "dependencies": { - "@sentry/core": "8.40.0", - "@sentry/types": "8.40.0" + "@sentry/core": "8.40.0" }, "engines": { "node": ">=14.18" diff --git a/packages/integration-shims/src/Feedback.ts b/packages/integration-shims/src/Feedback.ts index caec59969918..ca29e7cada8b 100644 --- a/packages/integration-shims/src/Feedback.ts +++ b/packages/integration-shims/src/Feedback.ts @@ -1,5 +1,5 @@ import { consoleSandbox } from '@sentry/core'; -import type { Integration } from '@sentry/types'; +import type { Integration } from '@sentry/core'; import { FAKE_FUNCTION } from './common'; const FEEDBACK_INTEGRATION_METHODS = ['attachTo', 'createForm', 'createWidget', 'remove'] as const; diff --git a/packages/integration-shims/src/Replay.ts b/packages/integration-shims/src/Replay.ts index 30c06a9ab461..d71a41535937 100644 --- a/packages/integration-shims/src/Replay.ts +++ b/packages/integration-shims/src/Replay.ts @@ -1,5 +1,5 @@ import { consoleSandbox } from '@sentry/core'; -import type { Integration } from '@sentry/types'; +import type { Integration } from '@sentry/core'; import { FAKE_FUNCTION } from './common'; const REPLAY_INTEGRATION_METHODS = ['start', 'stop', 'flush'] as const; diff --git a/packages/integration-shims/src/metrics.ts b/packages/integration-shims/src/metrics.ts index a30a4a3c678e..a8862ee39c03 100644 --- a/packages/integration-shims/src/metrics.ts +++ b/packages/integration-shims/src/metrics.ts @@ -1,5 +1,5 @@ import { consoleSandbox } from '@sentry/core'; -import type { Metrics } from '@sentry/types'; +import type { Metrics } from '@sentry/core'; function warn(): void { consoleSandbox(() => { diff --git a/packages/nestjs/README.md b/packages/nestjs/README.md index 749e3d4efd6c..1a3ae775b7fd 100644 --- a/packages/nestjs/README.md +++ b/packages/nestjs/README.md @@ -134,7 +134,7 @@ after each cron job run. ```typescript import { Cron } from '@nestjs/schedule'; import { SentryCron, MonitorConfig } from '@sentry/nestjs'; -import type { MonitorConfig } from '@sentry/types'; +import type { MonitorConfig } from '@sentry/core'; const monitorConfig: MonitorConfig = { schedule: { diff --git a/packages/nestjs/package.json b/packages/nestjs/package.json index a28796f93c0f..e7363ada1105 100644 --- a/packages/nestjs/package.json +++ b/packages/nestjs/package.json @@ -45,8 +45,7 @@ }, "dependencies": { "@sentry/core": "8.40.0", - "@sentry/node": "8.40.0", - "@sentry/types": "8.40.0" + "@sentry/node": "8.40.0" }, "devDependencies": { "@nestjs/common": "^8.0.0 || ^9.0.0 || ^10.0.0", diff --git a/packages/nestjs/src/decorators.ts b/packages/nestjs/src/decorators.ts index 0a23ab488a2f..782e113e1877 100644 --- a/packages/nestjs/src/decorators.ts +++ b/packages/nestjs/src/decorators.ts @@ -1,7 +1,7 @@ import { captureException } from '@sentry/core'; +import type { MonitorConfig } from '@sentry/core'; import * as Sentry from '@sentry/node'; import { startSpan } from '@sentry/node'; -import type { MonitorConfig } from '@sentry/types'; import { isExpectedError } from './helpers'; /** diff --git a/packages/nestjs/src/setup.ts b/packages/nestjs/src/setup.ts index 08646402b187..55f7ddfef434 100644 --- a/packages/nestjs/src/setup.ts +++ b/packages/nestjs/src/setup.ts @@ -19,7 +19,7 @@ import { spanToJSON, } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { Span } from '@sentry/types'; +import type { Span } from '@sentry/core'; import type { Observable } from 'rxjs'; import { isExpectedError } from './helpers'; diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json index fa9adb74efd5..1cb89c5324c1 100644 --- a/packages/nextjs/package.json +++ b/packages/nextjs/package.json @@ -85,7 +85,6 @@ "@sentry/node": "8.40.0", "@sentry/opentelemetry": "8.40.0", "@sentry/react": "8.40.0", - "@sentry/types": "8.40.0", "@sentry/vercel-edge": "8.40.0", "@sentry/webpack-plugin": "2.22.6", "chalk": "3.0.0", diff --git a/packages/nextjs/src/client/browserTracingIntegration.ts b/packages/nextjs/src/client/browserTracingIntegration.ts index c50dbbf1686e..53cb3e4f6a3f 100644 --- a/packages/nextjs/src/client/browserTracingIntegration.ts +++ b/packages/nextjs/src/client/browserTracingIntegration.ts @@ -1,5 +1,5 @@ +import type { Integration } from '@sentry/core'; import { browserTracingIntegration as originalBrowserTracingIntegration } from '@sentry/react'; -import type { Integration } from '@sentry/types'; import { nextRouterInstrumentNavigation, nextRouterInstrumentPageLoad } from './routing/nextRoutingInstrumentation'; /** diff --git a/packages/nextjs/src/client/index.ts b/packages/nextjs/src/client/index.ts index 5d8c6c46b911..a26844c07da3 100644 --- a/packages/nextjs/src/client/index.ts +++ b/packages/nextjs/src/client/index.ts @@ -1,8 +1,8 @@ import { addEventProcessor, applySdkMetadata } from '@sentry/core'; import { GLOBAL_OBJ } from '@sentry/core'; +import type { Client, EventProcessor, Integration } from '@sentry/core'; import type { BrowserOptions } from '@sentry/react'; import { getDefaultIntegrations as getReactDefaultIntegrations, init as reactInit } from '@sentry/react'; -import type { Client, EventProcessor, Integration } from '@sentry/types'; import { devErrorSymbolicationEventProcessor } from '../common/devErrorSymbolicationEventProcessor'; import { getVercelEnv } from '../common/getVercelEnv'; diff --git a/packages/nextjs/src/client/routing/appRouterRoutingInstrumentation.ts b/packages/nextjs/src/client/routing/appRouterRoutingInstrumentation.ts index 11faf8d2a68b..9bb6e6288a84 100644 --- a/packages/nextjs/src/client/routing/appRouterRoutingInstrumentation.ts +++ b/packages/nextjs/src/client/routing/appRouterRoutingInstrumentation.ts @@ -4,8 +4,8 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, } from '@sentry/core'; import { GLOBAL_OBJ, browserPerformanceTimeOrigin } from '@sentry/core'; +import type { Client, Span } from '@sentry/core'; import { WINDOW, startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan } from '@sentry/react'; -import type { Client, Span } from '@sentry/types'; export const INCOMPLETE_APP_ROUTER_INSTRUMENTATION_TRANSACTION_NAME = 'incomplete-app-router-transaction'; diff --git a/packages/nextjs/src/client/routing/nextRoutingInstrumentation.ts b/packages/nextjs/src/client/routing/nextRoutingInstrumentation.ts index a25c765e0143..d37fd2de2276 100644 --- a/packages/nextjs/src/client/routing/nextRoutingInstrumentation.ts +++ b/packages/nextjs/src/client/routing/nextRoutingInstrumentation.ts @@ -1,5 +1,5 @@ +import type { Client } from '@sentry/core'; import { WINDOW } from '@sentry/react'; -import type { Client } from '@sentry/types'; import { appRouterInstrumentNavigation, appRouterInstrumentPageLoad } from './appRouterRoutingInstrumentation'; import { pagesRouterInstrumentNavigation, pagesRouterInstrumentPageLoad } from './pagesRouterRoutingInstrumentation'; diff --git a/packages/nextjs/src/client/routing/pagesRouterRoutingInstrumentation.ts b/packages/nextjs/src/client/routing/pagesRouterRoutingInstrumentation.ts index 6a2df057017c..697cda3db686 100644 --- a/packages/nextjs/src/client/routing/pagesRouterRoutingInstrumentation.ts +++ b/packages/nextjs/src/client/routing/pagesRouterRoutingInstrumentation.ts @@ -5,8 +5,8 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, } from '@sentry/core'; import { browserPerformanceTimeOrigin, logger, parseBaggageHeader, stripUrlQueryAndFragment } from '@sentry/core'; +import type { Client, TransactionSource } from '@sentry/core'; import { WINDOW, startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan } from '@sentry/react'; -import type { Client, TransactionSource } from '@sentry/types'; import type { NEXT_DATA } from 'next/dist/shared/lib/utils'; import RouterImport from 'next/router'; diff --git a/packages/nextjs/src/common/captureRequestError.ts b/packages/nextjs/src/common/captureRequestError.ts index 2dc4d8ff6325..857668cb36c6 100644 --- a/packages/nextjs/src/common/captureRequestError.ts +++ b/packages/nextjs/src/common/captureRequestError.ts @@ -1,6 +1,6 @@ import { captureException, withScope } from '@sentry/core'; import { headersToDict } from '@sentry/core'; -import type { RequestEventData } from '@sentry/types'; +import type { RequestEventData } from '@sentry/core'; type RequestInfo = { path: string; diff --git a/packages/nextjs/src/common/devErrorSymbolicationEventProcessor.ts b/packages/nextjs/src/common/devErrorSymbolicationEventProcessor.ts index 1a117517a964..8a896e543dde 100644 --- a/packages/nextjs/src/common/devErrorSymbolicationEventProcessor.ts +++ b/packages/nextjs/src/common/devErrorSymbolicationEventProcessor.ts @@ -1,6 +1,6 @@ import { suppressTracing } from '@sentry/core'; import { GLOBAL_OBJ } from '@sentry/core'; -import type { Event, EventHint } from '@sentry/types'; +import type { Event, EventHint } from '@sentry/core'; import type { StackFrame } from 'stacktrace-parser'; import * as stackTraceParser from 'stacktrace-parser'; diff --git a/packages/nextjs/src/common/types.ts b/packages/nextjs/src/common/types.ts index 517c3677d556..39ca6af602bb 100644 --- a/packages/nextjs/src/common/types.ts +++ b/packages/nextjs/src/common/types.ts @@ -1,5 +1,5 @@ import type { SentrySpan } from '@sentry/core'; -import type { WebFetchHeaders, WrappedFunction } from '@sentry/types'; +import type { WebFetchHeaders, WrappedFunction } from '@sentry/core'; import type { NextApiRequest, NextApiResponse } from 'next'; import type { RequestAsyncStorage } from '../config/templates/requestAsyncStorageShim'; diff --git a/packages/nextjs/src/common/utils/responseEnd.ts b/packages/nextjs/src/common/utils/responseEnd.ts index 1ccfd1f913d5..e792554f799d 100644 --- a/packages/nextjs/src/common/utils/responseEnd.ts +++ b/packages/nextjs/src/common/utils/responseEnd.ts @@ -1,7 +1,7 @@ import type { ServerResponse } from 'http'; import { flush, setHttpStatus } from '@sentry/core'; import { fill, logger } from '@sentry/core'; -import type { Span } from '@sentry/types'; +import type { Span } from '@sentry/core'; import { DEBUG_BUILD } from '../debug-build'; import type { ResponseEndMethod, WrappedResponseEndMethod } from '../types'; diff --git a/packages/nextjs/src/common/utils/tracingUtils.ts b/packages/nextjs/src/common/utils/tracingUtils.ts index e849e502913f..1cdd22eff763 100644 --- a/packages/nextjs/src/common/utils/tracingUtils.ts +++ b/packages/nextjs/src/common/utils/tracingUtils.ts @@ -1,6 +1,6 @@ import { Scope, getActiveSpan, getRootSpan, spanToJSON, startNewTrace } from '@sentry/core'; import { GLOBAL_OBJ, logger } from '@sentry/core'; -import type { PropagationContext } from '@sentry/types'; +import type { PropagationContext } from '@sentry/core'; import { DEBUG_BUILD } from '../debug-build'; import { TRANSACTION_ATTR_SHOULD_DROP_TRANSACTION } from '../span-attributes-with-logic-attached'; diff --git a/packages/nextjs/src/common/withServerActionInstrumentation.ts b/packages/nextjs/src/common/withServerActionInstrumentation.ts index 5a9320fd143a..b065d3008baf 100644 --- a/packages/nextjs/src/common/withServerActionInstrumentation.ts +++ b/packages/nextjs/src/common/withServerActionInstrumentation.ts @@ -10,7 +10,7 @@ import { withIsolationScope, } from '@sentry/core'; import { logger, vercelWaitUntil } from '@sentry/core'; -import type { RequestEventData } from '@sentry/types'; +import type { RequestEventData } from '@sentry/core'; import { DEBUG_BUILD } from './debug-build'; import { isNotFoundNavigationError, isRedirectNavigationError } from './nextNavigationErrorUtils'; diff --git a/packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts b/packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts index baff31c3ee3c..5e17007af6c5 100644 --- a/packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts +++ b/packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts @@ -15,7 +15,7 @@ import { withScope, } from '@sentry/core'; import { propagationContextFromHeaders, uuid4, winterCGHeadersToDict } from '@sentry/core'; -import type { RequestEventData, WebFetchHeaders } from '@sentry/types'; +import type { RequestEventData, WebFetchHeaders } from '@sentry/core'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core'; import type { GenerationFunctionContext } from '../common/types'; diff --git a/packages/nextjs/src/common/wrapMiddlewareWithSentry.ts b/packages/nextjs/src/common/wrapMiddlewareWithSentry.ts index 058d856dfd81..660cf0bb3940 100644 --- a/packages/nextjs/src/common/wrapMiddlewareWithSentry.ts +++ b/packages/nextjs/src/common/wrapMiddlewareWithSentry.ts @@ -12,7 +12,7 @@ import { winterCGRequestToRequestData, withIsolationScope, } from '@sentry/core'; -import type { TransactionSource } from '@sentry/types'; +import type { TransactionSource } from '@sentry/core'; import type { EdgeRouteHandler } from '../edge/types'; import { flushSafelyWithTimeout } from './utils/responseEnd'; diff --git a/packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts b/packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts index 82bd208f9946..b8fe38ba1635 100644 --- a/packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts +++ b/packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts @@ -13,7 +13,7 @@ import { withIsolationScope, withScope, } from '@sentry/core'; -import type { RequestEventData } from '@sentry/types'; +import type { RequestEventData } from '@sentry/core'; import type { RouteHandlerContext } from './types'; import { propagationContextFromHeaders, winterCGHeadersToDict } from '@sentry/core'; diff --git a/packages/nextjs/src/common/wrapServerComponentWithSentry.ts b/packages/nextjs/src/common/wrapServerComponentWithSentry.ts index 15536665c988..c6901bc374cc 100644 --- a/packages/nextjs/src/common/wrapServerComponentWithSentry.ts +++ b/packages/nextjs/src/common/wrapServerComponentWithSentry.ts @@ -14,7 +14,7 @@ import { withScope, } from '@sentry/core'; import { propagationContextFromHeaders, uuid4, vercelWaitUntil, winterCGHeadersToDict } from '@sentry/core'; -import type { RequestEventData } from '@sentry/types'; +import type { RequestEventData } from '@sentry/core'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core'; import { isNotFoundNavigationError, isRedirectNavigationError } from '../common/nextNavigationErrorUtils'; diff --git a/packages/nextjs/src/config/templates/requestAsyncStorageShim.ts b/packages/nextjs/src/config/templates/requestAsyncStorageShim.ts index 483d00341312..2499891cc40e 100644 --- a/packages/nextjs/src/config/templates/requestAsyncStorageShim.ts +++ b/packages/nextjs/src/config/templates/requestAsyncStorageShim.ts @@ -1,4 +1,4 @@ -import type { WebFetchHeaders } from '@sentry/types'; +import type { WebFetchHeaders } from '@sentry/core'; export interface RequestAsyncStorage { getStore: () => diff --git a/packages/nextjs/src/config/templates/routeHandlerWrapperTemplate.ts b/packages/nextjs/src/config/templates/routeHandlerWrapperTemplate.ts index d0b9fba5ce3b..9e68fd453112 100644 --- a/packages/nextjs/src/config/templates/routeHandlerWrapperTemplate.ts +++ b/packages/nextjs/src/config/templates/routeHandlerWrapperTemplate.ts @@ -1,5 +1,5 @@ +import type { WebFetchHeaders } from '@sentry/core'; import * as Sentry from '@sentry/nextjs'; -import type { WebFetchHeaders } from '@sentry/types'; // @ts-expect-error Because we cannot be sure if the RequestAsyncStorage module exists (it is not part of the Next.js public // API) we use a shim if it doesn't exist. The logic for this is in the wrapping loader. import * as origModule from '__SENTRY_NEXTJS_REQUEST_ASYNC_STORAGE_SHIM__'; diff --git a/packages/nextjs/src/config/templates/serverComponentWrapperTemplate.ts b/packages/nextjs/src/config/templates/serverComponentWrapperTemplate.ts index d569715e74fc..d8d8e26f464a 100644 --- a/packages/nextjs/src/config/templates/serverComponentWrapperTemplate.ts +++ b/packages/nextjs/src/config/templates/serverComponentWrapperTemplate.ts @@ -1,5 +1,5 @@ +import type { WebFetchHeaders } from '@sentry/core'; import * as Sentry from '@sentry/nextjs'; -import type { WebFetchHeaders } from '@sentry/types'; // @ts-expect-error Because we cannot be sure if the RequestAsyncStorage module exists (it is not part of the Next.js public // API) we use a shim if it doesn't exist. The logic for this is in the wrapping loader. import * as origModule from '__SENTRY_NEXTJS_REQUEST_ASYNC_STORAGE_SHIM__'; diff --git a/packages/nextjs/src/edge/rewriteFramesIntegration.ts b/packages/nextjs/src/edge/rewriteFramesIntegration.ts index b191488c2b68..cb904079d51d 100644 --- a/packages/nextjs/src/edge/rewriteFramesIntegration.ts +++ b/packages/nextjs/src/edge/rewriteFramesIntegration.ts @@ -1,6 +1,6 @@ import { defineIntegration, rewriteFramesIntegration as originalRewriteFramesIntegration } from '@sentry/core'; import { GLOBAL_OBJ, escapeStringForRegex } from '@sentry/core'; -import type { IntegrationFn, StackFrame } from '@sentry/types'; +import type { IntegrationFn, StackFrame } from '@sentry/core'; const globalWithInjectedValues = GLOBAL_OBJ as typeof GLOBAL_OBJ & { _sentryRewriteFramesDistDir?: string; diff --git a/packages/nextjs/src/index.types.ts b/packages/nextjs/src/index.types.ts index 9dc9e84a147a..1b6a0e09ed85 100644 --- a/packages/nextjs/src/index.types.ts +++ b/packages/nextjs/src/index.types.ts @@ -7,7 +7,7 @@ export * from './client'; export * from './server'; export * from './edge'; -import type { Client, Integration, Options, StackParser } from '@sentry/types'; +import type { Client, Integration, Options, StackParser } from '@sentry/core'; import type * as clientSdk from './client'; import type { ServerComponentContext, VercelCronsConfig } from './common/types'; diff --git a/packages/nextjs/src/server/index.ts b/packages/nextjs/src/server/index.ts index c79c35932e5b..78d8c29a3342 100644 --- a/packages/nextjs/src/server/index.ts +++ b/packages/nextjs/src/server/index.ts @@ -24,8 +24,8 @@ import { SEMATTRS_HTTP_METHOD, SEMATTRS_HTTP_TARGET, } from '@opentelemetry/semantic-conventions'; +import type { EventProcessor } from '@sentry/core'; import { getScopesFromContext } from '@sentry/opentelemetry'; -import type { EventProcessor } from '@sentry/types'; import { DEBUG_BUILD } from '../common/debug-build'; import { devErrorSymbolicationEventProcessor } from '../common/devErrorSymbolicationEventProcessor'; import { getVercelEnv } from '../common/getVercelEnv'; diff --git a/packages/nextjs/src/server/rewriteFramesIntegration.ts b/packages/nextjs/src/server/rewriteFramesIntegration.ts index 0c8af92fb958..55652566710f 100644 --- a/packages/nextjs/src/server/rewriteFramesIntegration.ts +++ b/packages/nextjs/src/server/rewriteFramesIntegration.ts @@ -1,7 +1,7 @@ import * as path from 'path'; import { defineIntegration, rewriteFramesIntegration as originalRewriteFramesIntegration } from '@sentry/core'; import { escapeStringForRegex } from '@sentry/core'; -import type { IntegrationFn, StackFrame } from '@sentry/types'; +import type { IntegrationFn, StackFrame } from '@sentry/core'; const globalWithInjectedValues = global as typeof global & { _sentryRewriteFramesDistDir?: string; diff --git a/packages/nextjs/test/clientSdk.test.ts b/packages/nextjs/test/clientSdk.test.ts index eafe07547ffb..3464c5de3c93 100644 --- a/packages/nextjs/test/clientSdk.test.ts +++ b/packages/nextjs/test/clientSdk.test.ts @@ -1,8 +1,8 @@ import { getGlobalScope, getIsolationScope } from '@sentry/core'; import { logger } from '@sentry/core'; +import type { Integration } from '@sentry/core'; import * as SentryReact from '@sentry/react'; import { WINDOW, getClient, getCurrentScope } from '@sentry/react'; -import type { Integration } from '@sentry/types'; import { JSDOM } from 'jsdom'; import { breadcrumbsIntegration, browserTracingIntegration, init } from '../src/client'; diff --git a/packages/nextjs/test/config/wrappers.test.ts b/packages/nextjs/test/config/wrappers.test.ts index e2928d59016e..de9d125b7830 100644 --- a/packages/nextjs/test/config/wrappers.test.ts +++ b/packages/nextjs/test/config/wrappers.test.ts @@ -1,7 +1,7 @@ import type { IncomingMessage, ServerResponse } from 'http'; import * as SentryCore from '@sentry/core'; -import type { Client } from '@sentry/types'; +import type { Client } from '@sentry/core'; import { wrapGetInitialPropsWithSentry, wrapGetServerSidePropsWithSentry } from '../../src/common'; const startSpanManualSpy = jest.spyOn(SentryCore, 'startSpanManual'); diff --git a/packages/nextjs/test/performance/pagesRouterInstrumentation.test.ts b/packages/nextjs/test/performance/pagesRouterInstrumentation.test.ts index 947b3c9f3f69..ac20f0ab21ab 100644 --- a/packages/nextjs/test/performance/pagesRouterInstrumentation.test.ts +++ b/packages/nextjs/test/performance/pagesRouterInstrumentation.test.ts @@ -1,5 +1,5 @@ +import type { Client } from '@sentry/core'; import { WINDOW } from '@sentry/react'; -import type { Client } from '@sentry/types'; import { JSDOM } from 'jsdom'; import type { NEXT_DATA } from 'next/dist/shared/lib/utils'; import Router from 'next/router'; diff --git a/packages/nextjs/test/serverSdk.test.ts b/packages/nextjs/test/serverSdk.test.ts index d37a1c46d015..0c3c9cfbb27a 100644 --- a/packages/nextjs/test/serverSdk.test.ts +++ b/packages/nextjs/test/serverSdk.test.ts @@ -1,7 +1,7 @@ import { GLOBAL_OBJ } from '@sentry/core'; +import type { Integration } from '@sentry/core'; import { getCurrentScope } from '@sentry/node'; import * as SentryNode from '@sentry/node'; -import type { Integration } from '@sentry/types'; import { init } from '../src/server'; diff --git a/packages/node/package.json b/packages/node/package.json index 781b0ea0f1be..9327b4c15fcc 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -99,7 +99,6 @@ "@prisma/instrumentation": "5.19.1", "@sentry/core": "8.40.0", "@sentry/opentelemetry": "8.40.0", - "@sentry/types": "8.40.0", "import-in-the-middle": "^1.11.2" }, "devDependencies": { diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts index df6cce5383a3..047c3e8d0163 100644 --- a/packages/node/src/index.ts +++ b/packages/node/src/index.ts @@ -164,4 +164,4 @@ export type { Thread, User, Span, -} from '@sentry/types'; +} from '@sentry/core'; diff --git a/packages/node/src/integrations/anr/common.ts b/packages/node/src/integrations/anr/common.ts index e2e50fae4179..e2666e3ecd3e 100644 --- a/packages/node/src/integrations/anr/common.ts +++ b/packages/node/src/integrations/anr/common.ts @@ -1,4 +1,4 @@ -import type { Contexts, DsnComponents, Primitive, SdkMetadata } from '@sentry/types'; +import type { Contexts, DsnComponents, Primitive, SdkMetadata } from '@sentry/core'; export interface AnrIntegrationOptions { /** diff --git a/packages/node/src/integrations/anr/index.ts b/packages/node/src/integrations/anr/index.ts index 0777940cc211..9f041f2e563f 100644 --- a/packages/node/src/integrations/anr/index.ts +++ b/packages/node/src/integrations/anr/index.ts @@ -1,7 +1,7 @@ import { Worker } from 'node:worker_threads'; import { defineIntegration, getCurrentScope, getGlobalScope, getIsolationScope, mergeScopeData } from '@sentry/core'; import { GLOBAL_OBJ, getFilenameToDebugIdMap, logger } from '@sentry/core'; -import type { Contexts, Event, EventHint, Integration, IntegrationFn, ScopeData } from '@sentry/types'; +import type { Contexts, Event, EventHint, Integration, IntegrationFn, ScopeData } from '@sentry/core'; import { NODE_VERSION } from '../../nodeVersion'; import type { NodeClient } from '../../sdk/client'; import type { AnrIntegrationOptions, WorkerStartData } from './common'; diff --git a/packages/node/src/integrations/anr/worker.ts b/packages/node/src/integrations/anr/worker.ts index 665ccac75633..4046f21bfe26 100644 --- a/packages/node/src/integrations/anr/worker.ts +++ b/packages/node/src/integrations/anr/worker.ts @@ -15,7 +15,7 @@ import { uuid4, watchdogTimer, } from '@sentry/core'; -import type { DebugImage, Event, ScopeData, Session, StackFrame } from '@sentry/types'; +import type { DebugImage, Event, ScopeData, Session, StackFrame } from '@sentry/core'; import { makeNodeTransport } from '../../transports'; import { createGetModuleFromFilename } from '../../utils/module'; diff --git a/packages/node/src/integrations/context.ts b/packages/node/src/integrations/context.ts index e8ab2c7f84f1..a3d45a5cc6c9 100644 --- a/packages/node/src/integrations/context.ts +++ b/packages/node/src/integrations/context.ts @@ -14,7 +14,7 @@ import type { Event, IntegrationFn, OsContext, -} from '@sentry/types'; +} from '@sentry/core'; export const readFileAsync = promisify(readFile); export const readDirAsync = promisify(readdir); diff --git a/packages/node/src/integrations/contextlines.ts b/packages/node/src/integrations/contextlines.ts index 5c77b0e845f1..63243589016a 100644 --- a/packages/node/src/integrations/contextlines.ts +++ b/packages/node/src/integrations/contextlines.ts @@ -2,7 +2,7 @@ import { createReadStream } from 'node:fs'; import { createInterface } from 'node:readline'; import { defineIntegration } from '@sentry/core'; import { LRUMap, logger, snipLine } from '@sentry/core'; -import type { Event, IntegrationFn, StackFrame } from '@sentry/types'; +import type { Event, IntegrationFn, StackFrame } from '@sentry/core'; import { DEBUG_BUILD } from '../debug-build'; diff --git a/packages/node/src/integrations/http/SentryHttpInstrumentation.ts b/packages/node/src/integrations/http/SentryHttpInstrumentation.ts index 4d948c9d37c4..cd575b4f6869 100644 --- a/packages/node/src/integrations/http/SentryHttpInstrumentation.ts +++ b/packages/node/src/integrations/http/SentryHttpInstrumentation.ts @@ -17,7 +17,7 @@ import { stripUrlQueryAndFragment, withIsolationScope, } from '@sentry/core'; -import type { RequestEventData, SanitizedRequestData, Scope } from '@sentry/types'; +import type { RequestEventData, SanitizedRequestData, Scope } from '@sentry/core'; import { DEBUG_BUILD } from '../../debug-build'; import type { NodeClient } from '../../sdk/client'; import { getRequestUrl } from '../../utils/getRequestUrl'; diff --git a/packages/node/src/integrations/http/index.ts b/packages/node/src/integrations/http/index.ts index 224bd56485a1..7af7716f0123 100644 --- a/packages/node/src/integrations/http/index.ts +++ b/packages/node/src/integrations/http/index.ts @@ -4,8 +4,8 @@ import type { HttpInstrumentationConfig } from '@opentelemetry/instrumentation-h import { HttpInstrumentation } from '@opentelemetry/instrumentation-http'; import { defineIntegration } from '@sentry/core'; +import type { IntegrationFn, Span } from '@sentry/core'; import { getClient } from '@sentry/opentelemetry'; -import type { IntegrationFn, Span } from '@sentry/types'; import { generateInstrumentOnce } from '../../otel/instrument'; import type { NodeClient } from '../../sdk/client'; diff --git a/packages/node/src/integrations/local-variables/index.ts b/packages/node/src/integrations/local-variables/index.ts index 36db00bdb9aa..13a580383fcf 100644 --- a/packages/node/src/integrations/local-variables/index.ts +++ b/packages/node/src/integrations/local-variables/index.ts @@ -1,4 +1,4 @@ -import type { Integration } from '@sentry/types'; +import type { Integration } from '@sentry/core'; import { NODE_VERSION } from '../../nodeVersion'; import type { LocalVariablesIntegrationOptions } from './common'; import { localVariablesAsyncIntegration } from './local-variables-async'; diff --git a/packages/node/src/integrations/local-variables/local-variables-async.ts b/packages/node/src/integrations/local-variables/local-variables-async.ts index 19a67db88057..a7e06470dbb3 100644 --- a/packages/node/src/integrations/local-variables/local-variables-async.ts +++ b/packages/node/src/integrations/local-variables/local-variables-async.ts @@ -1,7 +1,7 @@ import { Worker } from 'node:worker_threads'; import { defineIntegration } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { Event, EventHint, Exception, IntegrationFn } from '@sentry/types'; +import type { Event, EventHint, Exception, IntegrationFn } from '@sentry/core'; import type { NodeClient } from '../../sdk/client'; import type { FrameVariables, LocalVariablesIntegrationOptions, LocalVariablesWorkerArgs } from './common'; diff --git a/packages/node/src/integrations/local-variables/local-variables-sync.ts b/packages/node/src/integrations/local-variables/local-variables-sync.ts index 454de1d9d356..32ac146047b2 100644 --- a/packages/node/src/integrations/local-variables/local-variables-sync.ts +++ b/packages/node/src/integrations/local-variables/local-variables-sync.ts @@ -1,7 +1,7 @@ import type { Debugger, InspectorNotification, Runtime, Session } from 'node:inspector'; import { defineIntegration, getClient } from '@sentry/core'; import { LRUMap, logger } from '@sentry/core'; -import type { Event, Exception, IntegrationFn, StackFrame, StackParser } from '@sentry/types'; +import type { Event, Exception, IntegrationFn, StackFrame, StackParser } from '@sentry/core'; import { NODE_MAJOR } from '../../nodeVersion'; import type { NodeClient } from '../../sdk/client'; diff --git a/packages/node/src/integrations/modules.ts b/packages/node/src/integrations/modules.ts index 9a48dc82464a..817190e7b4b3 100644 --- a/packages/node/src/integrations/modules.ts +++ b/packages/node/src/integrations/modules.ts @@ -2,7 +2,7 @@ import { existsSync, readFileSync } from 'node:fs'; import { dirname, join } from 'node:path'; import { defineIntegration } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { IntegrationFn } from '@sentry/types'; +import type { IntegrationFn } from '@sentry/core'; import { DEBUG_BUILD } from '../debug-build'; import { isCjs } from '../utils/commonjs'; diff --git a/packages/node/src/integrations/node-fetch.ts b/packages/node/src/integrations/node-fetch.ts index d02fa53f789f..2c0b30097a18 100644 --- a/packages/node/src/integrations/node-fetch.ts +++ b/packages/node/src/integrations/node-fetch.ts @@ -9,12 +9,12 @@ import { hasTracingEnabled, } from '@sentry/core'; import { getBreadcrumbLogLevelFromHttpStatusCode, getSanitizedUrlString, parseUrl } from '@sentry/core'; +import type { IntegrationFn, SanitizedRequestData } from '@sentry/core'; import { addOpenTelemetryInstrumentation, generateSpanContextForPropagationContext, getPropagationContextFromSpan, } from '@sentry/opentelemetry'; -import type { IntegrationFn, SanitizedRequestData } from '@sentry/types'; interface NodeFetchOptions { /** diff --git a/packages/node/src/integrations/onunhandledrejection.ts b/packages/node/src/integrations/onunhandledrejection.ts index a30881d89d4b..c18699d8374c 100644 --- a/packages/node/src/integrations/onunhandledrejection.ts +++ b/packages/node/src/integrations/onunhandledrejection.ts @@ -1,6 +1,6 @@ import { captureException, defineIntegration, getClient } from '@sentry/core'; import { consoleSandbox } from '@sentry/core'; -import type { Client, IntegrationFn } from '@sentry/types'; +import type { Client, IntegrationFn } from '@sentry/core'; import { logAndExitProcess } from '../utils/errorhandling'; type UnhandledRejectionMode = 'none' | 'warn' | 'strict'; diff --git a/packages/node/src/integrations/spotlight.ts b/packages/node/src/integrations/spotlight.ts index 20828dab4eb6..629dc7f68409 100644 --- a/packages/node/src/integrations/spotlight.ts +++ b/packages/node/src/integrations/spotlight.ts @@ -1,7 +1,7 @@ import * as http from 'node:http'; import { defineIntegration } from '@sentry/core'; import { logger, serializeEnvelope } from '@sentry/core'; -import type { Client, Envelope, IntegrationFn } from '@sentry/types'; +import type { Client, Envelope, IntegrationFn } from '@sentry/core'; type SpotlightConnectionOptions = { /** diff --git a/packages/node/src/integrations/tracing/amqplib.ts b/packages/node/src/integrations/tracing/amqplib.ts index d56dd365924c..e12f54f02c52 100644 --- a/packages/node/src/integrations/tracing/amqplib.ts +++ b/packages/node/src/integrations/tracing/amqplib.ts @@ -1,7 +1,7 @@ import type { Span } from '@opentelemetry/api'; import { AmqplibInstrumentation, type AmqplibInstrumentationConfig } from '@opentelemetry/instrumentation-amqplib'; import { defineIntegration } from '@sentry/core'; -import type { IntegrationFn } from '@sentry/types'; +import type { IntegrationFn } from '@sentry/core'; import { generateInstrumentOnce } from '../../otel/instrument'; import { addOriginToSpan } from '../../utils/addOriginToSpan'; diff --git a/packages/node/src/integrations/tracing/connect.ts b/packages/node/src/integrations/tracing/connect.ts index b2938d5ee6f2..0a97788352bb 100644 --- a/packages/node/src/integrations/tracing/connect.ts +++ b/packages/node/src/integrations/tracing/connect.ts @@ -7,7 +7,7 @@ import { getClient, spanToJSON, } from '@sentry/core'; -import type { IntegrationFn, Span } from '@sentry/types'; +import type { IntegrationFn, Span } from '@sentry/core'; import { generateInstrumentOnce } from '../../otel/instrument'; import { ensureIsWrapped } from '../../utils/ensureIsWrapped'; diff --git a/packages/node/src/integrations/tracing/dataloader.ts b/packages/node/src/integrations/tracing/dataloader.ts index 87a479cf0589..6339515c6f28 100644 --- a/packages/node/src/integrations/tracing/dataloader.ts +++ b/packages/node/src/integrations/tracing/dataloader.ts @@ -5,7 +5,7 @@ import { defineIntegration, spanToJSON, } from '@sentry/core'; -import type { IntegrationFn } from '@sentry/types'; +import type { IntegrationFn } from '@sentry/core'; import { generateInstrumentOnce } from '../../otel/instrument'; const INTEGRATION_NAME = 'Dataloader'; diff --git a/packages/node/src/integrations/tracing/express.ts b/packages/node/src/integrations/tracing/express.ts index 3db47f551ccb..a9c66a9d0f2b 100644 --- a/packages/node/src/integrations/tracing/express.ts +++ b/packages/node/src/integrations/tracing/express.ts @@ -3,7 +3,7 @@ import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express'; import { SEMANTIC_ATTRIBUTE_SENTRY_OP, defineIntegration, getDefaultIsolationScope, spanToJSON } from '@sentry/core'; import { captureException, getClient, getIsolationScope } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { IntegrationFn } from '@sentry/types'; +import type { IntegrationFn } from '@sentry/core'; import { DEBUG_BUILD } from '../../debug-build'; import { generateInstrumentOnce } from '../../otel/instrument'; import type { NodeClient } from '../../sdk/client'; diff --git a/packages/node/src/integrations/tracing/fastify.ts b/packages/node/src/integrations/tracing/fastify.ts index 5a75e204b5f5..a87980045b54 100644 --- a/packages/node/src/integrations/tracing/fastify.ts +++ b/packages/node/src/integrations/tracing/fastify.ts @@ -8,7 +8,7 @@ import { getIsolationScope, spanToJSON, } from '@sentry/core'; -import type { IntegrationFn, Span } from '@sentry/types'; +import type { IntegrationFn, Span } from '@sentry/core'; import { generateInstrumentOnce } from '../../otel/instrument'; import { ensureIsWrapped } from '../../utils/ensureIsWrapped'; diff --git a/packages/node/src/integrations/tracing/genericPool.ts b/packages/node/src/integrations/tracing/genericPool.ts index ab3e5c25a207..6c4169d66b99 100644 --- a/packages/node/src/integrations/tracing/genericPool.ts +++ b/packages/node/src/integrations/tracing/genericPool.ts @@ -1,6 +1,6 @@ import { GenericPoolInstrumentation } from '@opentelemetry/instrumentation-generic-pool'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration, spanToJSON } from '@sentry/core'; -import type { IntegrationFn } from '@sentry/types'; +import type { IntegrationFn } from '@sentry/core'; import { generateInstrumentOnce } from '../../otel/instrument'; const INTEGRATION_NAME = 'GenericPool'; diff --git a/packages/node/src/integrations/tracing/graphql.ts b/packages/node/src/integrations/tracing/graphql.ts index c2f1402a0229..4de5172f8c12 100644 --- a/packages/node/src/integrations/tracing/graphql.ts +++ b/packages/node/src/integrations/tracing/graphql.ts @@ -1,7 +1,7 @@ import { GraphQLInstrumentation } from '@opentelemetry/instrumentation-graphql'; import { defineIntegration, getRootSpan, spanToJSON } from '@sentry/core'; +import type { IntegrationFn } from '@sentry/core'; import { SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION } from '@sentry/opentelemetry'; -import type { IntegrationFn } from '@sentry/types'; import { generateInstrumentOnce } from '../../otel/instrument'; import { addOriginToSpan } from '../../utils/addOriginToSpan'; diff --git a/packages/node/src/integrations/tracing/hapi/index.ts b/packages/node/src/integrations/tracing/hapi/index.ts index 113c37bfc90b..7cd988bb334f 100644 --- a/packages/node/src/integrations/tracing/hapi/index.ts +++ b/packages/node/src/integrations/tracing/hapi/index.ts @@ -11,7 +11,7 @@ import { spanToJSON, } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { IntegrationFn, Span } from '@sentry/types'; +import type { IntegrationFn, Span } from '@sentry/core'; import { DEBUG_BUILD } from '../../../debug-build'; import { generateInstrumentOnce } from '../../../otel/instrument'; import { ensureIsWrapped } from '../../../utils/ensureIsWrapped'; diff --git a/packages/node/src/integrations/tracing/index.ts b/packages/node/src/integrations/tracing/index.ts index c8f6348aeee0..1d6a7e9fdb8f 100644 --- a/packages/node/src/integrations/tracing/index.ts +++ b/packages/node/src/integrations/tracing/index.ts @@ -1,4 +1,4 @@ -import type { Integration } from '@sentry/types'; +import type { Integration } from '@sentry/core'; import { instrumentOtelHttp } from '../http'; import { amqplibIntegration, instrumentAmqplib } from './amqplib'; diff --git a/packages/node/src/integrations/tracing/kafka.ts b/packages/node/src/integrations/tracing/kafka.ts index 68a9ccf8bab4..f199487030c2 100644 --- a/packages/node/src/integrations/tracing/kafka.ts +++ b/packages/node/src/integrations/tracing/kafka.ts @@ -1,7 +1,7 @@ import { KafkaJsInstrumentation } from '@opentelemetry/instrumentation-kafkajs'; import { defineIntegration } from '@sentry/core'; -import type { IntegrationFn } from '@sentry/types'; +import type { IntegrationFn } from '@sentry/core'; import { generateInstrumentOnce } from '../../otel/instrument'; import { addOriginToSpan } from '../../utils/addOriginToSpan'; diff --git a/packages/node/src/integrations/tracing/knex.ts b/packages/node/src/integrations/tracing/knex.ts index 55457680e101..4af0f7f1b787 100644 --- a/packages/node/src/integrations/tracing/knex.ts +++ b/packages/node/src/integrations/tracing/knex.ts @@ -1,6 +1,6 @@ import { KnexInstrumentation } from '@opentelemetry/instrumentation-knex'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration, spanToJSON } from '@sentry/core'; -import type { IntegrationFn } from '@sentry/types'; +import type { IntegrationFn } from '@sentry/core'; import { generateInstrumentOnce } from '../../otel/instrument'; const INTEGRATION_NAME = 'Knex'; diff --git a/packages/node/src/integrations/tracing/koa.ts b/packages/node/src/integrations/tracing/koa.ts index 26ecea2133b1..c97ba9e29183 100644 --- a/packages/node/src/integrations/tracing/koa.ts +++ b/packages/node/src/integrations/tracing/koa.ts @@ -10,7 +10,7 @@ import { spanToJSON, } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { IntegrationFn, Span } from '@sentry/types'; +import type { IntegrationFn, Span } from '@sentry/core'; import { DEBUG_BUILD } from '../../debug-build'; import { generateInstrumentOnce } from '../../otel/instrument'; import { ensureIsWrapped } from '../../utils/ensureIsWrapped'; diff --git a/packages/node/src/integrations/tracing/lrumemoizer.ts b/packages/node/src/integrations/tracing/lrumemoizer.ts index 6c8a1962338c..9bd1477cc9c5 100644 --- a/packages/node/src/integrations/tracing/lrumemoizer.ts +++ b/packages/node/src/integrations/tracing/lrumemoizer.ts @@ -1,7 +1,7 @@ import { LruMemoizerInstrumentation } from '@opentelemetry/instrumentation-lru-memoizer'; import { defineIntegration } from '@sentry/core'; -import type { IntegrationFn } from '@sentry/types'; +import type { IntegrationFn } from '@sentry/core'; import { generateInstrumentOnce } from '../../otel/instrument'; const INTEGRATION_NAME = 'LruMemoizer'; diff --git a/packages/node/src/integrations/tracing/mongo.ts b/packages/node/src/integrations/tracing/mongo.ts index 5f4d4e66a8a6..f145c772006f 100644 --- a/packages/node/src/integrations/tracing/mongo.ts +++ b/packages/node/src/integrations/tracing/mongo.ts @@ -1,6 +1,6 @@ import { MongoDBInstrumentation } from '@opentelemetry/instrumentation-mongodb'; import { defineIntegration } from '@sentry/core'; -import type { IntegrationFn } from '@sentry/types'; +import type { IntegrationFn } from '@sentry/core'; import { generateInstrumentOnce } from '../../otel/instrument'; import { addOriginToSpan } from '../../utils/addOriginToSpan'; diff --git a/packages/node/src/integrations/tracing/mongoose.ts b/packages/node/src/integrations/tracing/mongoose.ts index 58234c1ec87f..baf3053ba638 100644 --- a/packages/node/src/integrations/tracing/mongoose.ts +++ b/packages/node/src/integrations/tracing/mongoose.ts @@ -1,6 +1,6 @@ import { MongooseInstrumentation } from '@opentelemetry/instrumentation-mongoose'; import { defineIntegration } from '@sentry/core'; -import type { IntegrationFn } from '@sentry/types'; +import type { IntegrationFn } from '@sentry/core'; import { generateInstrumentOnce } from '../../otel/instrument'; import { addOriginToSpan } from '../../utils/addOriginToSpan'; diff --git a/packages/node/src/integrations/tracing/mysql.ts b/packages/node/src/integrations/tracing/mysql.ts index d6509de0f765..96ad15ad3de8 100644 --- a/packages/node/src/integrations/tracing/mysql.ts +++ b/packages/node/src/integrations/tracing/mysql.ts @@ -1,6 +1,6 @@ import { MySQLInstrumentation } from '@opentelemetry/instrumentation-mysql'; import { defineIntegration } from '@sentry/core'; -import type { IntegrationFn } from '@sentry/types'; +import type { IntegrationFn } from '@sentry/core'; import { generateInstrumentOnce } from '../../otel/instrument'; const INTEGRATION_NAME = 'Mysql'; diff --git a/packages/node/src/integrations/tracing/mysql2.ts b/packages/node/src/integrations/tracing/mysql2.ts index c44fa2433528..6e141339780f 100644 --- a/packages/node/src/integrations/tracing/mysql2.ts +++ b/packages/node/src/integrations/tracing/mysql2.ts @@ -1,6 +1,6 @@ import { MySQL2Instrumentation } from '@opentelemetry/instrumentation-mysql2'; import { defineIntegration } from '@sentry/core'; -import type { IntegrationFn } from '@sentry/types'; +import type { IntegrationFn } from '@sentry/core'; import { generateInstrumentOnce } from '../../otel/instrument'; import { addOriginToSpan } from '../../utils/addOriginToSpan'; diff --git a/packages/node/src/integrations/tracing/nest/helpers.ts b/packages/node/src/integrations/tracing/nest/helpers.ts index 236a54ae2a42..464992549944 100644 --- a/packages/node/src/integrations/tracing/nest/helpers.ts +++ b/packages/node/src/integrations/tracing/nest/helpers.ts @@ -1,6 +1,6 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, withActiveSpan } from '@sentry/core'; import { addNonEnumerableProperty } from '@sentry/core'; -import type { Span } from '@sentry/types'; +import type { Span } from '@sentry/core'; import type { CatchTarget, InjectableTarget, NextFunction, Observable, Subscription } from './types'; const sentryPatched = 'sentryPatched'; diff --git a/packages/node/src/integrations/tracing/nest/nest.ts b/packages/node/src/integrations/tracing/nest/nest.ts index f21a3fd3eae6..c886d9e319e9 100644 --- a/packages/node/src/integrations/tracing/nest/nest.ts +++ b/packages/node/src/integrations/tracing/nest/nest.ts @@ -10,7 +10,7 @@ import { spanToJSON, } from '@sentry/core'; import { consoleSandbox, logger } from '@sentry/core'; -import type { Span } from '@sentry/types'; +import type { Span } from '@sentry/core'; import { generateInstrumentOnce } from '../../../otel/instrument'; import { SentryNestEventInstrumentation } from './sentry-nest-event-instrumentation'; import { SentryNestInstrumentation } from './sentry-nest-instrumentation'; diff --git a/packages/node/src/integrations/tracing/nest/sentry-nest-instrumentation.ts b/packages/node/src/integrations/tracing/nest/sentry-nest-instrumentation.ts index 66449995ac1e..1dc51dcf816c 100644 --- a/packages/node/src/integrations/tracing/nest/sentry-nest-instrumentation.ts +++ b/packages/node/src/integrations/tracing/nest/sentry-nest-instrumentation.ts @@ -7,7 +7,7 @@ import { } from '@opentelemetry/instrumentation'; import { getActiveSpan, startInactiveSpan, startSpan, startSpanManual, withActiveSpan } from '@sentry/core'; import { SDK_VERSION, addNonEnumerableProperty, isThenable } from '@sentry/core'; -import type { Span } from '@sentry/types'; +import type { Span } from '@sentry/core'; import { getMiddlewareSpanOptions, getNextProxy, instrumentObservable, isPatched } from './helpers'; import type { CallHandler, CatchTarget, InjectableTarget, MinimalNestJsExecutionContext, Observable } from './types'; diff --git a/packages/node/src/integrations/tracing/postgres.ts b/packages/node/src/integrations/tracing/postgres.ts index 6df045156d41..d436b95b45d8 100644 --- a/packages/node/src/integrations/tracing/postgres.ts +++ b/packages/node/src/integrations/tracing/postgres.ts @@ -1,6 +1,6 @@ import { PgInstrumentation } from '@opentelemetry/instrumentation-pg'; import { defineIntegration } from '@sentry/core'; -import type { IntegrationFn } from '@sentry/types'; +import type { IntegrationFn } from '@sentry/core'; import { generateInstrumentOnce } from '../../otel/instrument'; import { addOriginToSpan } from '../../utils/addOriginToSpan'; diff --git a/packages/node/src/integrations/tracing/prisma.ts b/packages/node/src/integrations/tracing/prisma.ts index 56768bf1ba71..a42d41a6b5ec 100644 --- a/packages/node/src/integrations/tracing/prisma.ts +++ b/packages/node/src/integrations/tracing/prisma.ts @@ -1,7 +1,7 @@ // When importing CJS modules into an ESM module, we cannot import the named exports directly. import * as prismaInstrumentation from '@prisma/instrumentation'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration, spanToJSON } from '@sentry/core'; -import type { IntegrationFn } from '@sentry/types'; +import type { IntegrationFn } from '@sentry/core'; import { generateInstrumentOnce } from '../../otel/instrument'; const INTEGRATION_NAME = 'Prisma'; diff --git a/packages/node/src/integrations/tracing/redis.ts b/packages/node/src/integrations/tracing/redis.ts index 7888aaf66be3..524a209ece30 100644 --- a/packages/node/src/integrations/tracing/redis.ts +++ b/packages/node/src/integrations/tracing/redis.ts @@ -12,7 +12,7 @@ import { spanToJSON, } from '@sentry/core'; import { truncate } from '@sentry/core'; -import type { IntegrationFn } from '@sentry/types'; +import type { IntegrationFn } from '@sentry/core'; import { generateInstrumentOnce } from '../../otel/instrument'; import { GET_COMMANDS, diff --git a/packages/node/src/integrations/tracing/tedious.ts b/packages/node/src/integrations/tracing/tedious.ts index 6ad1cf56f28e..8671edd2c09f 100644 --- a/packages/node/src/integrations/tracing/tedious.ts +++ b/packages/node/src/integrations/tracing/tedious.ts @@ -1,6 +1,6 @@ import { TediousInstrumentation } from '@opentelemetry/instrumentation-tedious'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration, spanToJSON } from '@sentry/core'; -import type { IntegrationFn } from '@sentry/types'; +import type { IntegrationFn } from '@sentry/core'; import { generateInstrumentOnce } from '../../otel/instrument'; const TEDIUS_INSTRUMENTED_METHODS = new Set([ diff --git a/packages/node/src/sdk/api.ts b/packages/node/src/sdk/api.ts index e7b09a18b4a4..a293b303c20b 100644 --- a/packages/node/src/sdk/api.ts +++ b/packages/node/src/sdk/api.ts @@ -1,7 +1,7 @@ // PUBLIC APIS import { GLOBAL_OBJ, createStackParser, nodeStackLineParser } from '@sentry/core'; -import type { StackParser } from '@sentry/types'; +import type { StackParser } from '@sentry/core'; import { createGetModuleFromFilename } from '../utils/module'; /** diff --git a/packages/node/src/sdk/client.ts b/packages/node/src/sdk/client.ts index f8a775c15600..50d130bdaac4 100644 --- a/packages/node/src/sdk/client.ts +++ b/packages/node/src/sdk/client.ts @@ -5,8 +5,8 @@ import { registerInstrumentations } from '@opentelemetry/instrumentation'; import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base'; import type { Scope, ServerRuntimeClientOptions } from '@sentry/core'; import { SDK_VERSION, ServerRuntimeClient, applySdkMetadata, logger } from '@sentry/core'; +import type { DynamicSamplingContext, TraceContext } from '@sentry/core'; import { getTraceContextForScope } from '@sentry/opentelemetry'; -import type { DynamicSamplingContext, TraceContext } from '@sentry/types'; import { isMainThread, threadId } from 'worker_threads'; import { DEBUG_BUILD } from '../debug-build'; import type { NodeClientOptions } from '../types'; diff --git a/packages/node/src/sdk/index.ts b/packages/node/src/sdk/index.ts index 2a64fb0d904f..d27414b6daeb 100644 --- a/packages/node/src/sdk/index.ts +++ b/packages/node/src/sdk/index.ts @@ -18,13 +18,13 @@ import { propagationContextFromHeaders, stackParserFromStackParserOptions, } from '@sentry/core'; +import type { Integration, Options } from '@sentry/core'; import { enhanceDscWithOpenTelemetryRootSpanName, openTelemetrySetupCheck, setOpenTelemetryContextAsyncContextStrategy, setupEventContextTrace, } from '@sentry/opentelemetry'; -import type { Integration, Options } from '@sentry/types'; import { DEBUG_BUILD } from '../debug-build'; import { consoleIntegration } from '../integrations/console'; import { nodeContextIntegration } from '../integrations/context'; diff --git a/packages/node/src/sdk/scope.ts b/packages/node/src/sdk/scope.ts index 0633c1f57f43..cc376fbf086c 100644 --- a/packages/node/src/sdk/scope.ts +++ b/packages/node/src/sdk/scope.ts @@ -1,6 +1,6 @@ import { context } from '@opentelemetry/api'; +import type { Scope } from '@sentry/core'; import { getScopesFromContext } from '@sentry/opentelemetry'; -import type { Scope } from '@sentry/types'; /** * Update the active isolation scope. diff --git a/packages/node/src/transports/http.ts b/packages/node/src/transports/http.ts index ce3b34dbc909..313e6496463d 100644 --- a/packages/node/src/transports/http.ts +++ b/packages/node/src/transports/http.ts @@ -10,7 +10,7 @@ import type { TransportMakeRequestResponse, TransportRequest, TransportRequestExecutor, -} from '@sentry/types'; +} from '@sentry/core'; import { HttpsProxyAgent } from '../proxy'; import type { HTTPModule } from './http-module'; diff --git a/packages/node/src/types.ts b/packages/node/src/types.ts index 512e6c164727..ebcdee869523 100644 --- a/packages/node/src/types.ts +++ b/packages/node/src/types.ts @@ -1,7 +1,7 @@ import type { Span as WriteableSpan } from '@opentelemetry/api'; import type { Instrumentation } from '@opentelemetry/instrumentation'; import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'; -import type { ClientOptions, Options, SamplingContext, Scope, Span, TracePropagationTargets } from '@sentry/types'; +import type { ClientOptions, Options, SamplingContext, Scope, Span, TracePropagationTargets } from '@sentry/core'; import type { NodeTransportOptions } from './transports'; @@ -172,7 +172,7 @@ export interface BaseNodeOptions { /** * Configuration options for the Sentry Node SDK - * @see @sentry/types Options for more information. + * @see @sentry/core Options for more information. */ export interface NodeOptions extends Options, BaseNodeOptions {} diff --git a/packages/node/src/utils/addOriginToSpan.ts b/packages/node/src/utils/addOriginToSpan.ts index 9d2acfcd83b2..22ed30ed37e0 100644 --- a/packages/node/src/utils/addOriginToSpan.ts +++ b/packages/node/src/utils/addOriginToSpan.ts @@ -1,6 +1,6 @@ import type { Span } from '@opentelemetry/api'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core'; -import type { SpanOrigin } from '@sentry/types'; +import type { SpanOrigin } from '@sentry/core'; /** Adds an origin to an OTEL Span. */ export function addOriginToSpan(span: Span, origin: SpanOrigin): void { diff --git a/packages/node/src/utils/createMissingInstrumentationContext.ts b/packages/node/src/utils/createMissingInstrumentationContext.ts index 849e49e8b8e2..1930bcf782eb 100644 --- a/packages/node/src/utils/createMissingInstrumentationContext.ts +++ b/packages/node/src/utils/createMissingInstrumentationContext.ts @@ -1,4 +1,4 @@ -import type { MissingInstrumentationContext } from '@sentry/types'; +import type { MissingInstrumentationContext } from '@sentry/core'; import { isCjs } from './commonjs'; export const createMissingInstrumentationContext = (pkg: string): MissingInstrumentationContext => ({ diff --git a/packages/node/src/utils/prepareEvent.ts b/packages/node/src/utils/prepareEvent.ts index db89c2b198c0..b15b698550bc 100644 --- a/packages/node/src/utils/prepareEvent.ts +++ b/packages/node/src/utils/prepareEvent.ts @@ -1,5 +1,5 @@ import { Scope } from '@sentry/core'; -import type { CaptureContext, EventHint, Scope as ScopeInterface, ScopeContext } from '@sentry/types'; +import type { CaptureContext, EventHint, Scope as ScopeInterface, ScopeContext } from '@sentry/core'; /** * This type makes sure that we get either a CaptureContext, OR an EventHint. diff --git a/packages/node/test/integration/transactions.test.ts b/packages/node/test/integration/transactions.test.ts index a9d524ea0285..d0cc3ef4ec53 100644 --- a/packages/node/test/integration/transactions.test.ts +++ b/packages/node/test/integration/transactions.test.ts @@ -2,8 +2,8 @@ import { TraceFlags, context, trace } from '@opentelemetry/api'; import type { SpanProcessor } from '@opentelemetry/sdk-trace-base'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core'; import { logger } from '@sentry/core'; +import type { TransactionEvent } from '@sentry/core'; import { SentrySpanProcessor } from '@sentry/opentelemetry'; -import type { TransactionEvent } from '@sentry/types'; import * as Sentry from '../../src'; import { cleanupOtel, getProvider, mockSdkInit } from '../helpers/mockSdkInit'; diff --git a/packages/node/test/integrations/contextlines.test.ts b/packages/node/test/integrations/contextlines.test.ts index 4c609b22a3f4..47827d8cfeb2 100644 --- a/packages/node/test/integrations/contextlines.test.ts +++ b/packages/node/test/integrations/contextlines.test.ts @@ -1,6 +1,6 @@ import * as fs from 'node:fs'; import { parseStackFrames } from '@sentry/core'; -import type { StackFrame } from '@sentry/types'; +import type { StackFrame } from '@sentry/core'; import { MAX_CONTEXTLINES_COLNO, diff --git a/packages/node/test/integrations/express.test.ts b/packages/node/test/integrations/express.test.ts index 3071dce968d5..417c3b783216 100644 --- a/packages/node/test/integrations/express.test.ts +++ b/packages/node/test/integrations/express.test.ts @@ -1,6 +1,6 @@ import * as http from 'http'; import { getCurrentScope, getIsolationScope, setAsyncContextStrategy, setCurrentClient, withScope } from '@sentry/core'; -import type { Scope } from '@sentry/types'; +import type { Scope } from '@sentry/core'; import { expressErrorHandler } from '../../src/integrations/tracing/express'; import { NodeClient } from '../../src/sdk/client'; import { getDefaultNodeClientOptions } from '../helpers/getDefaultNodeClientOptions'; diff --git a/packages/node/test/integrations/spotlight.test.ts b/packages/node/test/integrations/spotlight.test.ts index c78c81fdba14..fef4765c9b15 100644 --- a/packages/node/test/integrations/spotlight.test.ts +++ b/packages/node/test/integrations/spotlight.test.ts @@ -1,6 +1,6 @@ import * as http from 'http'; import { createEnvelope, logger } from '@sentry/core'; -import type { Envelope, EventEnvelope } from '@sentry/types'; +import type { Envelope, EventEnvelope } from '@sentry/core'; import { spotlightIntegration } from '../../src/integrations/spotlight'; import { NodeClient } from '../../src/sdk/client'; diff --git a/packages/node/test/sdk/api.test.ts b/packages/node/test/sdk/api.test.ts index e2699b4496f2..4b0ff80c4d5c 100644 --- a/packages/node/test/sdk/api.test.ts +++ b/packages/node/test/sdk/api.test.ts @@ -1,4 +1,4 @@ -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { getActiveSpan, getClient, startInactiveSpan, startSpan, withActiveSpan } from '../../src'; import { cleanupOtel, mockSdkInit } from '../helpers/mockSdkInit'; diff --git a/packages/node/test/sdk/client.test.ts b/packages/node/test/sdk/client.test.ts index 8f85c375592f..5f351ff3e990 100644 --- a/packages/node/test/sdk/client.test.ts +++ b/packages/node/test/sdk/client.test.ts @@ -10,8 +10,8 @@ import { setCurrentClient, withIsolationScope, } from '@sentry/core'; -import type { Event, EventHint } from '@sentry/types'; -import type { Scope } from '@sentry/types'; +import type { Event, EventHint } from '@sentry/core'; +import type { Scope } from '@sentry/core'; import { setOpenTelemetryContextAsyncContextStrategy } from '@sentry/opentelemetry'; import { NodeClient, initOpenTelemetry } from '../../src'; diff --git a/packages/node/test/sdk/init.test.ts b/packages/node/test/sdk/init.test.ts index 3444b6e43582..074de8296cd9 100644 --- a/packages/node/test/sdk/init.test.ts +++ b/packages/node/test/sdk/init.test.ts @@ -1,5 +1,5 @@ import { logger } from '@sentry/core'; -import type { Integration } from '@sentry/types'; +import type { Integration } from '@sentry/core'; import * as SentryOpentelemetry from '@sentry/opentelemetry'; import { getClient, getIsolationScope } from '../../src/'; diff --git a/packages/node/test/sdk/scope.test.ts b/packages/node/test/sdk/scope.test.ts index 5e84e412f912..f31c4ba4d663 100644 --- a/packages/node/test/sdk/scope.test.ts +++ b/packages/node/test/sdk/scope.test.ts @@ -1,5 +1,5 @@ import { Scope, getGlobalScope, prepareEvent } from '@sentry/core'; -import type { Attachment, Breadcrumb, Client, ClientOptions, EventProcessor } from '@sentry/types'; +import type { Attachment, Breadcrumb, Client, ClientOptions, EventProcessor } from '@sentry/core'; import { getIsolationScope } from '../../src'; import { mockSdkInit } from '../helpers/mockSdkInit'; diff --git a/packages/node/test/transports/http.test.ts b/packages/node/test/transports/http.test.ts index 445db5f14c95..40dd28e438f9 100644 --- a/packages/node/test/transports/http.test.ts +++ b/packages/node/test/transports/http.test.ts @@ -2,7 +2,7 @@ import * as http from 'http'; import { createGunzip } from 'zlib'; import { createTransport } from '@sentry/core'; import { addItemToEnvelope, createAttachmentEnvelopeItem, createEnvelope, serializeEnvelope } from '@sentry/core'; -import type { EventEnvelope, EventItem } from '@sentry/types'; +import type { EventEnvelope, EventItem } from '@sentry/core'; import { makeNodeTransport } from '../../src/transports'; diff --git a/packages/node/test/transports/https.test.ts b/packages/node/test/transports/https.test.ts index f907086698e1..06835f361e67 100644 --- a/packages/node/test/transports/https.test.ts +++ b/packages/node/test/transports/https.test.ts @@ -2,7 +2,7 @@ import * as http from 'http'; import * as https from 'https'; import { createTransport } from '@sentry/core'; import { createEnvelope, serializeEnvelope } from '@sentry/core'; -import type { EventEnvelope, EventItem } from '@sentry/types'; +import type { EventEnvelope, EventItem } from '@sentry/core'; import { makeNodeTransport } from '../../src/transports'; import type { HTTPModule, HTTPModuleRequestIncomingMessage } from '../../src/transports/http-module'; diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json index 225517786c03..3c06a15d1140 100644 --- a/packages/nuxt/package.json +++ b/packages/nuxt/package.json @@ -48,7 +48,6 @@ "@sentry/node": "8.40.0", "@sentry/opentelemetry": "8.40.0", "@sentry/rollup-plugin": "2.22.6", - "@sentry/types": "8.40.0", "@sentry/vite-plugin": "2.22.6", "@sentry/vue": "8.40.0" }, diff --git a/packages/nuxt/src/client/piniaIntegration.ts b/packages/nuxt/src/client/piniaIntegration.ts index e5e838267363..33b02c1a85ec 100644 --- a/packages/nuxt/src/client/piniaIntegration.ts +++ b/packages/nuxt/src/client/piniaIntegration.ts @@ -1,5 +1,5 @@ import { defineIntegration } from '@sentry/core'; -import type { IntegrationFn } from '@sentry/types'; +import type { IntegrationFn } from '@sentry/core'; import { consoleSandbox } from '@sentry/core'; import { createSentryPiniaPlugin } from '@sentry/vue'; diff --git a/packages/nuxt/src/client/sdk.ts b/packages/nuxt/src/client/sdk.ts index d7a59556e37f..45c02583cbfc 100644 --- a/packages/nuxt/src/client/sdk.ts +++ b/packages/nuxt/src/client/sdk.ts @@ -1,6 +1,6 @@ import { getDefaultIntegrations as getBrowserDefaultIntegrations, init as initBrowser } from '@sentry/browser'; import { applySdkMetadata } from '@sentry/core'; -import type { Client } from '@sentry/types'; +import type { Client } from '@sentry/core'; import type { SentryNuxtClientOptions } from '../common/types'; /** diff --git a/packages/nuxt/src/index.types.ts b/packages/nuxt/src/index.types.ts index ceb6c7fc207c..fd4bd00856be 100644 --- a/packages/nuxt/src/index.types.ts +++ b/packages/nuxt/src/index.types.ts @@ -1,4 +1,4 @@ -import type { Client, Integration, Options, StackParser } from '@sentry/types'; +import type { Client, Integration, Options, StackParser } from '@sentry/core'; import type { SentryNuxtClientOptions } from './common/types'; import type * as clientSdk from './index.client'; import type * as serverSdk from './index.server'; diff --git a/packages/nuxt/src/runtime/utils.ts b/packages/nuxt/src/runtime/utils.ts index 54819fd9bd77..27a8ab11f202 100644 --- a/packages/nuxt/src/runtime/utils.ts +++ b/packages/nuxt/src/runtime/utils.ts @@ -1,6 +1,6 @@ import { captureException, getClient, getTraceMetaTags } from '@sentry/core'; import { dropUndefinedKeys } from '@sentry/core'; -import type { ClientOptions, Context } from '@sentry/types'; +import type { ClientOptions, Context } from '@sentry/core'; import type { VueOptions } from '@sentry/vue/src/types'; import type { CapturedErrorContext } from 'nitropack'; import type { NuxtRenderHTMLContext } from 'nuxt/app'; diff --git a/packages/nuxt/src/server/sdk.ts b/packages/nuxt/src/server/sdk.ts index ccef93ea3350..6314506c3546 100644 --- a/packages/nuxt/src/server/sdk.ts +++ b/packages/nuxt/src/server/sdk.ts @@ -1,12 +1,12 @@ import { applySdkMetadata, flush, getGlobalScope } from '@sentry/core'; import { logger, vercelWaitUntil } from '@sentry/core'; +import type { Client, EventProcessor, Integration } from '@sentry/core'; import { type NodeOptions, getDefaultIntegrations as getDefaultNodeIntegrations, httpIntegration, init as initNode, } from '@sentry/node'; -import type { Client, EventProcessor, Integration } from '@sentry/types'; import { DEBUG_BUILD } from '../common/debug-build'; import type { SentryNuxtServerOptions } from '../common/types'; diff --git a/packages/nuxt/test/server/sdk.test.ts b/packages/nuxt/test/server/sdk.test.ts index 56888afc9a79..5234c5347b24 100644 --- a/packages/nuxt/test/server/sdk.test.ts +++ b/packages/nuxt/test/server/sdk.test.ts @@ -1,9 +1,9 @@ +import type { EventProcessor } from '@sentry/core'; import * as SentryNode from '@sentry/node'; import type { NodeClient } from '@sentry/node'; import { Scope } from '@sentry/node'; import { getGlobalScope } from '@sentry/node'; import { SDK_VERSION } from '@sentry/node'; -import type { EventProcessor } from '@sentry/types'; import { beforeEach, describe, expect, it, vi } from 'vitest'; import type { SentryNuxtServerOptions } from '../../src/common/types'; import { init } from '../../src/server'; diff --git a/packages/opentelemetry/package.json b/packages/opentelemetry/package.json index 20759d16ee6f..ae1edf863086 100644 --- a/packages/opentelemetry/package.json +++ b/packages/opentelemetry/package.json @@ -39,8 +39,7 @@ "access": "public" }, "dependencies": { - "@sentry/core": "8.40.0", - "@sentry/types": "8.40.0" + "@sentry/core": "8.40.0" }, "peerDependencies": { "@opentelemetry/api": "^1.9.0", diff --git a/packages/opentelemetry/src/asyncContextStrategy.ts b/packages/opentelemetry/src/asyncContextStrategy.ts index 31da9479921f..8b7b65e4ae23 100644 --- a/packages/opentelemetry/src/asyncContextStrategy.ts +++ b/packages/opentelemetry/src/asyncContextStrategy.ts @@ -1,7 +1,7 @@ import * as api from '@opentelemetry/api'; import { getDefaultCurrentScope, getDefaultIsolationScope, setAsyncContextStrategy } from '@sentry/core'; import type { withActiveSpan as defaultWithActiveSpan } from '@sentry/core'; -import type { Scope } from '@sentry/types'; +import type { Scope } from '@sentry/core'; import { SENTRY_FORK_ISOLATION_SCOPE_CONTEXT_KEY, diff --git a/packages/opentelemetry/src/contextManager.ts b/packages/opentelemetry/src/contextManager.ts index 27ef6e5d5cda..95154c929319 100644 --- a/packages/opentelemetry/src/contextManager.ts +++ b/packages/opentelemetry/src/contextManager.ts @@ -1,6 +1,6 @@ import type { Context, ContextManager } from '@opentelemetry/api'; import { getCurrentScope, getIsolationScope } from '@sentry/core'; -import type { Scope } from '@sentry/types'; +import type { Scope } from '@sentry/core'; import { SENTRY_FORK_ISOLATION_SCOPE_CONTEXT_KEY, diff --git a/packages/opentelemetry/src/custom/client.ts b/packages/opentelemetry/src/custom/client.ts index b10659bd488a..223c22086848 100644 --- a/packages/opentelemetry/src/custom/client.ts +++ b/packages/opentelemetry/src/custom/client.ts @@ -3,7 +3,7 @@ import { trace } from '@opentelemetry/api'; import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base'; import type { BaseClient } from '@sentry/core'; import { SDK_VERSION } from '@sentry/core'; -import type { Client } from '@sentry/types'; +import type { Client } from '@sentry/core'; import type { OpenTelemetryClient as OpenTelemetryClientInterface } from '../types'; diff --git a/packages/opentelemetry/src/propagator.ts b/packages/opentelemetry/src/propagator.ts index 7fbd3f193600..541e749e3492 100644 --- a/packages/opentelemetry/src/propagator.ts +++ b/packages/opentelemetry/src/propagator.ts @@ -19,7 +19,7 @@ import { propagationContextFromHeaders, stringMatchesSomePattern, } from '@sentry/core'; -import type { DynamicSamplingContext, Options, PropagationContext } from '@sentry/types'; +import type { DynamicSamplingContext, Options, PropagationContext } from '@sentry/core'; import { SENTRY_BAGGAGE_HEADER, diff --git a/packages/opentelemetry/src/sampler.ts b/packages/opentelemetry/src/sampler.ts index b5cfc2ee5514..085fe3403315 100644 --- a/packages/opentelemetry/src/sampler.ts +++ b/packages/opentelemetry/src/sampler.ts @@ -11,7 +11,7 @@ import { sampleSpan, } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { Client, SpanAttributes } from '@sentry/types'; +import type { Client, SpanAttributes } from '@sentry/core'; import { SENTRY_TRACE_STATE_SAMPLED_NOT_RECORDING, SENTRY_TRACE_STATE_URL } from './constants'; import { diff --git a/packages/opentelemetry/src/setupEventContextTrace.ts b/packages/opentelemetry/src/setupEventContextTrace.ts index 051b1cba1364..b0c763c05960 100644 --- a/packages/opentelemetry/src/setupEventContextTrace.ts +++ b/packages/opentelemetry/src/setupEventContextTrace.ts @@ -1,6 +1,6 @@ import { getDynamicSamplingContextFromSpan, getRootSpan } from '@sentry/core'; import { dropUndefinedKeys } from '@sentry/core'; -import type { Client } from '@sentry/types'; +import type { Client } from '@sentry/core'; import { SENTRY_TRACE_STATE_PARENT_SPAN_ID } from './constants'; import { getActiveSpan } from './utils/getActiveSpan'; import { spanHasParentId } from './utils/spanTypes'; diff --git a/packages/opentelemetry/src/spanExporter.ts b/packages/opentelemetry/src/spanExporter.ts index 91a8390100df..74e43de788e0 100644 --- a/packages/opentelemetry/src/spanExporter.ts +++ b/packages/opentelemetry/src/spanExporter.ts @@ -18,7 +18,7 @@ import { spanTimeInputToSeconds, } from '@sentry/core'; import { dropUndefinedKeys, logger } from '@sentry/core'; -import type { SpanJSON, SpanOrigin, TraceContext, TransactionEvent, TransactionSource } from '@sentry/types'; +import type { SpanJSON, SpanOrigin, TraceContext, TransactionEvent, TransactionSource } from '@sentry/core'; import { SENTRY_TRACE_STATE_PARENT_SPAN_ID } from './constants'; import { DEBUG_BUILD } from './debug-build'; diff --git a/packages/opentelemetry/src/trace.ts b/packages/opentelemetry/src/trace.ts index c2ebaea78636..5bd80986a277 100644 --- a/packages/opentelemetry/src/trace.ts +++ b/packages/opentelemetry/src/trace.ts @@ -15,7 +15,7 @@ import { spanToJSON, spanToTraceContext, } from '@sentry/core'; -import type { Client, DynamicSamplingContext, Scope, Span as SentrySpan, TraceContext } from '@sentry/types'; +import type { Client, DynamicSamplingContext, Scope, Span as SentrySpan, TraceContext } from '@sentry/core'; import { continueTraceAsRemoteSpan } from './propagator'; import type { OpenTelemetryClient, OpenTelemetrySpanContext } from './types'; diff --git a/packages/opentelemetry/src/types.ts b/packages/opentelemetry/src/types.ts index 341fbea88d38..807e9b1d857f 100644 --- a/packages/opentelemetry/src/types.ts +++ b/packages/opentelemetry/src/types.ts @@ -1,6 +1,6 @@ import type { Span as WriteableSpan, SpanKind, Tracer } from '@opentelemetry/api'; import type { BasicTracerProvider, ReadableSpan } from '@opentelemetry/sdk-trace-base'; -import type { Scope, Span, StartSpanOptions } from '@sentry/types'; +import type { Scope, Span, StartSpanOptions } from '@sentry/core'; export interface OpenTelemetryClient { tracer: Tracer; diff --git a/packages/opentelemetry/src/utils/addOriginToSpan.ts b/packages/opentelemetry/src/utils/addOriginToSpan.ts index 9d2acfcd83b2..22ed30ed37e0 100644 --- a/packages/opentelemetry/src/utils/addOriginToSpan.ts +++ b/packages/opentelemetry/src/utils/addOriginToSpan.ts @@ -1,6 +1,6 @@ import type { Span } from '@opentelemetry/api'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core'; -import type { SpanOrigin } from '@sentry/types'; +import type { SpanOrigin } from '@sentry/core'; /** Adds an origin to an OTEL Span. */ export function addOriginToSpan(span: Span, origin: SpanOrigin): void { diff --git a/packages/opentelemetry/src/utils/contextData.ts b/packages/opentelemetry/src/utils/contextData.ts index e91b91ffe223..f7464793dbbe 100644 --- a/packages/opentelemetry/src/utils/contextData.ts +++ b/packages/opentelemetry/src/utils/contextData.ts @@ -1,6 +1,6 @@ import type { Context } from '@opentelemetry/api'; import { addNonEnumerableProperty } from '@sentry/core'; -import type { Scope } from '@sentry/types'; +import type { Scope } from '@sentry/core'; import { SENTRY_SCOPES_CONTEXT_KEY } from '../constants'; import type { CurrentScopes } from '../types'; diff --git a/packages/opentelemetry/src/utils/enhanceDscWithOpenTelemetryRootSpanName.ts b/packages/opentelemetry/src/utils/enhanceDscWithOpenTelemetryRootSpanName.ts index af086451ac1b..307f25364c5e 100644 --- a/packages/opentelemetry/src/utils/enhanceDscWithOpenTelemetryRootSpanName.ts +++ b/packages/opentelemetry/src/utils/enhanceDscWithOpenTelemetryRootSpanName.ts @@ -1,5 +1,5 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, spanToJSON } from '@sentry/core'; -import type { Client } from '@sentry/types'; +import type { Client } from '@sentry/core'; import { parseSpanDescription } from './parseSpanDescription'; import { spanHasName } from './spanTypes'; diff --git a/packages/opentelemetry/src/utils/generateSpanContextForPropagationContext.ts b/packages/opentelemetry/src/utils/generateSpanContextForPropagationContext.ts index 7c1d94daa7d8..8af3c711d9d6 100644 --- a/packages/opentelemetry/src/utils/generateSpanContextForPropagationContext.ts +++ b/packages/opentelemetry/src/utils/generateSpanContextForPropagationContext.ts @@ -1,6 +1,6 @@ import type { SpanContext } from '@opentelemetry/api'; import { TraceFlags } from '@opentelemetry/api'; -import type { PropagationContext } from '@sentry/types'; +import type { PropagationContext } from '@sentry/core'; import { makeTraceState } from './makeTraceState'; /** diff --git a/packages/opentelemetry/src/utils/getRequestSpanData.ts b/packages/opentelemetry/src/utils/getRequestSpanData.ts index 1ba4e374fc6c..cc27aadf7a78 100644 --- a/packages/opentelemetry/src/utils/getRequestSpanData.ts +++ b/packages/opentelemetry/src/utils/getRequestSpanData.ts @@ -7,7 +7,7 @@ import { SEMATTRS_HTTP_URL, } from '@opentelemetry/semantic-conventions'; import { getSanitizedUrlString, parseUrl } from '@sentry/core'; -import type { SanitizedRequestData } from '@sentry/types'; +import type { SanitizedRequestData } from '@sentry/core'; import { spanHasAttributes } from './spanTypes'; diff --git a/packages/opentelemetry/src/utils/getTraceData.ts b/packages/opentelemetry/src/utils/getTraceData.ts index c79fc2a6e957..1134a9e70f34 100644 --- a/packages/opentelemetry/src/utils/getTraceData.ts +++ b/packages/opentelemetry/src/utils/getTraceData.ts @@ -4,7 +4,7 @@ import { generateSentryTraceHeader, getCapturedScopesOnSpan, } from '@sentry/core'; -import type { SerializedTraceData, Span } from '@sentry/types'; +import type { SerializedTraceData, Span } from '@sentry/core'; import { getInjectionData } from '../propagator'; import { getContextFromScope } from './contextData'; diff --git a/packages/opentelemetry/src/utils/makeTraceState.ts b/packages/opentelemetry/src/utils/makeTraceState.ts index e292274cade0..6175ffd982c1 100644 --- a/packages/opentelemetry/src/utils/makeTraceState.ts +++ b/packages/opentelemetry/src/utils/makeTraceState.ts @@ -1,6 +1,6 @@ import { TraceState } from '@opentelemetry/core'; import { dynamicSamplingContextToSentryBaggageHeader } from '@sentry/core'; -import type { DynamicSamplingContext } from '@sentry/types'; +import type { DynamicSamplingContext } from '@sentry/core'; import { SENTRY_TRACE_STATE_DSC, SENTRY_TRACE_STATE_PARENT_SPAN_ID, diff --git a/packages/opentelemetry/src/utils/mapStatus.ts b/packages/opentelemetry/src/utils/mapStatus.ts index a3db71a60c00..e3a9b375be6b 100644 --- a/packages/opentelemetry/src/utils/mapStatus.ts +++ b/packages/opentelemetry/src/utils/mapStatus.ts @@ -5,7 +5,7 @@ import { SEMATTRS_RPC_GRPC_STATUS_CODE, } from '@opentelemetry/semantic-conventions'; import { SPAN_STATUS_ERROR, SPAN_STATUS_OK, getSpanStatusFromHttpCode } from '@sentry/core'; -import type { SpanAttributes, SpanStatus } from '@sentry/types'; +import type { SpanAttributes, SpanStatus } from '@sentry/core'; import type { AbstractSpan } from '../types'; import { spanHasAttributes, spanHasStatus } from './spanTypes'; diff --git a/packages/opentelemetry/src/utils/parseSpanDescription.ts b/packages/opentelemetry/src/utils/parseSpanDescription.ts index aff1fc5e2d69..746261a6b9f6 100644 --- a/packages/opentelemetry/src/utils/parseSpanDescription.ts +++ b/packages/opentelemetry/src/utils/parseSpanDescription.ts @@ -14,7 +14,7 @@ import { SEMATTRS_RPC_SERVICE, } from '@opentelemetry/semantic-conventions'; import { getSanitizedUrlString, parseUrl, stripUrlQueryAndFragment } from '@sentry/core'; -import type { SpanAttributes, TransactionSource } from '@sentry/types'; +import type { SpanAttributes, TransactionSource } from '@sentry/core'; import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core'; import { SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION } from '../semanticAttributes'; diff --git a/packages/opentelemetry/test/asyncContextStrategy.test.ts b/packages/opentelemetry/test/asyncContextStrategy.test.ts index 915d33671e68..d0c4c137c236 100644 --- a/packages/opentelemetry/test/asyncContextStrategy.test.ts +++ b/packages/opentelemetry/test/asyncContextStrategy.test.ts @@ -8,7 +8,7 @@ import { withScope, } from '@sentry/core'; -import type { Scope } from '@sentry/types'; +import type { Scope } from '@sentry/core'; import { setOpenTelemetryContextAsyncContextStrategy } from '../src/asyncContextStrategy'; import { TestClient, getDefaultTestClientOptions } from './helpers/TestClient'; import { setupOtel } from './helpers/initOtel'; diff --git a/packages/opentelemetry/test/helpers/TestClient.ts b/packages/opentelemetry/test/helpers/TestClient.ts index 18a169c0a817..54d4ec488cef 100644 --- a/packages/opentelemetry/test/helpers/TestClient.ts +++ b/packages/opentelemetry/test/helpers/TestClient.ts @@ -1,6 +1,6 @@ import { BaseClient, createTransport, getCurrentScope } from '@sentry/core'; import { resolvedSyncPromise } from '@sentry/core'; -import type { Client, ClientOptions, Event, Options, SeverityLevel } from '@sentry/types'; +import type { Client, ClientOptions, Event, Options, SeverityLevel } from '@sentry/core'; import { wrapClientClass } from '../../src/custom/client'; import type { OpenTelemetryClient } from '../../src/types'; diff --git a/packages/opentelemetry/test/helpers/mockSdkInit.ts b/packages/opentelemetry/test/helpers/mockSdkInit.ts index 6a3d9b171833..869d4c82446f 100644 --- a/packages/opentelemetry/test/helpers/mockSdkInit.ts +++ b/packages/opentelemetry/test/helpers/mockSdkInit.ts @@ -1,6 +1,6 @@ import { ProxyTracerProvider, context, propagation, trace } from '@opentelemetry/api'; import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base'; -import type { ClientOptions, Options } from '@sentry/types'; +import type { ClientOptions, Options } from '@sentry/core'; import { getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core'; import { setOpenTelemetryContextAsyncContextStrategy } from '../../src/asyncContextStrategy'; diff --git a/packages/opentelemetry/test/integration/transactions.test.ts b/packages/opentelemetry/test/integration/transactions.test.ts index 8dacab4412c0..a579b55779d1 100644 --- a/packages/opentelemetry/test/integration/transactions.test.ts +++ b/packages/opentelemetry/test/integration/transactions.test.ts @@ -12,7 +12,7 @@ import { withIsolationScope, } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { Event, TransactionEvent } from '@sentry/types'; +import type { Event, TransactionEvent } from '@sentry/core'; import { TraceState } from '@opentelemetry/core'; import { SENTRY_TRACE_STATE_DSC } from '../../src/constants'; diff --git a/packages/opentelemetry/test/trace.test.ts b/packages/opentelemetry/test/trace.test.ts index 0a709c9fb5da..18bb93e449b1 100644 --- a/packages/opentelemetry/test/trace.test.ts +++ b/packages/opentelemetry/test/trace.test.ts @@ -20,7 +20,7 @@ import { suppressTracing, withScope, } from '@sentry/core'; -import type { Event, Scope } from '@sentry/types'; +import type { Event, Scope } from '@sentry/core'; import { SEMATTRS_HTTP_METHOD } from '@opentelemetry/semantic-conventions'; import { continueTrace, startInactiveSpan, startSpan, startSpanManual } from '../src/trace'; diff --git a/packages/opentelemetry/test/utils/mapStatus.test.ts b/packages/opentelemetry/test/utils/mapStatus.test.ts index d4e831d5ded1..79ffdf057b5a 100644 --- a/packages/opentelemetry/test/utils/mapStatus.test.ts +++ b/packages/opentelemetry/test/utils/mapStatus.test.ts @@ -1,7 +1,7 @@ /* eslint-disable deprecation/deprecation */ import { SEMATTRS_HTTP_STATUS_CODE, SEMATTRS_RPC_GRPC_STATUS_CODE } from '@opentelemetry/semantic-conventions'; import { SPAN_STATUS_ERROR, SPAN_STATUS_OK } from '@sentry/core'; -import type { SpanStatus } from '@sentry/types'; +import type { SpanStatus } from '@sentry/core'; import { mapStatus } from '../../src/utils/mapStatus'; import { createSpan } from '../helpers/createSpan'; diff --git a/packages/profiling-node/package.json b/packages/profiling-node/package.json index 3f2e630fc304..405aff86ccc4 100644 --- a/packages/profiling-node/package.json +++ b/packages/profiling-node/package.json @@ -77,7 +77,6 @@ "dependencies": { "@sentry/core": "8.40.0", "@sentry/node": "8.40.0", - "@sentry/types": "8.40.0", "detect-libc": "^2.0.2", "node-abi": "^3.61.0" }, diff --git a/packages/profiling-node/src/integration.ts b/packages/profiling-node/src/integration.ts index 65bab5084d3e..bdba65607e5d 100644 --- a/packages/profiling-node/src/integration.ts +++ b/packages/profiling-node/src/integration.ts @@ -8,8 +8,8 @@ import { getRootSpan, spanToJSON, } from '@sentry/core'; +import type { Event, IntegrationFn, Profile, ProfileChunk, ProfilingIntegration, Span } from '@sentry/core'; import type { NodeClient } from '@sentry/node'; -import type { Event, IntegrationFn, Profile, ProfileChunk, ProfilingIntegration, Span } from '@sentry/types'; import { LRUMap, consoleSandbox, logger, uuid4 } from '@sentry/core'; diff --git a/packages/profiling-node/src/spanProfileUtils.ts b/packages/profiling-node/src/spanProfileUtils.ts index 75c78b6dfc6b..3ab04f2a5f1b 100644 --- a/packages/profiling-node/src/spanProfileUtils.ts +++ b/packages/profiling-node/src/spanProfileUtils.ts @@ -1,7 +1,7 @@ import { spanIsSampled, spanToJSON } from '@sentry/core'; import { logger, uuid4 } from '@sentry/core'; +import type { CustomSamplingContext, Span } from '@sentry/core'; import type { NodeClient } from '@sentry/node'; -import type { CustomSamplingContext, Span } from '@sentry/types'; import { CpuProfilerBindings } from './cpu_profiler'; import { DEBUG_BUILD } from './debug-build'; diff --git a/packages/profiling-node/src/types.ts b/packages/profiling-node/src/types.ts index 1c2c444887cd..2423ca94651b 100644 --- a/packages/profiling-node/src/types.ts +++ b/packages/profiling-node/src/types.ts @@ -1,4 +1,4 @@ -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; interface Sample { stack_id: number; diff --git a/packages/profiling-node/src/utils.ts b/packages/profiling-node/src/utils.ts index c6051a90978f..cb06658ba2d2 100644 --- a/packages/profiling-node/src/utils.ts +++ b/packages/profiling-node/src/utils.ts @@ -23,7 +23,7 @@ import type { ProfileChunkItem, SdkInfo, ThreadCpuProfile, -} from '@sentry/types'; +} from '@sentry/core'; import { env, versions } from 'process'; import { isMainThread, threadId } from 'worker_threads'; diff --git a/packages/profiling-node/test/cpu_profiler.test.ts b/packages/profiling-node/test/cpu_profiler.test.ts index b370ae7f96c9..4db0b98891a3 100644 --- a/packages/profiling-node/test/cpu_profiler.test.ts +++ b/packages/profiling-node/test/cpu_profiler.test.ts @@ -1,4 +1,4 @@ -import type { ContinuousThreadCpuProfile, ThreadCpuProfile } from '@sentry/types'; +import type { ContinuousThreadCpuProfile, ThreadCpuProfile } from '@sentry/core'; import { CpuProfilerBindings, PrivateCpuProfilerBindings } from '../src/cpu_profiler'; import type { RawThreadCpuProfile } from '../src/types'; diff --git a/packages/profiling-node/test/integration.test.ts b/packages/profiling-node/test/integration.test.ts index 92d1018e18d4..39788b00bc56 100644 --- a/packages/profiling-node/test/integration.test.ts +++ b/packages/profiling-node/test/integration.test.ts @@ -1,6 +1,6 @@ import { EventEmitter } from 'events'; -import type { Transport } from '@sentry/types'; +import type { Transport } from '@sentry/core'; import type { NodeClient } from '@sentry/node'; import { _nodeProfilingIntegration } from '../src/integration'; diff --git a/packages/profiling-node/test/spanProfileUtils.test.ts b/packages/profiling-node/test/spanProfileUtils.test.ts index e679001994da..9974eb6ebc64 100644 --- a/packages/profiling-node/test/spanProfileUtils.test.ts +++ b/packages/profiling-node/test/spanProfileUtils.test.ts @@ -2,9 +2,9 @@ import * as Sentry from '@sentry/node'; import { getMainCarrier } from '@sentry/core'; import { GLOBAL_OBJ, createEnvelope, logger } from '@sentry/core'; +import type { ProfilingIntegration } from '@sentry/core'; +import type { ProfileChunk, Transport } from '@sentry/core'; import type { NodeClientOptions } from '@sentry/node/build/types/types'; -import type { ProfilingIntegration } from '@sentry/types'; -import type { ProfileChunk, Transport } from '@sentry/types'; import { CpuProfilerBindings } from '../src/cpu_profiler'; import { _nodeProfilingIntegration } from '../src/integration'; diff --git a/packages/profiling-node/test/spanProfileUtils.worker.test.ts b/packages/profiling-node/test/spanProfileUtils.worker.test.ts index 12727aebc954..e2db2ecb7706 100644 --- a/packages/profiling-node/test/spanProfileUtils.worker.test.ts +++ b/packages/profiling-node/test/spanProfileUtils.worker.test.ts @@ -7,9 +7,9 @@ jest.mock('worker_threads', () => { }); jest.setTimeout(10000); +import type { Transport } from '@sentry/core'; +import { type ProfilingIntegration } from '@sentry/core'; import * as Sentry from '@sentry/node'; -import type { Transport } from '@sentry/types'; -import { type ProfilingIntegration } from '@sentry/types'; import { _nodeProfilingIntegration } from '../src/integration'; function makeContinuousProfilingClient(): [Sentry.NodeClient, Transport] { diff --git a/packages/profiling-node/test/utils.test.ts b/packages/profiling-node/test/utils.test.ts index 9d834f1dc9b3..dac0bf16be79 100644 --- a/packages/profiling-node/test/utils.test.ts +++ b/packages/profiling-node/test/utils.test.ts @@ -1,5 +1,5 @@ import { addItemToEnvelope, createEnvelope, uuid4 } from '@sentry/core'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { addProfilesToEnvelope, diff --git a/packages/react/package.json b/packages/react/package.json index 13f7242e3a54..9561315f97e7 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -41,7 +41,6 @@ "dependencies": { "@sentry/browser": "8.40.0", "@sentry/core": "8.40.0", - "@sentry/types": "8.40.0", "hoist-non-react-statics": "^3.3.2" }, "peerDependencies": { diff --git a/packages/react/src/error.ts b/packages/react/src/error.ts index 09121c3c85c2..a3bec777245a 100644 --- a/packages/react/src/error.ts +++ b/packages/react/src/error.ts @@ -1,6 +1,6 @@ import { captureException } from '@sentry/browser'; import { isError } from '@sentry/core'; -import type { EventHint } from '@sentry/types'; +import type { EventHint } from '@sentry/core'; import { version } from 'react'; import type { ErrorInfo } from 'react'; diff --git a/packages/react/src/errorboundary.tsx b/packages/react/src/errorboundary.tsx index 84b2ac464e9d..91cc0e2cdc17 100644 --- a/packages/react/src/errorboundary.tsx +++ b/packages/react/src/errorboundary.tsx @@ -1,7 +1,7 @@ import type { ReportDialogOptions } from '@sentry/browser'; import { getClient, showReportDialog, withScope } from '@sentry/browser'; import { logger } from '@sentry/core'; -import type { Scope } from '@sentry/types'; +import type { Scope } from '@sentry/core'; import hoistNonReactStatics from 'hoist-non-react-statics'; import * as React from 'react'; diff --git a/packages/react/src/profiler.tsx b/packages/react/src/profiler.tsx index 26585d83ae64..ebcdf2237450 100644 --- a/packages/react/src/profiler.tsx +++ b/packages/react/src/profiler.tsx @@ -1,7 +1,7 @@ import { startInactiveSpan } from '@sentry/browser'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, spanToJSON, withActiveSpan } from '@sentry/core'; import { timestampInSeconds } from '@sentry/core'; -import type { Span } from '@sentry/types'; +import type { Span } from '@sentry/core'; import hoistNonReactStatics from 'hoist-non-react-statics'; import * as React from 'react'; diff --git a/packages/react/src/reactrouter.tsx b/packages/react/src/reactrouter.tsx index 1b9102273e9c..eb72949c23b9 100644 --- a/packages/react/src/reactrouter.tsx +++ b/packages/react/src/reactrouter.tsx @@ -13,7 +13,7 @@ import { getRootSpan, spanToJSON, } from '@sentry/core'; -import type { Client, Integration, Span, TransactionSource } from '@sentry/types'; +import type { Client, Integration, Span, TransactionSource } from '@sentry/core'; import hoistNonReactStatics from 'hoist-non-react-statics'; import * as React from 'react'; import type { ReactElement } from 'react'; diff --git a/packages/react/src/reactrouterv3.ts b/packages/react/src/reactrouterv3.ts index df495de3e711..75868340d56e 100644 --- a/packages/react/src/reactrouterv3.ts +++ b/packages/react/src/reactrouterv3.ts @@ -9,7 +9,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, } from '@sentry/core'; -import type { Integration, TransactionSource } from '@sentry/types'; +import type { Integration, TransactionSource } from '@sentry/core'; import type { Location } from './types'; diff --git a/packages/react/src/reactrouterv6.tsx b/packages/react/src/reactrouterv6.tsx index 341470b0002a..1ff2431586a5 100644 --- a/packages/react/src/reactrouterv6.tsx +++ b/packages/react/src/reactrouterv6.tsx @@ -19,7 +19,7 @@ import { spanToJSON, } from '@sentry/core'; import { getNumberOfUrlSegments, logger } from '@sentry/core'; -import type { Client, Integration, Span, TransactionSource } from '@sentry/types'; +import type { Client, Integration, Span, TransactionSource } from '@sentry/core'; import hoistNonReactStatics from 'hoist-non-react-statics'; import * as React from 'react'; diff --git a/packages/react/src/redux.ts b/packages/react/src/redux.ts index c3dea1b517c7..bd69897b14ad 100644 --- a/packages/react/src/redux.ts +++ b/packages/react/src/redux.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { addBreadcrumb, getClient, getCurrentScope, getGlobalScope } from '@sentry/core'; import { addNonEnumerableProperty } from '@sentry/core'; -import type { Scope } from '@sentry/types'; +import type { Scope } from '@sentry/core'; interface Action { type: T; diff --git a/packages/react/src/sdk.ts b/packages/react/src/sdk.ts index 952b1d3c3927..da63e6d9aa08 100644 --- a/packages/react/src/sdk.ts +++ b/packages/react/src/sdk.ts @@ -1,7 +1,7 @@ import type { BrowserOptions } from '@sentry/browser'; import { init as browserInit, setContext } from '@sentry/browser'; import { applySdkMetadata } from '@sentry/core'; -import type { Client } from '@sentry/types'; +import type { Client } from '@sentry/core'; import { version } from 'react'; diff --git a/packages/react/src/tanstackrouter.ts b/packages/react/src/tanstackrouter.ts index 2efefba49e31..2ddc3c9fa280 100644 --- a/packages/react/src/tanstackrouter.ts +++ b/packages/react/src/tanstackrouter.ts @@ -6,7 +6,7 @@ import { } from '@sentry/core'; import { browserTracingIntegration as originalBrowserTracingIntegration } from '@sentry/browser'; -import type { Integration } from '@sentry/types'; +import type { Integration } from '@sentry/core'; import type { VendoredTanstackRouter, VendoredTanstackRouterRouteMatch } from './vendor/tanstackrouter-types'; /** diff --git a/packages/react/test/errorboundary.test.tsx b/packages/react/test/errorboundary.test.tsx index b4d907ef0873..e0a7328995e0 100644 --- a/packages/react/test/errorboundary.test.tsx +++ b/packages/react/test/errorboundary.test.tsx @@ -1,5 +1,5 @@ import { Scope, getClient, setCurrentClient } from '@sentry/browser'; -import type { Client } from '@sentry/types'; +import type { Client } from '@sentry/core'; import { fireEvent, render, screen } from '@testing-library/react'; import * as React from 'react'; import { useState } from 'react'; diff --git a/packages/react/test/profiler.test.tsx b/packages/react/test/profiler.test.tsx index 07f34d526915..a04abd7b9f71 100644 --- a/packages/react/test/profiler.test.tsx +++ b/packages/react/test/profiler.test.tsx @@ -1,5 +1,5 @@ import { SentrySpan } from '@sentry/core'; -import type { StartSpanOptions } from '@sentry/types'; +import type { StartSpanOptions } from '@sentry/core'; import { render } from '@testing-library/react'; import { renderHook } from '@testing-library/react-hooks'; // biome-ignore lint/nursery/noUnusedImports: Need React import for JSX diff --git a/packages/remix/package.json b/packages/remix/package.json index 5b5be3dfc911..c18a32fa36e9 100644 --- a/packages/remix/package.json +++ b/packages/remix/package.json @@ -58,7 +58,6 @@ "@sentry/node": "8.40.0", "@sentry/opentelemetry": "8.40.0", "@sentry/react": "8.40.0", - "@sentry/types": "8.40.0", "glob": "^10.3.4", "opentelemetry-instrumentation-remix": "0.7.1", "yargs": "^17.6.0" diff --git a/packages/remix/src/client/browserTracingIntegration.ts b/packages/remix/src/client/browserTracingIntegration.ts index ce7387904e57..a52b3ac7e30b 100644 --- a/packages/remix/src/client/browserTracingIntegration.ts +++ b/packages/remix/src/client/browserTracingIntegration.ts @@ -1,5 +1,5 @@ +import type { Integration } from '@sentry/core'; import { browserTracingIntegration as originalBrowserTracingIntegration } from '@sentry/react'; -import type { Integration } from '@sentry/types'; import { setGlobals, startPageloadSpan } from './performance'; import type { RemixBrowserTracingIntegrationOptions } from './performance'; /** diff --git a/packages/remix/src/client/performance.tsx b/packages/remix/src/client/performance.tsx index 83028abc3862..c2b7cfc329f2 100644 --- a/packages/remix/src/client/performance.tsx +++ b/packages/remix/src/client/performance.tsx @@ -6,6 +6,7 @@ import { getRootSpan, } from '@sentry/core'; import { isNodeEnv, logger } from '@sentry/core'; +import type { Client, StartSpanOptions } from '@sentry/core'; import type { browserTracingIntegration as originalBrowserTracingIntegration } from '@sentry/react'; import type { BrowserClient, ErrorBoundaryProps } from '@sentry/react'; import { @@ -15,7 +16,6 @@ import { startBrowserTracingPageLoadSpan, withErrorBoundary, } from '@sentry/react'; -import type { Client, StartSpanOptions } from '@sentry/types'; import * as React from 'react'; import { DEBUG_BUILD } from '../utils/debug-build'; diff --git a/packages/remix/src/index.client.tsx b/packages/remix/src/index.client.tsx index f75581f14a68..691365069c0c 100644 --- a/packages/remix/src/index.client.tsx +++ b/packages/remix/src/index.client.tsx @@ -1,7 +1,7 @@ import { applySdkMetadata } from '@sentry/core'; import { logger } from '@sentry/core'; +import type { Client } from '@sentry/core'; import { init as reactInit } from '@sentry/react'; -import type { Client } from '@sentry/types'; import { DEBUG_BUILD } from './utils/debug-build'; import type { RemixOptions } from './utils/remixOptions'; export { captureRemixErrorBoundaryError } from './client/errors'; diff --git a/packages/remix/src/index.server.ts b/packages/remix/src/index.server.ts index 2e7dd3708806..79873dd89d67 100644 --- a/packages/remix/src/index.server.ts +++ b/packages/remix/src/index.server.ts @@ -1,8 +1,8 @@ import { applySdkMetadata } from '@sentry/core'; import { logger } from '@sentry/core'; +import type { Integration } from '@sentry/core'; import type { NodeClient, NodeOptions } from '@sentry/node'; import { getDefaultIntegrations as getDefaultNodeIntegrations, init as nodeInit, isInitialized } from '@sentry/node'; -import type { Integration } from '@sentry/types'; import { DEBUG_BUILD } from './utils/debug-build'; import { instrumentServer } from './utils/instrumentServer'; diff --git a/packages/remix/src/index.types.ts b/packages/remix/src/index.types.ts index 46052b99473d..cfba5f67e781 100644 --- a/packages/remix/src/index.types.ts +++ b/packages/remix/src/index.types.ts @@ -3,7 +3,7 @@ export * from './index.client'; export * from './index.server'; -import type { Client, Integration, Options, StackParser } from '@sentry/types'; +import type { Client, Integration, Options, StackParser } from '@sentry/core'; import * as clientSdk from './index.client'; import * as serverSdk from './index.server'; diff --git a/packages/remix/src/utils/errors.ts b/packages/remix/src/utils/errors.ts index d2e040bcd05c..94c1c8755ad4 100644 --- a/packages/remix/src/utils/errors.ts +++ b/packages/remix/src/utils/errors.ts @@ -9,7 +9,7 @@ import { objectify, winterCGRequestToRequestData, } from '@sentry/core'; -import type { RequestEventData, Span } from '@sentry/types'; +import type { RequestEventData, Span } from '@sentry/core'; import { DEBUG_BUILD } from './debug-build'; import type { RemixOptions } from './remixOptions'; import { storeFormDataKeys } from './utils'; diff --git a/packages/remix/src/utils/instrumentServer.ts b/packages/remix/src/utils/instrumentServer.ts index fbd874a12df9..461aea9361f2 100644 --- a/packages/remix/src/utils/instrumentServer.ts +++ b/packages/remix/src/utils/instrumentServer.ts @@ -15,9 +15,9 @@ import { withIsolationScope, } from '@sentry/core'; import { fill, isNodeEnv, loadModule, logger } from '@sentry/core'; +import type { RequestEventData, TransactionSource, WrappedFunction } from '@sentry/core'; +import type { Span } from '@sentry/core'; import { continueTrace } from '@sentry/opentelemetry'; -import type { RequestEventData, TransactionSource, WrappedFunction } from '@sentry/types'; -import type { Span } from '@sentry/types'; import { DEBUG_BUILD } from './debug-build'; import { captureRemixServerException, errorHandleDataFunction, errorHandleDocumentRequestFunction } from './errors'; diff --git a/packages/remix/src/utils/integrations/http.ts b/packages/remix/src/utils/integrations/http.ts index be519a36806a..9d35cb4547df 100644 --- a/packages/remix/src/utils/integrations/http.ts +++ b/packages/remix/src/utils/integrations/http.ts @@ -1,5 +1,5 @@ +import type { IntegrationFn } from '@sentry/core'; import { httpIntegration as originalHttpIntegration } from '@sentry/node'; -import type { IntegrationFn } from '@sentry/types'; type HttpOptions = Parameters[0]; diff --git a/packages/remix/src/utils/integrations/opentelemetry.ts b/packages/remix/src/utils/integrations/opentelemetry.ts index fa1d8fd1b749..cfc952e9dd23 100644 --- a/packages/remix/src/utils/integrations/opentelemetry.ts +++ b/packages/remix/src/utils/integrations/opentelemetry.ts @@ -1,8 +1,8 @@ import { RemixInstrumentation } from 'opentelemetry-instrumentation-remix'; import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration } from '@sentry/core'; +import type { Client, IntegrationFn, Span } from '@sentry/core'; import { generateInstrumentOnce, getClient, spanToJSON } from '@sentry/node'; -import type { Client, IntegrationFn, Span } from '@sentry/types'; import type { RemixOptions } from '../remixOptions'; const INTEGRATION_NAME = 'Remix'; diff --git a/packages/remix/src/utils/remixOptions.ts b/packages/remix/src/utils/remixOptions.ts index 4f73eca92ff3..d8480f4e5019 100644 --- a/packages/remix/src/utils/remixOptions.ts +++ b/packages/remix/src/utils/remixOptions.ts @@ -1,6 +1,6 @@ +import type { Options } from '@sentry/core'; import type { NodeOptions } from '@sentry/node'; import type { BrowserOptions } from '@sentry/react'; -import type { Options } from '@sentry/types'; export type RemixOptions = (Options | BrowserOptions | NodeOptions) & { captureActionFormDataKeys?: Record; diff --git a/packages/remix/src/utils/utils.ts b/packages/remix/src/utils/utils.ts index 5d1024dbc057..221ae4cf8e6c 100644 --- a/packages/remix/src/utils/utils.ts +++ b/packages/remix/src/utils/utils.ts @@ -1,6 +1,6 @@ import type { DataFunctionArgs } from '@remix-run/node'; import { logger } from '@sentry/core'; -import type { Span, TransactionSource } from '@sentry/types'; +import type { Span, TransactionSource } from '@sentry/core'; import { DEBUG_BUILD } from './debug-build'; import { getRequestMatch, matchServerRoutes } from './vendor/response'; import type { ServerRoute, ServerRouteManifest } from './vendor/types'; diff --git a/packages/remix/test/integration/package.json b/packages/remix/test/integration/package.json index 552c26debdc9..b00f17b330f9 100644 --- a/packages/remix/test/integration/package.json +++ b/packages/remix/test/integration/package.json @@ -32,7 +32,6 @@ "@sentry-internal/replay": "file:../../../replay-internal", "@sentry-internal/replay-canvas": "file:../../../replay-canvas", "@sentry-internal/feedback": "file:../../../feedback", - "@sentry/types": "file:../../../types", "@vanilla-extract/css": "1.13.0", "@vanilla-extract/integration": "6.2.4", "@types/mime": "^3.0.0", diff --git a/packages/remix/test/integration/test/client/capture-exception.test.ts b/packages/remix/test/integration/test/client/capture-exception.test.ts index b7e38abf2f4c..68aaa9e0a018 100644 --- a/packages/remix/test/integration/test/client/capture-exception.test.ts +++ b/packages/remix/test/integration/test/client/capture-exception.test.ts @@ -1,5 +1,5 @@ import { expect, test } from '@playwright/test'; -import { Event } from '@sentry/types'; +import { Event } from '@sentry/core'; import { getMultipleSentryEnvelopeRequests } from './utils/helpers'; test('should report a manually captured error.', async ({ page }) => { diff --git a/packages/remix/test/integration/test/client/capture-message.test.ts b/packages/remix/test/integration/test/client/capture-message.test.ts index 234b6ee3d961..ab1a9083d132 100644 --- a/packages/remix/test/integration/test/client/capture-message.test.ts +++ b/packages/remix/test/integration/test/client/capture-message.test.ts @@ -1,5 +1,5 @@ import { expect, test } from '@playwright/test'; -import { Event } from '@sentry/types'; +import { Event } from '@sentry/core'; import { getMultipleSentryEnvelopeRequests } from './utils/helpers'; test('should report a manually captured message.', async ({ page }) => { diff --git a/packages/remix/test/integration/test/client/click-error.test.ts b/packages/remix/test/integration/test/client/click-error.test.ts index 1e27cdcbdd69..f9e895b3a8f2 100644 --- a/packages/remix/test/integration/test/client/click-error.test.ts +++ b/packages/remix/test/integration/test/client/click-error.test.ts @@ -1,5 +1,5 @@ import { expect, test } from '@playwright/test'; -import { Event } from '@sentry/types'; +import { Event } from '@sentry/core'; import { getMultipleSentryEnvelopeRequests } from './utils/helpers'; const useV2 = process.env.REMIX_VERSION === '2'; diff --git a/packages/remix/test/integration/test/client/errorboundary.test.ts b/packages/remix/test/integration/test/client/errorboundary.test.ts index 8fdfad307179..c679f736ea8e 100644 --- a/packages/remix/test/integration/test/client/errorboundary.test.ts +++ b/packages/remix/test/integration/test/client/errorboundary.test.ts @@ -1,5 +1,5 @@ import { expect, test } from '@playwright/test'; -import { Event } from '@sentry/types'; +import { Event } from '@sentry/core'; import { getMultipleSentryEnvelopeRequests } from './utils/helpers'; const useV2 = process.env.REMIX_VERSION === '2'; diff --git a/packages/remix/test/integration/test/client/manualtracing.test.ts b/packages/remix/test/integration/test/client/manualtracing.test.ts index 4c1b01507617..01ae4cf66521 100644 --- a/packages/remix/test/integration/test/client/manualtracing.test.ts +++ b/packages/remix/test/integration/test/client/manualtracing.test.ts @@ -1,5 +1,5 @@ import { expect, test } from '@playwright/test'; -import { Event } from '@sentry/types'; +import { Event } from '@sentry/core'; import { getMultipleSentryEnvelopeRequests } from './utils/helpers'; const useV2 = process.env.REMIX_VERSION === '2'; diff --git a/packages/remix/test/integration/test/client/meta-tags.test.ts b/packages/remix/test/integration/test/client/meta-tags.test.ts index db919d950a2c..5e54226c65d6 100644 --- a/packages/remix/test/integration/test/client/meta-tags.test.ts +++ b/packages/remix/test/integration/test/client/meta-tags.test.ts @@ -1,5 +1,5 @@ import { expect, test } from '@playwright/test'; -import { Event } from '@sentry/types'; +import { Event } from '@sentry/core'; import { getFirstSentryEnvelopeRequest } from './utils/helpers'; test('should inject `sentry-trace` and `baggage` meta tags inside the root page.', async ({ page }) => { diff --git a/packages/remix/test/integration/test/client/pageload.test.ts b/packages/remix/test/integration/test/client/pageload.test.ts index 0e60986873fc..bf45a512fabe 100644 --- a/packages/remix/test/integration/test/client/pageload.test.ts +++ b/packages/remix/test/integration/test/client/pageload.test.ts @@ -1,7 +1,7 @@ const useV2 = process.env.REMIX_VERSION === '2'; import { expect, test } from '@playwright/test'; -import { Event } from '@sentry/types'; +import { Event } from '@sentry/core'; import { getFirstSentryEnvelopeRequest } from './utils/helpers'; test('should add `pageload` transaction on load.', async ({ page }) => { diff --git a/packages/remix/test/integration/test/server/instrumentation-legacy/loader.test.ts b/packages/remix/test/integration/test/server/instrumentation-legacy/loader.test.ts index d97427d4f67a..bf69b5e7e35b 100644 --- a/packages/remix/test/integration/test/server/instrumentation-legacy/loader.test.ts +++ b/packages/remix/test/integration/test/server/instrumentation-legacy/loader.test.ts @@ -1,4 +1,4 @@ -import { Event } from '@sentry/types'; +import { Event } from '@sentry/core'; import { describe, expect, it } from 'vitest'; import { RemixTestEnv, assertSentryEvent, assertSentryTransaction } from '../utils/helpers'; diff --git a/packages/remix/test/integration/test/server/instrumentation-otel/loader.test.ts b/packages/remix/test/integration/test/server/instrumentation-otel/loader.test.ts index dcf45ed617f1..93235b33d54d 100644 --- a/packages/remix/test/integration/test/server/instrumentation-otel/loader.test.ts +++ b/packages/remix/test/integration/test/server/instrumentation-otel/loader.test.ts @@ -1,4 +1,4 @@ -import { Event } from '@sentry/types'; +import { Event } from '@sentry/core'; import { describe, expect, it } from 'vitest'; import { RemixTestEnv, assertSentryEvent, assertSentryTransaction } from '../utils/helpers'; diff --git a/packages/remix/test/integration/test/server/utils/helpers.ts b/packages/remix/test/integration/test/server/utils/helpers.ts index 61de1975972b..6ab89c7856ac 100644 --- a/packages/remix/test/integration/test/server/utils/helpers.ts +++ b/packages/remix/test/integration/test/server/utils/helpers.ts @@ -3,9 +3,9 @@ import { AddressInfo } from 'net'; import * as path from 'path'; import { createRequestHandler } from '@remix-run/express'; import { logger } from '@sentry/core'; +import type { EnvelopeItemType, Event, TransactionEvent } from '@sentry/core'; /* eslint-disable @typescript-eslint/no-unsafe-member-access */ import * as Sentry from '@sentry/node'; -import type { EnvelopeItemType, Event, TransactionEvent } from '@sentry/types'; import type { AxiosRequestConfig } from 'axios'; import axios from 'axios'; import express from 'express'; diff --git a/packages/replay-canvas/package.json b/packages/replay-canvas/package.json index 3f533c0560ed..f16bb5490b76 100644 --- a/packages/replay-canvas/package.json +++ b/packages/replay-canvas/package.json @@ -69,8 +69,7 @@ }, "dependencies": { "@sentry-internal/replay": "8.40.0", - "@sentry/core": "8.40.0", - "@sentry/types": "8.40.0" + "@sentry/core": "8.40.0" }, "engines": { "node": ">=14.18" diff --git a/packages/replay-canvas/src/canvas.ts b/packages/replay-canvas/src/canvas.ts index e398a545a9ec..6809cdaf815f 100644 --- a/packages/replay-canvas/src/canvas.ts +++ b/packages/replay-canvas/src/canvas.ts @@ -1,7 +1,7 @@ import type { CanvasManagerInterface, CanvasManagerOptions } from '@sentry-internal/replay'; import { CanvasManager } from '@sentry-internal/rrweb'; import { defineIntegration } from '@sentry/core'; -import type { Integration, IntegrationFn } from '@sentry/types'; +import type { Integration, IntegrationFn } from '@sentry/core'; interface ReplayCanvasIntegration extends Integration { snapshot: (canvasElement?: HTMLCanvasElement) => Promise; diff --git a/packages/replay-internal/package.json b/packages/replay-internal/package.json index 23eb1e00aa64..2f661bda0cdb 100644 --- a/packages/replay-internal/package.json +++ b/packages/replay-internal/package.json @@ -77,8 +77,7 @@ }, "dependencies": { "@sentry-internal/browser-utils": "8.40.0", - "@sentry/core": "8.40.0", - "@sentry/types": "8.40.0" + "@sentry/core": "8.40.0" }, "engines": { "node": ">=14.18" diff --git a/packages/replay-internal/src/coreHandlers/handleAfterSendEvent.ts b/packages/replay-internal/src/coreHandlers/handleAfterSendEvent.ts index 956e1fe5c63f..e84c8fb95b62 100644 --- a/packages/replay-internal/src/coreHandlers/handleAfterSendEvent.ts +++ b/packages/replay-internal/src/coreHandlers/handleAfterSendEvent.ts @@ -1,5 +1,5 @@ import { setTimeout } from '@sentry-internal/browser-utils'; -import type { ErrorEvent, Event, TransactionEvent, TransportMakeRequestResponse } from '@sentry/types'; +import type { ErrorEvent, Event, TransactionEvent, TransportMakeRequestResponse } from '@sentry/core'; import type { ReplayContainer } from '../types'; import { isErrorEvent, isTransactionEvent } from '../util/eventUtils'; diff --git a/packages/replay-internal/src/coreHandlers/handleBeforeSendEvent.ts b/packages/replay-internal/src/coreHandlers/handleBeforeSendEvent.ts index a6f2284e7db4..d3491dcb4db7 100644 --- a/packages/replay-internal/src/coreHandlers/handleBeforeSendEvent.ts +++ b/packages/replay-internal/src/coreHandlers/handleBeforeSendEvent.ts @@ -1,5 +1,5 @@ import { getLocationHref } from '@sentry/core'; -import type { ErrorEvent, Event } from '@sentry/types'; +import type { ErrorEvent, Event } from '@sentry/core'; import type { ReplayContainer } from '../types'; import { createBreadcrumb } from '../util/createBreadcrumb'; diff --git a/packages/replay-internal/src/coreHandlers/handleBreadcrumbs.ts b/packages/replay-internal/src/coreHandlers/handleBreadcrumbs.ts index d521d3871a6c..3dd661870c7f 100644 --- a/packages/replay-internal/src/coreHandlers/handleBreadcrumbs.ts +++ b/packages/replay-internal/src/coreHandlers/handleBreadcrumbs.ts @@ -1,6 +1,6 @@ import { getClient } from '@sentry/core'; import { normalize } from '@sentry/core'; -import type { Breadcrumb } from '@sentry/types'; +import type { Breadcrumb } from '@sentry/core'; import { CONSOLE_ARG_MAX_SIZE } from '../constants'; import type { ReplayContainer } from '../types'; diff --git a/packages/replay-internal/src/coreHandlers/handleClick.ts b/packages/replay-internal/src/coreHandlers/handleClick.ts index 6be19626315c..da9f51fa2179 100644 --- a/packages/replay-internal/src/coreHandlers/handleClick.ts +++ b/packages/replay-internal/src/coreHandlers/handleClick.ts @@ -1,6 +1,6 @@ import { setTimeout } from '@sentry-internal/browser-utils'; import { IncrementalSource, MouseInteractions, record } from '@sentry-internal/rrweb'; -import type { Breadcrumb } from '@sentry/types'; +import type { Breadcrumb } from '@sentry/core'; import { WINDOW } from '../constants'; import type { diff --git a/packages/replay-internal/src/coreHandlers/handleDom.ts b/packages/replay-internal/src/coreHandlers/handleDom.ts index 168d9529ccb3..457568172a2c 100644 --- a/packages/replay-internal/src/coreHandlers/handleDom.ts +++ b/packages/replay-internal/src/coreHandlers/handleDom.ts @@ -2,7 +2,7 @@ import { record } from '@sentry-internal/rrweb'; import type { serializedElementNodeWithId, serializedNodeWithId } from '@sentry-internal/rrweb-snapshot'; import { NodeType } from '@sentry-internal/rrweb-snapshot'; import { htmlTreeAsString } from '@sentry/core'; -import type { Breadcrumb, HandlerDataDom } from '@sentry/types'; +import type { Breadcrumb, HandlerDataDom } from '@sentry/core'; import type { ReplayContainer } from '../types'; import { createBreadcrumb } from '../util/createBreadcrumb'; diff --git a/packages/replay-internal/src/coreHandlers/handleGlobalEvent.ts b/packages/replay-internal/src/coreHandlers/handleGlobalEvent.ts index 6ba64244fddf..49853014c943 100644 --- a/packages/replay-internal/src/coreHandlers/handleGlobalEvent.ts +++ b/packages/replay-internal/src/coreHandlers/handleGlobalEvent.ts @@ -1,4 +1,4 @@ -import type { Event, EventHint } from '@sentry/types'; +import type { Event, EventHint } from '@sentry/core'; import { DEBUG_BUILD } from '../debug-build'; import type { ReplayContainer } from '../types'; diff --git a/packages/replay-internal/src/coreHandlers/handleHistory.ts b/packages/replay-internal/src/coreHandlers/handleHistory.ts index 79167114c135..b033e6e43eaf 100644 --- a/packages/replay-internal/src/coreHandlers/handleHistory.ts +++ b/packages/replay-internal/src/coreHandlers/handleHistory.ts @@ -1,4 +1,4 @@ -import type { HandlerDataHistory } from '@sentry/types'; +import type { HandlerDataHistory } from '@sentry/core'; import type { HistoryData, ReplayContainer, ReplayPerformanceEntry } from '../types'; import { createPerformanceSpans } from '../util/createPerformanceSpans'; diff --git a/packages/replay-internal/src/coreHandlers/handleKeyboardEvent.ts b/packages/replay-internal/src/coreHandlers/handleKeyboardEvent.ts index 52ea76030ebd..5c4485321b26 100644 --- a/packages/replay-internal/src/coreHandlers/handleKeyboardEvent.ts +++ b/packages/replay-internal/src/coreHandlers/handleKeyboardEvent.ts @@ -1,5 +1,5 @@ import { htmlTreeAsString } from '@sentry/core'; -import type { Breadcrumb } from '@sentry/types'; +import type { Breadcrumb } from '@sentry/core'; import type { ReplayContainer } from '../types'; import { createBreadcrumb } from '../util/createBreadcrumb'; diff --git a/packages/replay-internal/src/coreHandlers/handleNetworkBreadcrumbs.ts b/packages/replay-internal/src/coreHandlers/handleNetworkBreadcrumbs.ts index 8b95a1f5fabe..3b3da66284d0 100644 --- a/packages/replay-internal/src/coreHandlers/handleNetworkBreadcrumbs.ts +++ b/packages/replay-internal/src/coreHandlers/handleNetworkBreadcrumbs.ts @@ -1,5 +1,5 @@ import { getClient } from '@sentry/core'; -import type { Breadcrumb, BreadcrumbHint, FetchBreadcrumbData, XhrBreadcrumbData } from '@sentry/types'; +import type { Breadcrumb, BreadcrumbHint, FetchBreadcrumbData, XhrBreadcrumbData } from '@sentry/core'; import { DEBUG_BUILD } from '../debug-build'; import type { FetchHint, ReplayContainer, ReplayNetworkOptions, XhrHint } from '../types'; diff --git a/packages/replay-internal/src/coreHandlers/util/addBreadcrumbEvent.ts b/packages/replay-internal/src/coreHandlers/util/addBreadcrumbEvent.ts index d24f43bd5d4a..a88eb8cabdeb 100644 --- a/packages/replay-internal/src/coreHandlers/util/addBreadcrumbEvent.ts +++ b/packages/replay-internal/src/coreHandlers/util/addBreadcrumbEvent.ts @@ -1,6 +1,6 @@ import { EventType } from '@sentry-internal/rrweb'; import { normalize } from '@sentry/core'; -import type { Breadcrumb } from '@sentry/types'; +import type { Breadcrumb } from '@sentry/core'; import type { ReplayContainer } from '../../types'; diff --git a/packages/replay-internal/src/coreHandlers/util/addFeedbackBreadcrumb.ts b/packages/replay-internal/src/coreHandlers/util/addFeedbackBreadcrumb.ts index 39fc2923cabd..014a1a60686f 100644 --- a/packages/replay-internal/src/coreHandlers/util/addFeedbackBreadcrumb.ts +++ b/packages/replay-internal/src/coreHandlers/util/addFeedbackBreadcrumb.ts @@ -1,5 +1,5 @@ import { EventType } from '@sentry-internal/rrweb'; -import type { FeedbackEvent } from '@sentry/types'; +import type { FeedbackEvent } from '@sentry/core'; import type { ReplayBreadcrumbFrameEvent, ReplayContainer } from '../../types'; diff --git a/packages/replay-internal/src/coreHandlers/util/fetchUtils.ts b/packages/replay-internal/src/coreHandlers/util/fetchUtils.ts index 8da058674516..d52af5c8526c 100644 --- a/packages/replay-internal/src/coreHandlers/util/fetchUtils.ts +++ b/packages/replay-internal/src/coreHandlers/util/fetchUtils.ts @@ -1,5 +1,5 @@ import { setTimeout } from '@sentry-internal/browser-utils'; -import type { Breadcrumb, FetchBreadcrumbData } from '@sentry/types'; +import type { Breadcrumb, FetchBreadcrumbData } from '@sentry/core'; import { DEBUG_BUILD } from '../../debug-build'; import type { diff --git a/packages/replay-internal/src/coreHandlers/util/shouldSampleForBufferEvent.ts b/packages/replay-internal/src/coreHandlers/util/shouldSampleForBufferEvent.ts index 2144aab4182c..4b46cee85963 100644 --- a/packages/replay-internal/src/coreHandlers/util/shouldSampleForBufferEvent.ts +++ b/packages/replay-internal/src/coreHandlers/util/shouldSampleForBufferEvent.ts @@ -1,4 +1,4 @@ -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { UNABLE_TO_SEND_REPLAY } from '../../constants'; import type { ReplayContainer } from '../../types'; diff --git a/packages/replay-internal/src/coreHandlers/util/xhrUtils.ts b/packages/replay-internal/src/coreHandlers/util/xhrUtils.ts index d7ac201c0756..e05dda8e29eb 100644 --- a/packages/replay-internal/src/coreHandlers/util/xhrUtils.ts +++ b/packages/replay-internal/src/coreHandlers/util/xhrUtils.ts @@ -1,5 +1,5 @@ import { SENTRY_XHR_DATA_KEY } from '@sentry-internal/browser-utils'; -import type { Breadcrumb, XhrBreadcrumbData } from '@sentry/types'; +import type { Breadcrumb, XhrBreadcrumbData } from '@sentry/core'; import { DEBUG_BUILD } from '../../debug-build'; import type { diff --git a/packages/replay-internal/src/eventBuffer/EventBufferCompressionWorker.ts b/packages/replay-internal/src/eventBuffer/EventBufferCompressionWorker.ts index 13fab7e6717b..5f7481671105 100644 --- a/packages/replay-internal/src/eventBuffer/EventBufferCompressionWorker.ts +++ b/packages/replay-internal/src/eventBuffer/EventBufferCompressionWorker.ts @@ -1,4 +1,4 @@ -import type { ReplayRecordingData } from '@sentry/types'; +import type { ReplayRecordingData } from '@sentry/core'; import { REPLAY_MAX_EVENT_BUFFER_SIZE } from '../constants'; import { DEBUG_BUILD } from '../debug-build'; diff --git a/packages/replay-internal/src/eventBuffer/EventBufferProxy.ts b/packages/replay-internal/src/eventBuffer/EventBufferProxy.ts index c982567e49c1..82a5c6a65d07 100644 --- a/packages/replay-internal/src/eventBuffer/EventBufferProxy.ts +++ b/packages/replay-internal/src/eventBuffer/EventBufferProxy.ts @@ -1,4 +1,4 @@ -import type { ReplayRecordingData } from '@sentry/types'; +import type { ReplayRecordingData } from '@sentry/core'; import { DEBUG_BUILD } from '../debug-build'; import type { AddEventResult, EventBuffer, EventBufferType, RecordingEvent } from '../types'; diff --git a/packages/replay-internal/src/integration.ts b/packages/replay-internal/src/integration.ts index 3c3f768b50df..c637c19c3f61 100644 --- a/packages/replay-internal/src/integration.ts +++ b/packages/replay-internal/src/integration.ts @@ -1,12 +1,6 @@ import { parseSampleRate } from '@sentry/core'; import { consoleSandbox, dropUndefinedKeys, isBrowser } from '@sentry/core'; -import type { - BrowserClientReplayOptions, - Client, - Integration, - IntegrationFn, - ReplayRecordingMode, -} from '@sentry/types'; +import type { BrowserClientReplayOptions, Client, Integration, IntegrationFn, ReplayRecordingMode } from '@sentry/core'; import { DEFAULT_FLUSH_MAX_DELAY, diff --git a/packages/replay-internal/src/replay.ts b/packages/replay-internal/src/replay.ts index d87a73a7e51d..cb476ad5349d 100644 --- a/packages/replay-internal/src/replay.ts +++ b/packages/replay-internal/src/replay.ts @@ -1,7 +1,7 @@ /* eslint-disable max-lines */ // TODO: We might want to split this file up import { EventType, record } from '@sentry-internal/rrweb'; import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, getActiveSpan, getClient, getRootSpan, spanToJSON } from '@sentry/core'; -import type { ReplayRecordingMode, Span } from '@sentry/types'; +import type { ReplayRecordingMode, Span } from '@sentry/core'; import { logger } from './util/logger'; import { diff --git a/packages/replay-internal/src/types/replay.ts b/packages/replay-internal/src/types/replay.ts index 4f78a438ecc3..7cd4c78a21c5 100644 --- a/packages/replay-internal/src/types/replay.ts +++ b/packages/replay-internal/src/types/replay.ts @@ -8,7 +8,7 @@ import type { SentryWrappedXMLHttpRequest, Span, XhrBreadcrumbHint, -} from '@sentry/types'; +} from '@sentry/core'; import type { SKIPPED, THROTTLED } from '../util/throttle'; import type { AllPerformanceEntry, AllPerformanceEntryData, ReplayPerformanceEntry } from './performance'; diff --git a/packages/replay-internal/src/types/replayFrame.ts b/packages/replay-internal/src/types/replayFrame.ts index 0fa43ff41eb2..7e887bb3c808 100644 --- a/packages/replay-internal/src/types/replayFrame.ts +++ b/packages/replay-internal/src/types/replayFrame.ts @@ -1,4 +1,4 @@ -import type { Breadcrumb } from '@sentry/types'; +import type { Breadcrumb } from '@sentry/core'; import type { HistoryData, diff --git a/packages/replay-internal/src/util/addGlobalListeners.ts b/packages/replay-internal/src/util/addGlobalListeners.ts index 70344413d3ba..cfc765e1b383 100644 --- a/packages/replay-internal/src/util/addGlobalListeners.ts +++ b/packages/replay-internal/src/util/addGlobalListeners.ts @@ -3,7 +3,7 @@ import { addHistoryInstrumentationHandler, } from '@sentry-internal/browser-utils'; import { addEventProcessor, getClient } from '@sentry/core'; -import type { DynamicSamplingContext } from '@sentry/types'; +import type { DynamicSamplingContext } from '@sentry/core'; import { handleAfterSendEvent } from '../coreHandlers/handleAfterSendEvent'; import { handleBeforeSendEvent } from '../coreHandlers/handleBeforeSendEvent'; diff --git a/packages/replay-internal/src/util/createReplayEnvelope.ts b/packages/replay-internal/src/util/createReplayEnvelope.ts index 4f4376a0e501..e1215c1904d4 100644 --- a/packages/replay-internal/src/util/createReplayEnvelope.ts +++ b/packages/replay-internal/src/util/createReplayEnvelope.ts @@ -1,5 +1,5 @@ import { createEnvelope, createEventEnvelopeHeaders, getSdkMetadataForEnvelopeHeader } from '@sentry/core'; -import type { DsnComponents, ReplayEnvelope, ReplayEvent, ReplayRecordingData } from '@sentry/types'; +import type { DsnComponents, ReplayEnvelope, ReplayEvent, ReplayRecordingData } from '@sentry/core'; /** * Create a replay envelope ready to be sent. diff --git a/packages/replay-internal/src/util/eventUtils.ts b/packages/replay-internal/src/util/eventUtils.ts index 8d2256bb57e3..ced9a7d115e4 100644 --- a/packages/replay-internal/src/util/eventUtils.ts +++ b/packages/replay-internal/src/util/eventUtils.ts @@ -1,4 +1,4 @@ -import type { ErrorEvent, Event, FeedbackEvent, ReplayEvent, TransactionEvent } from '@sentry/types'; +import type { ErrorEvent, Event, FeedbackEvent, ReplayEvent, TransactionEvent } from '@sentry/core'; /** If the event is an error event */ export function isErrorEvent(event: Event): event is ErrorEvent { diff --git a/packages/replay-internal/src/util/isRrwebError.ts b/packages/replay-internal/src/util/isRrwebError.ts index 0cb50bfb6802..275a93777b2e 100644 --- a/packages/replay-internal/src/util/isRrwebError.ts +++ b/packages/replay-internal/src/util/isRrwebError.ts @@ -1,4 +1,4 @@ -import type { Event, EventHint } from '@sentry/types'; +import type { Event, EventHint } from '@sentry/core'; /** * Returns true if we think the given event is an error originating inside of rrweb. diff --git a/packages/replay-internal/src/util/logger.ts b/packages/replay-internal/src/util/logger.ts index 3cc98980ec7e..d8442973d8df 100644 --- a/packages/replay-internal/src/util/logger.ts +++ b/packages/replay-internal/src/util/logger.ts @@ -1,6 +1,6 @@ import { addBreadcrumb, captureException } from '@sentry/core'; import { logger as coreLogger, severityLevelFromString } from '@sentry/core'; -import type { ConsoleLevel, SeverityLevel } from '@sentry/types'; +import type { ConsoleLevel, SeverityLevel } from '@sentry/core'; import { DEBUG_BUILD } from '../debug-build'; diff --git a/packages/replay-internal/src/util/prepareRecordingData.ts b/packages/replay-internal/src/util/prepareRecordingData.ts index 2ee3391d6f42..dd5261d0ba6c 100644 --- a/packages/replay-internal/src/util/prepareRecordingData.ts +++ b/packages/replay-internal/src/util/prepareRecordingData.ts @@ -1,4 +1,4 @@ -import type { ReplayRecordingData } from '@sentry/types'; +import type { ReplayRecordingData } from '@sentry/core'; /** * Prepare the recording data ready to be sent. diff --git a/packages/replay-internal/src/util/prepareReplayEvent.ts b/packages/replay-internal/src/util/prepareReplayEvent.ts index e071bec88a61..f1d21efcce86 100644 --- a/packages/replay-internal/src/util/prepareReplayEvent.ts +++ b/packages/replay-internal/src/util/prepareReplayEvent.ts @@ -1,6 +1,6 @@ import type { IntegrationIndex } from '@sentry/core'; import { getIsolationScope, prepareEvent } from '@sentry/core'; -import type { Client, EventHint, ReplayEvent, Scope } from '@sentry/types'; +import type { Client, EventHint, ReplayEvent, Scope } from '@sentry/core'; /** * Prepare a replay event & enrich it with the SDK metadata. diff --git a/packages/replay-internal/src/util/resetReplayIdOnDynamicSamplingContext.ts b/packages/replay-internal/src/util/resetReplayIdOnDynamicSamplingContext.ts index b38de9e3312d..7e264811ce3a 100644 --- a/packages/replay-internal/src/util/resetReplayIdOnDynamicSamplingContext.ts +++ b/packages/replay-internal/src/util/resetReplayIdOnDynamicSamplingContext.ts @@ -1,5 +1,5 @@ import { getActiveSpan, getCurrentScope, getDynamicSamplingContextFromSpan } from '@sentry/core'; -import type { DynamicSamplingContext } from '@sentry/types'; +import type { DynamicSamplingContext } from '@sentry/core'; /** * Reset the `replay_id` field on the DSC. diff --git a/packages/replay-internal/src/util/sendReplayRequest.ts b/packages/replay-internal/src/util/sendReplayRequest.ts index 89c7740bc0b7..457e3b254a55 100644 --- a/packages/replay-internal/src/util/sendReplayRequest.ts +++ b/packages/replay-internal/src/util/sendReplayRequest.ts @@ -2,7 +2,7 @@ import { getClient, getCurrentScope } from '@sentry/core'; import type { RateLimits } from '@sentry/core'; import { resolvedSyncPromise } from '@sentry/core'; import { isRateLimited, updateRateLimits } from '@sentry/core'; -import type { ReplayEvent, TransportMakeRequestResponse } from '@sentry/types'; +import type { ReplayEvent, TransportMakeRequestResponse } from '@sentry/core'; import { REPLAY_EVENT_NAME, UNABLE_TO_SEND_REPLAY } from '../constants'; import { DEBUG_BUILD } from '../debug-build'; diff --git a/packages/replay-internal/test.setup.ts b/packages/replay-internal/test.setup.ts index 17f7d5c9f2b7..c7d1ffa8eb51 100644 --- a/packages/replay-internal/test.setup.ts +++ b/packages/replay-internal/test.setup.ts @@ -5,7 +5,7 @@ import type { Mocked, MockedFunction } from 'vitest'; /* eslint-disable @typescript-eslint/no-unsafe-member-access */ import { getClient } from '@sentry/core'; import * as SentryUtils from '@sentry/core'; -import type { ReplayRecordingData, Transport } from '@sentry/types'; +import type { ReplayRecordingData, Transport } from '@sentry/core'; import type { ReplayContainer, Session } from './src/types'; diff --git a/packages/replay-internal/test/fixtures/error.ts b/packages/replay-internal/test/fixtures/error.ts index 1fde3a179ffc..1b8354126107 100644 --- a/packages/replay-internal/test/fixtures/error.ts +++ b/packages/replay-internal/test/fixtures/error.ts @@ -1,4 +1,4 @@ -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; export function Error(obj?: Event): any { const timestamp = Date.now() / 1000; diff --git a/packages/replay-internal/test/fixtures/transaction.ts b/packages/replay-internal/test/fixtures/transaction.ts index 6264802f74d8..1062213e66a2 100644 --- a/packages/replay-internal/test/fixtures/transaction.ts +++ b/packages/replay-internal/test/fixtures/transaction.ts @@ -1,4 +1,4 @@ -import type { Event, SeverityLevel } from '@sentry/types'; +import type { Event, SeverityLevel } from '@sentry/core'; export function Transaction(traceId?: string, obj?: Partial): any { const timestamp = Date.now() / 1000; diff --git a/packages/replay-internal/test/integration/beforeAddRecordingEvent.test.ts b/packages/replay-internal/test/integration/beforeAddRecordingEvent.test.ts index a3b587ee0bda..dd0d98783893 100644 --- a/packages/replay-internal/test/integration/beforeAddRecordingEvent.test.ts +++ b/packages/replay-internal/test/integration/beforeAddRecordingEvent.test.ts @@ -7,7 +7,7 @@ import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } import * as SentryBrowserUtils from '@sentry-internal/browser-utils'; import * as SentryCore from '@sentry/core'; -import type { Transport } from '@sentry/types'; +import type { Transport } from '@sentry/core'; import type { Replay } from '../../src/integration'; import type { ReplayContainer } from '../../src/replay'; diff --git a/packages/replay-internal/test/integration/coreHandlers/handleAfterSendEvent.test.ts b/packages/replay-internal/test/integration/coreHandlers/handleAfterSendEvent.test.ts index aa88e9582d32..4bfe99d95f20 100644 --- a/packages/replay-internal/test/integration/coreHandlers/handleAfterSendEvent.test.ts +++ b/packages/replay-internal/test/integration/coreHandlers/handleAfterSendEvent.test.ts @@ -10,7 +10,7 @@ import { useFakeTimers } from '../../utils/use-fake-timers'; useFakeTimers(); import { getClient } from '@sentry/core'; -import type { ErrorEvent, Event } from '@sentry/types'; +import type { ErrorEvent, Event } from '@sentry/core'; import { UNABLE_TO_SEND_REPLAY } from '../../../src/constants'; import { handleAfterSendEvent } from '../../../src/coreHandlers/handleAfterSendEvent'; diff --git a/packages/replay-internal/test/integration/coreHandlers/handleGlobalEvent.test.ts b/packages/replay-internal/test/integration/coreHandlers/handleGlobalEvent.test.ts index a3ad967e1586..5bab5ab1a715 100644 --- a/packages/replay-internal/test/integration/coreHandlers/handleGlobalEvent.test.ts +++ b/packages/replay-internal/test/integration/coreHandlers/handleGlobalEvent.test.ts @@ -5,7 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; import { getClient } from '@sentry/core'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { REPLAY_EVENT_NAME, SESSION_IDLE_EXPIRE_DURATION } from '../../../src/constants'; import { handleGlobalEventListener } from '../../../src/coreHandlers/handleGlobalEvent'; diff --git a/packages/replay-internal/test/integration/eventProcessors.test.ts b/packages/replay-internal/test/integration/eventProcessors.test.ts index b6c5bd23624d..26ae88364a61 100644 --- a/packages/replay-internal/test/integration/eventProcessors.test.ts +++ b/packages/replay-internal/test/integration/eventProcessors.test.ts @@ -5,7 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; import { getClient, getCurrentScope } from '@sentry/core'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { BASE_TIMESTAMP } from '..'; import { resetSdkMock } from '../mocks/resetSdkMock'; diff --git a/packages/replay-internal/test/integration/rateLimiting.test.ts b/packages/replay-internal/test/integration/rateLimiting.test.ts index 6a60f8251b93..f75ab257b9f5 100644 --- a/packages/replay-internal/test/integration/rateLimiting.test.ts +++ b/packages/replay-internal/test/integration/rateLimiting.test.ts @@ -6,7 +6,7 @@ import type { MockedFunction } from 'vitest'; import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; import { getClient } from '@sentry/core'; -import type { Transport, TransportMakeRequestResponse } from '@sentry/types'; +import type { Transport, TransportMakeRequestResponse } from '@sentry/core'; import { DEFAULT_FLUSH_MIN_DELAY } from '../../src/constants'; import type { ReplayContainer } from '../../src/replay'; diff --git a/packages/replay-internal/test/integration/sendReplayEvent.test.ts b/packages/replay-internal/test/integration/sendReplayEvent.test.ts index 29f063fa4b94..bc58d463cf66 100644 --- a/packages/replay-internal/test/integration/sendReplayEvent.test.ts +++ b/packages/replay-internal/test/integration/sendReplayEvent.test.ts @@ -7,7 +7,7 @@ import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } import * as SentryBrowserUtils from '@sentry-internal/browser-utils'; import * as SentryCore from '@sentry/core'; -import type { Transport } from '@sentry/types'; +import type { Transport } from '@sentry/core'; import { DEFAULT_FLUSH_MIN_DELAY, WINDOW } from '../../src/constants'; import type { ReplayContainer } from '../../src/replay'; diff --git a/packages/replay-internal/test/integration/session.test.ts b/packages/replay-internal/test/integration/session.test.ts index 0d3621cd4f70..78ecee16027e 100644 --- a/packages/replay-internal/test/integration/session.test.ts +++ b/packages/replay-internal/test/integration/session.test.ts @@ -5,7 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; import { getClient } from '@sentry/core'; -import type { Transport } from '@sentry/types'; +import type { Transport } from '@sentry/core'; import { DEFAULT_FLUSH_MIN_DELAY, diff --git a/packages/replay-internal/test/integration/start.test.ts b/packages/replay-internal/test/integration/start.test.ts index 5a4ccc087ed9..8b2136d16120 100644 --- a/packages/replay-internal/test/integration/start.test.ts +++ b/packages/replay-internal/test/integration/start.test.ts @@ -5,7 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; import { getClient } from '@sentry/core'; -import type { Transport } from '@sentry/types'; +import type { Transport } from '@sentry/core'; import { DEFAULT_FLUSH_MIN_DELAY, SESSION_IDLE_EXPIRE_DURATION } from '../../src/constants'; import type { Replay } from '../../src/integration'; diff --git a/packages/replay-internal/test/mocks/mockSdk.ts b/packages/replay-internal/test/mocks/mockSdk.ts index 38adc7f9c476..5595bf04a261 100644 --- a/packages/replay-internal/test/mocks/mockSdk.ts +++ b/packages/replay-internal/test/mocks/mockSdk.ts @@ -1,4 +1,4 @@ -import type { Envelope, Transport, TransportMakeRequestResponse } from '@sentry/types'; +import type { Envelope, Transport, TransportMakeRequestResponse } from '@sentry/core'; import { vi } from 'vitest'; import type { Replay as ReplayIntegration } from '../../src/integration'; diff --git a/packages/replay-internal/test/types.ts b/packages/replay-internal/test/types.ts index 336f11b7bed9..ff28aa40a5f7 100644 --- a/packages/replay-internal/test/types.ts +++ b/packages/replay-internal/test/types.ts @@ -1,3 +1,3 @@ -import type { HandlerDataDom } from '@sentry/types'; +import type { HandlerDataDom } from '@sentry/core'; export type DomHandler = (data: HandlerDataDom) => void; diff --git a/packages/replay-internal/test/unit/coreHandlers/handleClick.test.ts b/packages/replay-internal/test/unit/coreHandlers/handleClick.test.ts index 4cd75a609ec3..58d10db23e40 100644 --- a/packages/replay-internal/test/unit/coreHandlers/handleClick.test.ts +++ b/packages/replay-internal/test/unit/coreHandlers/handleClick.test.ts @@ -8,7 +8,7 @@ import { useFakeTimers } from '../../utils/use-fake-timers'; useFakeTimers(); -import type { Breadcrumb } from '@sentry/types'; +import type { Breadcrumb } from '@sentry/core'; import { BASE_TIMESTAMP } from '../..'; import { ClickDetector, ignoreElement } from '../../../src/coreHandlers/handleClick'; diff --git a/packages/replay-internal/test/unit/coreHandlers/handleDom.test.ts b/packages/replay-internal/test/unit/coreHandlers/handleDom.test.ts index 993291be675e..8d5453c31f2c 100644 --- a/packages/replay-internal/test/unit/coreHandlers/handleDom.test.ts +++ b/packages/replay-internal/test/unit/coreHandlers/handleDom.test.ts @@ -4,7 +4,7 @@ import { describe, expect, test } from 'vitest'; -import type { HandlerDataDom } from '@sentry/types'; +import type { HandlerDataDom } from '@sentry/core'; import { handleDom } from '../../../src/coreHandlers/handleDom'; diff --git a/packages/replay-internal/test/unit/coreHandlers/handleNetworkBreadcrumbs.test.ts b/packages/replay-internal/test/unit/coreHandlers/handleNetworkBreadcrumbs.test.ts index 04955477f679..512c2b0f33eb 100644 --- a/packages/replay-internal/test/unit/coreHandlers/handleNetworkBreadcrumbs.test.ts +++ b/packages/replay-internal/test/unit/coreHandlers/handleNetworkBreadcrumbs.test.ts @@ -11,7 +11,7 @@ import type { FetchBreadcrumbHint, SentryWrappedXMLHttpRequest, XhrBreadcrumbHint, -} from '@sentry/types'; +} from '@sentry/core'; import { BASE_TIMESTAMP } from '../..'; import { NETWORK_BODY_MAX_SIZE } from '../../../src/constants'; diff --git a/packages/replay-internal/test/unit/session/createSession.test.ts b/packages/replay-internal/test/unit/session/createSession.test.ts index 3f8cd4ce3ca7..8cd186f4aeea 100644 --- a/packages/replay-internal/test/unit/session/createSession.test.ts +++ b/packages/replay-internal/test/unit/session/createSession.test.ts @@ -7,7 +7,7 @@ import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest'; import * as Sentry from '@sentry/core'; -import type { Hub } from '@sentry/types'; +import type { Hub } from '@sentry/core'; import { WINDOW } from '../../../src/constants'; import { createSession } from '../../../src/session/createSession'; import { saveSession } from '../../../src/session/saveSession'; diff --git a/packages/replay-internal/test/unit/util/createReplayEnvelope.test.ts b/packages/replay-internal/test/unit/util/createReplayEnvelope.test.ts index 6967f3f32a26..9971c3e57b3f 100644 --- a/packages/replay-internal/test/unit/util/createReplayEnvelope.test.ts +++ b/packages/replay-internal/test/unit/util/createReplayEnvelope.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from 'vitest'; import { makeDsn } from '@sentry/core'; -import type { ReplayEvent } from '@sentry/types'; +import type { ReplayEvent } from '@sentry/core'; import { createReplayEnvelope } from '../../../src/util/createReplayEnvelope'; diff --git a/packages/replay-internal/test/unit/util/prepareReplayEvent.test.ts b/packages/replay-internal/test/unit/util/prepareReplayEvent.test.ts index b93a8651267c..14d2e36e9a07 100644 --- a/packages/replay-internal/test/unit/util/prepareReplayEvent.test.ts +++ b/packages/replay-internal/test/unit/util/prepareReplayEvent.test.ts @@ -1,7 +1,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; import { getClient, getCurrentScope, setCurrentClient } from '@sentry/core'; -import type { ReplayEvent } from '@sentry/types'; +import type { ReplayEvent } from '@sentry/core'; import { REPLAY_EVENT_NAME } from '../../../src/constants'; import { prepareReplayEvent } from '../../../src/util/prepareReplayEvent'; diff --git a/packages/replay-internal/test/utils/TestClient.ts b/packages/replay-internal/test/utils/TestClient.ts index f534ac77c3c6..48ce724605f7 100644 --- a/packages/replay-internal/test/utils/TestClient.ts +++ b/packages/replay-internal/test/utils/TestClient.ts @@ -7,7 +7,7 @@ import type { Event, ParameterizedString, SeverityLevel, -} from '@sentry/types'; +} from '@sentry/core'; export interface TestClientOptions extends ClientOptions, BrowserClientReplayOptions {} diff --git a/packages/solid/package.json b/packages/solid/package.json index 9de59618b038..1867c29cf40f 100644 --- a/packages/solid/package.json +++ b/packages/solid/package.json @@ -45,8 +45,7 @@ }, "dependencies": { "@sentry/browser": "8.40.0", - "@sentry/core": "8.40.0", - "@sentry/types": "8.40.0" + "@sentry/core": "8.40.0" }, "peerDependencies": { "@solidjs/router": "^0.13.4", diff --git a/packages/solid/src/sdk.ts b/packages/solid/src/sdk.ts index 2a08964b1b67..b17a42051474 100644 --- a/packages/solid/src/sdk.ts +++ b/packages/solid/src/sdk.ts @@ -1,7 +1,7 @@ import type { BrowserOptions } from '@sentry/browser'; import { init as browserInit } from '@sentry/browser'; import { applySdkMetadata } from '@sentry/core'; -import type { Client } from '@sentry/types'; +import type { Client } from '@sentry/core'; /** * Initializes the Solid SDK diff --git a/packages/solid/src/solidrouter.ts b/packages/solid/src/solidrouter.ts index b4c0972decff..c2641ac1acf9 100644 --- a/packages/solid/src/solidrouter.ts +++ b/packages/solid/src/solidrouter.ts @@ -11,7 +11,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, getClient, } from '@sentry/core'; -import type { Client, Integration, Span } from '@sentry/types'; +import type { Client, Integration, Span } from '@sentry/core'; import type { BeforeLeaveEventArgs, HashRouter, diff --git a/packages/solidstart/package.json b/packages/solidstart/package.json index 4db6751fb693..e9492f3b9f35 100644 --- a/packages/solidstart/package.json +++ b/packages/solidstart/package.json @@ -71,7 +71,6 @@ "@sentry/node": "8.40.0", "@sentry/opentelemetry": "8.40.0", "@sentry/solid": "8.40.0", - "@sentry/types": "8.40.0", "@sentry/vite-plugin": "2.22.6" }, "devDependencies": { diff --git a/packages/solidstart/src/client/sdk.ts b/packages/solidstart/src/client/sdk.ts index 8b1b6f7f39d5..e656fdcba921 100644 --- a/packages/solidstart/src/client/sdk.ts +++ b/packages/solidstart/src/client/sdk.ts @@ -1,11 +1,11 @@ import { applySdkMetadata } from '@sentry/core'; +import type { Client, Integration } from '@sentry/core'; import type { BrowserOptions } from '@sentry/solid'; import { browserTracingIntegration, getDefaultIntegrations as getDefaultSolidIntegrations, init as initSolidSDK, } from '@sentry/solid'; -import type { Client, Integration } from '@sentry/types'; // Treeshakable guard to remove all code related to tracing declare const __SENTRY_TRACING__: boolean; diff --git a/packages/solidstart/src/index.types.ts b/packages/solidstart/src/index.types.ts index 13ff38425a1c..85b712281f38 100644 --- a/packages/solidstart/src/index.types.ts +++ b/packages/solidstart/src/index.types.ts @@ -5,7 +5,7 @@ export * from './client'; export * from './server'; export * from './vite'; -import type { Client, Integration, Options, StackParser } from '@sentry/types'; +import type { Client, Integration, Options, StackParser } from '@sentry/core'; import type * as clientSdk from './client'; import type * as serverSdk from './server'; diff --git a/packages/solidstart/src/server/utils.ts b/packages/solidstart/src/server/utils.ts index 90bf9b426a93..cd2c4c12ab96 100644 --- a/packages/solidstart/src/server/utils.ts +++ b/packages/solidstart/src/server/utils.ts @@ -1,6 +1,6 @@ import { logger } from '@sentry/core'; +import type { EventProcessor, Options } from '@sentry/core'; import { flush, getGlobalScope } from '@sentry/node'; -import type { EventProcessor, Options } from '@sentry/types'; import { DEBUG_BUILD } from '../common/debug-build'; /** Flush the event queue to ensure that events get sent to Sentry before the response is finished and the lambda ends */ diff --git a/packages/svelte/package.json b/packages/svelte/package.json index 338e4e18f975..32b48fdd8172 100644 --- a/packages/svelte/package.json +++ b/packages/svelte/package.json @@ -41,7 +41,6 @@ "dependencies": { "@sentry/browser": "8.40.0", "@sentry/core": "8.40.0", - "@sentry/types": "8.40.0", "magic-string": "^0.30.0" }, "peerDependencies": { diff --git a/packages/svelte/src/performance.ts b/packages/svelte/src/performance.ts index e30c54299603..b50be258bc58 100644 --- a/packages/svelte/src/performance.ts +++ b/packages/svelte/src/performance.ts @@ -1,5 +1,5 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/browser'; -import type { Span } from '@sentry/types'; +import type { Span } from '@sentry/core'; import { afterUpdate, beforeUpdate, onMount } from 'svelte'; import { startInactiveSpan } from '@sentry/core'; diff --git a/packages/svelte/src/sdk.ts b/packages/svelte/src/sdk.ts index 29a3379a5140..61fbd3ecf612 100644 --- a/packages/svelte/src/sdk.ts +++ b/packages/svelte/src/sdk.ts @@ -2,7 +2,7 @@ import type { BrowserOptions } from '@sentry/browser'; import { addEventProcessor, init as browserInit } from '@sentry/browser'; import { applySdkMetadata } from '@sentry/core'; import { getDomElement } from '@sentry/core'; -import type { Client, EventProcessor } from '@sentry/types'; +import type { Client, EventProcessor } from '@sentry/core'; /** * Inits the Svelte SDK */ diff --git a/packages/svelte/test/performance.test.ts b/packages/svelte/test/performance.test.ts index 929bb9394e95..4ddc18b90ab9 100644 --- a/packages/svelte/test/performance.test.ts +++ b/packages/svelte/test/performance.test.ts @@ -7,7 +7,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'; import { act, render } from '@testing-library/svelte'; import { getClient, getCurrentScope, getIsolationScope, init, startSpan } from '../src'; -import type { TransactionEvent } from '@sentry/types'; +import type { TransactionEvent } from '@sentry/core'; // @ts-expect-error svelte import import DummyComponent from './components/Dummy.svelte'; diff --git a/packages/svelte/test/sdk.test.ts b/packages/svelte/test/sdk.test.ts index 27ca155533e3..02d01d27fae9 100644 --- a/packages/svelte/test/sdk.test.ts +++ b/packages/svelte/test/sdk.test.ts @@ -6,7 +6,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'; import { SDK_VERSION } from '@sentry/browser'; import * as SentryBrowser from '@sentry/browser'; -import type { EventProcessor } from '@sentry/types'; +import type { EventProcessor } from '@sentry/core'; import { detectAndReportSvelteKit, init as svelteInit, isSvelteKitApp } from '../src/sdk'; diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json index 67f1853b361c..07da20b12028 100644 --- a/packages/sveltekit/package.json +++ b/packages/sveltekit/package.json @@ -44,7 +44,6 @@ "@sentry/node": "8.40.0", "@sentry/opentelemetry": "8.40.0", "@sentry/svelte": "8.40.0", - "@sentry/types": "8.40.0", "@sentry/vite-plugin": "2.22.6", "magic-string": "0.30.7", "magicast": "0.2.8", diff --git a/packages/sveltekit/src/client/browserTracingIntegration.ts b/packages/sveltekit/src/client/browserTracingIntegration.ts index f41de176b073..ccfb416db5b9 100644 --- a/packages/sveltekit/src/client/browserTracingIntegration.ts +++ b/packages/sveltekit/src/client/browserTracingIntegration.ts @@ -1,6 +1,7 @@ import { navigating, page } from '$app/stores'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core'; import { dropUndefinedKeys } from '@sentry/core'; +import type { Client, Integration, Span } from '@sentry/core'; import { WINDOW, browserTracingIntegration as originalBrowserTracingIntegration, @@ -9,7 +10,6 @@ import { startBrowserTracingPageLoadSpan, startInactiveSpan, } from '@sentry/svelte'; -import type { Client, Integration, Span } from '@sentry/types'; /** * A custom `BrowserTracing` integration for SvelteKit. diff --git a/packages/sveltekit/src/client/sdk.ts b/packages/sveltekit/src/client/sdk.ts index f01a033012a3..35ef46118edc 100644 --- a/packages/sveltekit/src/client/sdk.ts +++ b/packages/sveltekit/src/client/sdk.ts @@ -1,8 +1,8 @@ import { applySdkMetadata } from '@sentry/core'; +import type { Client, Integration } from '@sentry/core'; import type { BrowserOptions } from '@sentry/svelte'; import { getDefaultIntegrations as getDefaultSvelteIntegrations } from '@sentry/svelte'; import { WINDOW, init as initSvelteSdk } from '@sentry/svelte'; -import type { Client, Integration } from '@sentry/types'; import { browserTracingIntegration as svelteKitBrowserTracingIntegration } from './browserTracingIntegration'; diff --git a/packages/sveltekit/src/index.types.ts b/packages/sveltekit/src/index.types.ts index f7f0db30a249..95cac7b9318b 100644 --- a/packages/sveltekit/src/index.types.ts +++ b/packages/sveltekit/src/index.types.ts @@ -5,7 +5,7 @@ export * from './client'; export * from './vite'; export * from './server'; -import type { Client, Integration, Options, StackParser } from '@sentry/types'; +import type { Client, Integration, Options, StackParser } from '@sentry/core'; import type { HandleClientError, HandleServerError } from '@sveltejs/kit'; import type * as clientSdk from './client'; diff --git a/packages/sveltekit/src/server/handle.ts b/packages/sveltekit/src/server/handle.ts index 2b7f32e0876a..b06efc7c5991 100644 --- a/packages/sveltekit/src/server/handle.ts +++ b/packages/sveltekit/src/server/handle.ts @@ -11,8 +11,8 @@ import { } from '@sentry/core'; import { startSpan } from '@sentry/core'; import { logger, winterCGRequestToRequestData } from '@sentry/core'; +import type { Span } from '@sentry/core'; import { continueTrace } from '@sentry/node'; -import type { Span } from '@sentry/types'; import type { Handle, ResolveOptions } from '@sveltejs/kit'; import { DEBUG_BUILD } from '../common/debug-build'; diff --git a/packages/sveltekit/src/server/rewriteFramesIntegration.ts b/packages/sveltekit/src/server/rewriteFramesIntegration.ts index c01e248f937c..8754e77c5dd4 100644 --- a/packages/sveltekit/src/server/rewriteFramesIntegration.ts +++ b/packages/sveltekit/src/server/rewriteFramesIntegration.ts @@ -1,6 +1,6 @@ import { defineIntegration, rewriteFramesIntegration as originalRewriteFramesIntegration } from '@sentry/core'; import { GLOBAL_OBJ, basename, escapeStringForRegex, join } from '@sentry/core'; -import type { IntegrationFn, StackFrame } from '@sentry/types'; +import type { IntegrationFn, StackFrame } from '@sentry/core'; import { WRAPPED_MODULE_SUFFIX } from '../vite/autoInstrument'; import type { GlobalWithSentryValues } from '../vite/injectGlobalValues'; diff --git a/packages/sveltekit/src/vite/detectAdapter.ts b/packages/sveltekit/src/vite/detectAdapter.ts index 7717aa4bd4c2..e979eb0c43e4 100644 --- a/packages/sveltekit/src/vite/detectAdapter.ts +++ b/packages/sveltekit/src/vite/detectAdapter.ts @@ -1,6 +1,6 @@ import * as fs from 'fs'; import * as path from 'path'; -import type { Package } from '@sentry/types'; +import type { Package } from '@sentry/core'; /** * Supported @sveltejs/adapters-[adapter] SvelteKit adapters diff --git a/packages/sveltekit/test/client/browserTracingIntegration.test.ts b/packages/sveltekit/test/client/browserTracingIntegration.test.ts index a21dbbe66bae..a70b46abbcbb 100644 --- a/packages/sveltekit/test/client/browserTracingIntegration.test.ts +++ b/packages/sveltekit/test/client/browserTracingIntegration.test.ts @@ -5,7 +5,7 @@ /* eslint-disable @typescript-eslint/unbound-method */ import { beforeEach, describe, expect, it, vi } from 'vitest'; -import type { Span } from '@sentry/types'; +import type { Span } from '@sentry/core'; import { writable } from 'svelte/store'; import { navigating, page } from '$app/stores'; diff --git a/packages/sveltekit/test/server/handle.test.ts b/packages/sveltekit/test/server/handle.test.ts index c25b926c7ace..c5225124ace3 100644 --- a/packages/sveltekit/test/server/handle.test.ts +++ b/packages/sveltekit/test/server/handle.test.ts @@ -7,9 +7,9 @@ import { spanIsSampled, spanToJSON, } from '@sentry/core'; +import type { EventEnvelopeHeaders, Span } from '@sentry/core'; import { NodeClient, setCurrentClient } from '@sentry/node'; import * as SentryNode from '@sentry/node'; -import type { EventEnvelopeHeaders, Span } from '@sentry/types'; import type { Handle } from '@sveltejs/kit'; import { redirect } from '@sveltejs/kit'; import { vi } from 'vitest'; diff --git a/packages/sveltekit/test/server/load.test.ts b/packages/sveltekit/test/server/load.test.ts index c2ee2b2943a3..21552dde209e 100644 --- a/packages/sveltekit/test/server/load.test.ts +++ b/packages/sveltekit/test/server/load.test.ts @@ -5,9 +5,9 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, } from '@sentry/core'; +import type { Event } from '@sentry/core'; import { NodeClient, getCurrentScope, getIsolationScope, setCurrentClient } from '@sentry/node'; import * as SentryNode from '@sentry/node'; -import type { Event } from '@sentry/types'; import type { Load, ServerLoad } from '@sveltejs/kit'; import { error, redirect } from '@sveltejs/kit'; diff --git a/packages/sveltekit/test/server/rewriteFramesIntegration.ts b/packages/sveltekit/test/server/rewriteFramesIntegration.ts index ab0306876e20..3dfd5d3e460e 100644 --- a/packages/sveltekit/test/server/rewriteFramesIntegration.ts +++ b/packages/sveltekit/test/server/rewriteFramesIntegration.ts @@ -1,6 +1,6 @@ import { rewriteFramesIntegration } from '@sentry/browser'; import { basename } from '@sentry/core'; -import type { Event, StackFrame } from '@sentry/types'; +import type { Event, StackFrame } from '@sentry/core'; import { rewriteFramesIteratee } from '../../src/server/rewriteFramesIntegration'; import type { GlobalWithSentryValues } from '../../src/vite/injectGlobalValues'; diff --git a/packages/sveltekit/test/utils.ts b/packages/sveltekit/test/utils.ts index a4e0299b396d..ec15e0d24c03 100644 --- a/packages/sveltekit/test/utils.ts +++ b/packages/sveltekit/test/utils.ts @@ -1,6 +1,6 @@ import { createTransport } from '@sentry/core'; import { resolvedSyncPromise } from '@sentry/core'; -import type { ClientOptions } from '@sentry/types'; +import type { ClientOptions } from '@sentry/core'; export function getDefaultNodeClientOptions(options: Partial = {}): ClientOptions { return { diff --git a/packages/utils/package.json b/packages/utils/package.json index 9cb0f1e92f32..faaa2eb30f69 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -39,8 +39,7 @@ "access": "public" }, "dependencies": { - "@sentry/core": "8.40.0", - "@sentry/types": "8.40.0" + "@sentry/core": "8.40.0" }, "scripts": { "build": "run-p build:transpile build:types", diff --git a/packages/vercel-edge/package.json b/packages/vercel-edge/package.json index a0e5d438c9dc..ab0fc903fac1 100644 --- a/packages/vercel-edge/package.json +++ b/packages/vercel-edge/package.json @@ -40,8 +40,7 @@ }, "dependencies": { "@opentelemetry/api": "^1.9.0", - "@sentry/core": "8.40.0", - "@sentry/types": "8.40.0" + "@sentry/core": "8.40.0" }, "devDependencies": { "@edge-runtime/types": "3.0.1", diff --git a/packages/vercel-edge/src/index.ts b/packages/vercel-edge/src/index.ts index 1675e9b5b359..d6e6fc046837 100644 --- a/packages/vercel-edge/src/index.ts +++ b/packages/vercel-edge/src/index.ts @@ -17,7 +17,7 @@ export type { Stacktrace, Thread, User, -} from '@sentry/types'; +} from '@sentry/core'; export type { AddRequestDataToEventOptions } from '@sentry/core'; export type { VercelEdgeOptions } from './types'; diff --git a/packages/vercel-edge/src/integrations/wintercg-fetch.ts b/packages/vercel-edge/src/integrations/wintercg-fetch.ts index 7371ebcec8b7..db6848fa0c2e 100644 --- a/packages/vercel-edge/src/integrations/wintercg-fetch.ts +++ b/packages/vercel-edge/src/integrations/wintercg-fetch.ts @@ -12,7 +12,7 @@ import type { HandlerDataFetch, IntegrationFn, Span, -} from '@sentry/types'; +} from '@sentry/core'; const INTEGRATION_NAME = 'WinterCGFetch'; diff --git a/packages/vercel-edge/src/sdk.ts b/packages/vercel-edge/src/sdk.ts index 141a3ba19ff5..f62da1d8f705 100644 --- a/packages/vercel-edge/src/sdk.ts +++ b/packages/vercel-edge/src/sdk.ts @@ -16,7 +16,7 @@ import { nodeStackLineParser, stackParserFromStackParserOptions, } from '@sentry/core'; -import type { Client, Integration, Options } from '@sentry/types'; +import type { Client, Integration, Options } from '@sentry/core'; import { DiagLogLevel, diag } from '@opentelemetry/api'; import { Resource } from '@opentelemetry/resources'; diff --git a/packages/vercel-edge/src/transports/index.ts b/packages/vercel-edge/src/transports/index.ts index ade9f83944f7..f0b861b1882b 100644 --- a/packages/vercel-edge/src/transports/index.ts +++ b/packages/vercel-edge/src/transports/index.ts @@ -1,6 +1,6 @@ import { createTransport, suppressTracing } from '@sentry/core'; import { SentryError } from '@sentry/core'; -import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/types'; +import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/core'; export interface VercelEdgeTransportOptions extends BaseTransportOptions { /** Fetch API init parameters. */ diff --git a/packages/vercel-edge/src/transports/types.ts b/packages/vercel-edge/src/transports/types.ts index e6c0ab869662..70bf888f2666 100644 --- a/packages/vercel-edge/src/transports/types.ts +++ b/packages/vercel-edge/src/transports/types.ts @@ -1,4 +1,4 @@ -import type { BaseTransportOptions } from '@sentry/types'; +import type { BaseTransportOptions } from '@sentry/core'; export interface VercelEdgeTransportOptions extends BaseTransportOptions { /** Fetch API init parameters. */ diff --git a/packages/vercel-edge/src/types.ts b/packages/vercel-edge/src/types.ts index 26bc1b911875..2128f23b35a8 100644 --- a/packages/vercel-edge/src/types.ts +++ b/packages/vercel-edge/src/types.ts @@ -1,4 +1,4 @@ -import type { ClientOptions, Options, TracePropagationTargets } from '@sentry/types'; +import type { ClientOptions, Options, TracePropagationTargets } from '@sentry/core'; import type { VercelEdgeClient } from './client'; import type { VercelEdgeTransportOptions } from './transports'; @@ -60,7 +60,7 @@ export interface BaseVercelEdgeOptions { /** * Configuration options for the Sentry VercelEdge SDK - * @see @sentry/types Options for more information. + * @see @sentry/core Options for more information. */ export interface VercelEdgeOptions extends Options, BaseVercelEdgeOptions {} diff --git a/packages/vercel-edge/test/transports/index.test.ts b/packages/vercel-edge/test/transports/index.test.ts index 4534d1b8169a..4434a177d0f8 100644 --- a/packages/vercel-edge/test/transports/index.test.ts +++ b/packages/vercel-edge/test/transports/index.test.ts @@ -1,7 +1,7 @@ import { afterAll, describe, expect, it, vi } from 'vitest'; import { createEnvelope, serializeEnvelope } from '@sentry/core'; -import type { EventEnvelope, EventItem } from '@sentry/types'; +import type { EventEnvelope, EventItem } from '@sentry/core'; import type { VercelEdgeTransportOptions } from '../../src/transports'; import { IsolatedPromiseBuffer, makeEdgeTransport } from '../../src/transports'; diff --git a/packages/vercel-edge/test/wintercg-fetch.test.ts b/packages/vercel-edge/test/wintercg-fetch.test.ts index ac00e27dcac8..16e530710844 100644 --- a/packages/vercel-edge/test/wintercg-fetch.test.ts +++ b/packages/vercel-edge/test/wintercg-fetch.test.ts @@ -3,7 +3,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'; import * as sentryCore from '@sentry/core'; import * as sentryUtils from '@sentry/core'; import { createStackParser } from '@sentry/core'; -import type { HandlerDataFetch, Integration } from '@sentry/types'; +import type { HandlerDataFetch, Integration } from '@sentry/core'; import { VercelEdgeClient } from '../src/index'; import { winterCGFetchIntegration } from '../src/integrations/wintercg-fetch'; diff --git a/packages/vue/package.json b/packages/vue/package.json index 037f6f7fad0d..319202081122 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -40,8 +40,7 @@ }, "dependencies": { "@sentry/browser": "8.40.0", - "@sentry/core": "8.40.0", - "@sentry/types": "8.40.0" + "@sentry/core": "8.40.0" }, "peerDependencies": { "pinia": "2.x", diff --git a/packages/vue/src/browserTracingIntegration.ts b/packages/vue/src/browserTracingIntegration.ts index e3d178628724..8f542ddf1b1d 100644 --- a/packages/vue/src/browserTracingIntegration.ts +++ b/packages/vue/src/browserTracingIntegration.ts @@ -2,7 +2,7 @@ import { browserTracingIntegration as originalBrowserTracingIntegration, startBrowserTracingNavigationSpan, } from '@sentry/browser'; -import type { Integration, StartSpanOptions } from '@sentry/types'; +import type { Integration, StartSpanOptions } from '@sentry/core'; import { instrumentVueRouter } from './router'; // The following type is an intersection of the Route type from VueRouter v2, v3, and v4. diff --git a/packages/vue/src/router.ts b/packages/vue/src/router.ts index 8e8bf32ac172..73211c6cfc40 100644 --- a/packages/vue/src/router.ts +++ b/packages/vue/src/router.ts @@ -7,7 +7,7 @@ import { getRootSpan, spanToJSON, } from '@sentry/core'; -import type { Span, SpanAttributes, StartSpanOptions, TransactionSource } from '@sentry/types'; +import type { Span, SpanAttributes, StartSpanOptions, TransactionSource } from '@sentry/core'; // The following type is an intersection of the Route type from VueRouter v2, v3, and v4. // This is not great, but kinda necessary to make it work with all versions at the same time. diff --git a/packages/vue/src/sdk.ts b/packages/vue/src/sdk.ts index 54025ea052ee..97698255877d 100644 --- a/packages/vue/src/sdk.ts +++ b/packages/vue/src/sdk.ts @@ -1,6 +1,6 @@ import { SDK_VERSION, getDefaultIntegrations, init as browserInit } from '@sentry/browser'; -import type { Client } from '@sentry/types'; +import type { Client } from '@sentry/core'; import { vueIntegration } from './integration'; import type { Options, TracingOptions } from './types'; diff --git a/packages/vue/src/tracing.ts b/packages/vue/src/tracing.ts index 8170516eea16..055e46039d66 100644 --- a/packages/vue/src/tracing.ts +++ b/packages/vue/src/tracing.ts @@ -1,6 +1,6 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, getActiveSpan, startInactiveSpan } from '@sentry/browser'; import { logger, timestampInSeconds } from '@sentry/core'; -import type { Span } from '@sentry/types'; +import type { Span } from '@sentry/core'; import { DEFAULT_HOOKS } from './constants'; import { DEBUG_BUILD } from './debug-build'; diff --git a/packages/vue/test/integration/VueIntegration.test.ts b/packages/vue/test/integration/VueIntegration.test.ts index 52445a353d23..9b59ccc18897 100644 --- a/packages/vue/test/integration/VueIntegration.test.ts +++ b/packages/vue/test/integration/VueIntegration.test.ts @@ -5,7 +5,7 @@ import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'; import { logger } from '@sentry/core'; -import type { Client } from '@sentry/types'; +import type { Client } from '@sentry/core'; import { createApp } from 'vue'; import * as Sentry from '../../src'; diff --git a/packages/vue/test/integration/init.test.ts b/packages/vue/test/integration/init.test.ts index 699f99a7057c..4b2e8fbea826 100644 --- a/packages/vue/test/integration/init.test.ts +++ b/packages/vue/test/integration/init.test.ts @@ -6,7 +6,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; import { createApp } from 'vue'; -import type { Client } from '@sentry/types'; +import type { Client } from '@sentry/core'; import type { Options } from '../../src/types'; import * as Sentry from './../../src'; diff --git a/packages/vue/test/router.test.ts b/packages/vue/test/router.test.ts index 1da5097b11e0..886423b452bb 100644 --- a/packages/vue/test/router.test.ts +++ b/packages/vue/test/router.test.ts @@ -3,7 +3,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest'; import * as SentryBrowser from '@sentry/browser'; import * as SentryCore from '@sentry/core'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core'; -import type { Span, SpanAttributes } from '@sentry/types'; +import type { Span, SpanAttributes } from '@sentry/core'; import type { Route } from '../src/router'; import { instrumentVueRouter } from '../src/router'; diff --git a/packages/wasm/package.json b/packages/wasm/package.json index 13d5d44d55bf..075de3615e4f 100644 --- a/packages/wasm/package.json +++ b/packages/wasm/package.json @@ -40,8 +40,7 @@ }, "dependencies": { "@sentry/browser": "8.40.0", - "@sentry/core": "8.40.0", - "@sentry/types": "8.40.0" + "@sentry/core": "8.40.0" }, "scripts": { "build": "run-p build:transpile build:bundle build:types", diff --git a/packages/wasm/src/index.ts b/packages/wasm/src/index.ts index 832a7e89b687..adad9fa35480 100644 --- a/packages/wasm/src/index.ts +++ b/packages/wasm/src/index.ts @@ -1,5 +1,5 @@ import { defineIntegration } from '@sentry/core'; -import type { Event, IntegrationFn, StackFrame } from '@sentry/types'; +import type { Event, IntegrationFn, StackFrame } from '@sentry/core'; import { patchWebAssembly } from './patchWebAssembly'; import { getImage, getImages } from './registry'; diff --git a/packages/wasm/src/registry.ts b/packages/wasm/src/registry.ts index 989022901709..aa8c5e313dc4 100644 --- a/packages/wasm/src/registry.ts +++ b/packages/wasm/src/registry.ts @@ -1,4 +1,4 @@ -import type { DebugImage } from '@sentry/types'; +import type { DebugImage } from '@sentry/core'; export const IMAGES: Array = []; diff --git a/scripts/build-types-watch.ts b/scripts/build-types-watch.ts index c94cb62f4063..4c8c2bf4559f 100644 --- a/scripts/build-types-watch.ts +++ b/scripts/build-types-watch.ts @@ -3,7 +3,7 @@ * If `yarn build:types:watch` is run without types files previously having been created, the build will get stuck in an * errored state. This happens because lerna runs all of the packages' `yarn build:types:watch` statements in parallel, * and so packages like `@sentry/browser` will at first be missing types they import from packages like `@sentry/core` - * and `@sentry/types`, causing errors to be thrown. Normally this is fine, because as the dependencies' types get + * and `@sentry/core`, causing errors to be thrown. Normally this is fine, because as the dependencies' types get * built, file changes will be detected and the dependent packages' types will try again to build themselves. There * might be several rounds of this, but in theory, eventually all packages should end up with an error-free build. For * whatever reason, though, at a certain point the process hangs, either because changes stop being detected or because From aba990dc76bb47541cb6b4e9c4dd7f98c8ce8140 Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Thu, 28 Nov 2024 13:01:18 +0000 Subject: [PATCH 4/7] . --- packages/core/src/integration.ts | 8 +++++--- packages/solidstart/test/client/sdk.test.ts | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/core/src/integration.ts b/packages/core/src/integration.ts index 9c72e7baad4c..f4432ebf2d0a 100644 --- a/packages/core/src/integration.ts +++ b/packages/core/src/integration.ts @@ -11,6 +11,8 @@ export type IntegrationIndex = { [key: string]: Integration; }; +type IntegrationWithDefaultInstance = Integration & { isDefaultInstance?: true }; + /** * Remove duplicates from the given array, preferring the last instance of any duplicate. Not guaranteed to * preserve the order of integrations in the array. @@ -20,10 +22,10 @@ export type IntegrationIndex = { function filterDuplicates(integrations: Integration[]): Integration[] { const integrationsByName: { [key: string]: Integration } = {}; - integrations.forEach(currentInstance => { + integrations.forEach((currentInstance: IntegrationWithDefaultInstance) => { const { name } = currentInstance; - const existingInstance = integrationsByName[name]; + const existingInstance: IntegrationWithDefaultInstance | undefined = integrationsByName[name]; // We want integrations later in the array to overwrite earlier ones of the same type, except that we never want a // default instance to overwrite an existing user instance @@ -43,7 +45,7 @@ export function getIntegrationsToSetup(options: Pick { + defaultIntegrations.forEach((integration: IntegrationWithDefaultInstance) => { integration.isDefaultInstance = true; }); diff --git a/packages/solidstart/test/client/sdk.test.ts b/packages/solidstart/test/client/sdk.test.ts index b242e03ceb70..dc0df6993b81 100644 --- a/packages/solidstart/test/client/sdk.test.ts +++ b/packages/solidstart/test/client/sdk.test.ts @@ -46,6 +46,7 @@ describe('browserTracingIntegration', () => { ?.getOptions() .integrations.find(integration => integration.name === 'BrowserTracing'); expect(browserTracingIntegration).toBeDefined(); + // @ts-expect-error Non public field expect(browserTracingIntegration!.isDefaultInstance).toEqual(true); }); @@ -76,6 +77,7 @@ describe('browserTracingIntegration', () => { ?.getOptions() .integrations.find(integration => integration.name === 'BrowserTracing'); expect(browserTracingIntegration).toBeDefined(); + // @ts-expect-error Non public field expect(browserTracingIntegration!.isDefaultInstance).toBeUndefined(); }); }); From 6d6ad9cdc477b180a3a3f1ae69eb93b70aad22b5 Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Thu, 28 Nov 2024 13:26:47 +0000 Subject: [PATCH 5/7] lint --- packages/types/src/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index 50c7731ccefe..4d428476532b 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -61,6 +61,7 @@ export type { Exception, Extra, Extras, + // eslint-disable-next-line deprecation/deprecation Hub, Integration, IntegrationClass, @@ -98,6 +99,7 @@ export type { UserFeedback, QueryParams, RequestEventData, + // eslint-disable-next-line deprecation/deprecation Request, SanitizedRequestData, Runtime, From 47bf78e5f01dae870dd9ab7515319d50a3a5e988 Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Thu, 28 Nov 2024 13:55:09 +0000 Subject: [PATCH 6/7] feat(types): Deprecate `@sentry/types` in favor of `@sentry/core` --- docs/migration/draft-v9-migration-guide.md | 2 + packages/types/README.md | 6 +- packages/types/src/index.ts | 760 +++++++++++++++------ 3 files changed, 576 insertions(+), 192 deletions(-) diff --git a/docs/migration/draft-v9-migration-guide.md b/docs/migration/draft-v9-migration-guide.md index fb62a6635e0d..b70b314d8f98 100644 --- a/docs/migration/draft-v9-migration-guide.md +++ b/docs/migration/draft-v9-migration-guide.md @@ -66,6 +66,8 @@ ## `@sentry/types` +- **The `@sentry/types` package has been deprecated. Import everything from `@sentry/core` instead.** + - Deprecated `Request` in favor of `RequestEventData`. ## `@sentry/vue` diff --git a/packages/types/README.md b/packages/types/README.md index 4c0e2d9cbc34..a7fa71c4421b 100644 --- a/packages/types/README.md +++ b/packages/types/README.md @@ -4,7 +4,11 @@

-# Sentry JavaScript SDK Types +# Sentry JavaScript SDK Types (DEPRECATED) + +> DEPRECATION NOTICE: The `@sentry/types` package is deprecated. +> All exports have been moved to `@sentry/core`. +> Import everything from `@sentry/core` instead. [![npm version](https://img.shields.io/npm/v/@sentry/types.svg)](https://www.npmjs.com/package/@sentry/types) [![npm dm](https://img.shields.io/npm/dm/@sentry/types.svg)](https://www.npmjs.com/package/@sentry/types) diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index 4d428476532b..372e5e854a87 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -1,192 +1,570 @@ -export type { - Attachment, - Breadcrumb, - BreadcrumbHint, - FetchBreadcrumbData, - XhrBreadcrumbData, - FetchBreadcrumbHint, - XhrBreadcrumbHint, - Client, - ClientReport, - Outcome, - EventDropReason, - Context, - Contexts, - DeviceContext, - OsContext, - AppContext, - CultureContext, - TraceContext, - CloudResourceContext, - MissingInstrumentationContext, - DataCategory, - DsnComponents, - DsnLike, - DsnProtocol, - DebugImage, - DebugMeta, - AttachmentItem, - BaseEnvelopeHeaders, - BaseEnvelopeItemHeaders, - ClientReportEnvelope, - ClientReportItem, - DynamicSamplingContext, - Envelope, - EnvelopeItemType, - EnvelopeItem, - EventEnvelope, - EventEnvelopeHeaders, - EventItem, - ReplayEnvelope, - FeedbackItem, - SessionEnvelope, - SessionItem, - UserFeedbackItem, - CheckInItem, - CheckInEnvelope, - StatsdItem, - StatsdEnvelope, - ProfileItem, - ProfileChunkEnvelope, - ProfileChunkItem, - SpanEnvelope, - SpanItem, - ExtendedError, - Event, - EventHint, - EventType, - ErrorEvent, - TransactionEvent, - EventProcessor, - Exception, - Extra, - Extras, - // eslint-disable-next-line deprecation/deprecation - Hub, - Integration, - IntegrationClass, - IntegrationFn, - Mechanism, - ExtractedNodeRequestData, - HttpHeaderValue, - Primitive, - WorkerLocation, - ClientOptions, - Options, - Package, - PolymorphicEvent, - PolymorphicRequest, - ThreadId, - FrameId, - StackId, - ThreadCpuSample, - ThreadCpuStack, - ThreadCpuFrame, - ThreadCpuProfile, - ContinuousThreadCpuProfile, - Profile, - ProfileChunk, - ReplayEvent, - ReplayRecordingData, - ReplayRecordingMode, - FeedbackEvent, - FeedbackFormData, - FeedbackInternalOptions, - FeedbackModalIntegration, - FeedbackScreenshotIntegration, - SendFeedback, - SendFeedbackParams, - UserFeedback, - QueryParams, - RequestEventData, - // eslint-disable-next-line deprecation/deprecation - Request, - SanitizedRequestData, - Runtime, - CaptureContext, - Scope, - ScopeContext, - ScopeData, - SdkInfo, - SdkMetadata, - SessionAggregates, - AggregationCounts, - Session, - SessionContext, - SessionStatus, - RequestSession, - RequestSessionStatus, - SessionFlusherLike, - SerializedSession, - SeverityLevel, - Span, - SentrySpanArguments, - SpanOrigin, - SpanAttributeValue, - SpanAttributes, - SpanTimeInput, - SpanJSON, - SpanContextData, - TraceFlag, - MetricSummary, - SpanStatus, - TimedEvent, - StackFrame, - Stacktrace, - StackParser, - StackLineParser, - StackLineParserFn, - PropagationContext, - TracePropagationTargets, - SerializedTraceData, - StartSpanOptions, - TraceparentData, - TransactionSource, - CustomSamplingContext, - SamplingContext, - DurationUnit, - InformationUnit, - FractionUnit, - MeasurementUnit, - NoneUnit, - Measurements, - Thread, - Transport, - TransportRequest, - TransportMakeRequestResponse, - InternalBaseTransportOptions, - BaseTransportOptions, - TransportRequestExecutor, - User, - WebFetchHeaders, - WebFetchRequest, - WrappedFunction, - HandlerDataFetch, - HandlerDataXhr, - HandlerDataDom, - HandlerDataConsole, - HandlerDataHistory, - HandlerDataError, - HandlerDataUnhandledRejection, - ConsoleLevel, - SentryXhrData, - SentryWrappedXMLHttpRequest, - BrowserClientReplayOptions, - BrowserClientProfilingOptions, - CheckIn, - MonitorConfig, - FinishedCheckIn, - InProgressCheckIn, - SerializedCheckIn, - MetricsAggregator, - MetricBucketItem, - MetricInstance, - MetricData, - Metrics, - ParameterizedString, - ContinuousProfiler, - ProfilingIntegration, - Profiler, - ViewHierarchyData, - ViewHierarchyWindow, +/* eslint-disable max-lines */ +import type { + AggregationCounts as AggregationCounts_imported, + AppContext as AppContext_imported, + Attachment as Attachment_imported, + AttachmentItem as AttachmentItem_imported, + BaseEnvelopeHeaders as BaseEnvelopeHeaders_imported, + BaseEnvelopeItemHeaders as BaseEnvelopeItemHeaders_imported, + BaseTransportOptions as BaseTransportOptions_imported, + Breadcrumb as Breadcrumb_imported, + BreadcrumbHint as BreadcrumbHint_imported, + BrowserClientProfilingOptions as BrowserClientProfilingOptions_imported, + BrowserClientReplayOptions as BrowserClientReplayOptions_imported, + CaptureContext as CaptureContext_imported, + CheckIn as CheckIn_imported, + CheckInEnvelope as CheckInEnvelope_imported, + CheckInItem as CheckInItem_imported, + Client as Client_imported, + ClientOptions as ClientOptions_imported, + ClientReport as ClientReport_imported, + ClientReportEnvelope as ClientReportEnvelope_imported, + ClientReportItem as ClientReportItem_imported, + CloudResourceContext as CloudResourceContext_imported, + ConsoleLevel as ConsoleLevel_imported, + Context as Context_imported, + Contexts as Contexts_imported, + ContinuousProfiler as ContinuousProfiler_imported, + ContinuousThreadCpuProfile as ContinuousThreadCpuProfile_imported, + CultureContext as CultureContext_imported, + CustomSamplingContext as CustomSamplingContext_imported, + DataCategory as DataCategory_imported, + DebugImage as DebugImage_imported, + DebugMeta as DebugMeta_imported, + DeviceContext as DeviceContext_imported, + DsnComponents as DsnComponents_imported, + DsnLike as DsnLike_imported, + DsnProtocol as DsnProtocol_imported, + DurationUnit as DurationUnit_imported, + DynamicSamplingContext as DynamicSamplingContext_imported, + Envelope as Envelope_imported, + EnvelopeItem as EnvelopeItem_imported, + EnvelopeItemType as EnvelopeItemType_imported, + ErrorEvent as ErrorEvent_imported, + Event as Event_imported, + EventDropReason as EventDropReason_imported, + EventEnvelope as EventEnvelope_imported, + EventEnvelopeHeaders as EventEnvelopeHeaders_imported, + EventHint as EventHint_imported, + EventItem as EventItem_imported, + EventProcessor as EventProcessor_imported, + EventType as EventType_imported, + Exception as Exception_imported, + ExtendedError as ExtendedError_imported, + Extra as Extra_imported, + ExtractedNodeRequestData as ExtractedNodeRequestData_imported, + Extras as Extras_imported, + FeedbackEvent as FeedbackEvent_imported, + FeedbackFormData as FeedbackFormData_imported, + FeedbackInternalOptions as FeedbackInternalOptions_imported, + FeedbackItem as FeedbackItem_imported, + FeedbackModalIntegration as FeedbackModalIntegration_imported, + FeedbackScreenshotIntegration as FeedbackScreenshotIntegration_imported, + FetchBreadcrumbData as FetchBreadcrumbData_imported, + FetchBreadcrumbHint as FetchBreadcrumbHint_imported, + FinishedCheckIn as FinishedCheckIn_imported, + FractionUnit as FractionUnit_imported, + FrameId as FrameId_imported, + HandlerDataConsole as HandlerDataConsole_imported, + HandlerDataDom as HandlerDataDom_imported, + HandlerDataError as HandlerDataError_imported, + HandlerDataFetch as HandlerDataFetch_imported, + HandlerDataHistory as HandlerDataHistory_imported, + HandlerDataUnhandledRejection as HandlerDataUnhandledRejection_imported, + HandlerDataXhr as HandlerDataXhr_imported, + HttpHeaderValue as HttpHeaderValue_imported, + Hub as Hub_imported, + InProgressCheckIn as InProgressCheckIn_imported, + InformationUnit as InformationUnit_imported, + Integration as Integration_imported, + IntegrationClass as IntegrationClass_imported, + IntegrationFn as IntegrationFn_imported, + InternalBaseTransportOptions as InternalBaseTransportOptions_imported, + MeasurementUnit as MeasurementUnit_imported, + Measurements as Measurements_imported, + Mechanism as Mechanism_imported, + MetricBucketItem as MetricBucketItem_imported, + MetricData as MetricData_imported, + MetricInstance as MetricInstance_imported, + MetricSummary as MetricSummary_imported, + Metrics as Metrics_imported, + MetricsAggregator as MetricsAggregator_imported, + MissingInstrumentationContext as MissingInstrumentationContext_imported, + MonitorConfig as MonitorConfig_imported, + NoneUnit as NoneUnit_imported, + Options as Options_imported, + OsContext as OsContext_imported, + Outcome as Outcome_imported, + Package as Package_imported, + ParameterizedString as ParameterizedString_imported, + PolymorphicEvent as PolymorphicEvent_imported, + PolymorphicRequest as PolymorphicRequest_imported, + Primitive as Primitive_imported, + Profile as Profile_imported, + ProfileChunk as ProfileChunk_imported, + ProfileChunkEnvelope as ProfileChunkEnvelope_imported, + ProfileChunkItem as ProfileChunkItem_imported, + ProfileItem as ProfileItem_imported, + Profiler as Profiler_imported, + ProfilingIntegration as ProfilingIntegration_imported, + PropagationContext as PropagationContext_imported, + QueryParams as QueryParams_imported, + ReplayEnvelope as ReplayEnvelope_imported, + ReplayEvent as ReplayEvent_imported, + ReplayRecordingData as ReplayRecordingData_imported, + ReplayRecordingMode as ReplayRecordingMode_imported, + Request as Request_imported, + RequestEventData as RequestEventData_imported, + RequestSession as RequestSession_imported, + RequestSessionStatus as RequestSessionStatus_imported, + Runtime as Runtime_imported, + SamplingContext as SamplingContext_imported, + SanitizedRequestData as SanitizedRequestData_imported, + Scope as Scope_imported, + ScopeContext as ScopeContext_imported, + ScopeData as ScopeData_imported, + SdkInfo as SdkInfo_imported, + SdkMetadata as SdkMetadata_imported, + SendFeedback as SendFeedback_imported, + SendFeedbackParams as SendFeedbackParams_imported, + SentrySpanArguments as SentrySpanArguments_imported, + SentryWrappedXMLHttpRequest as SentryWrappedXMLHttpRequest_imported, + SentryXhrData as SentryXhrData_imported, + SerializedCheckIn as SerializedCheckIn_imported, + SerializedSession as SerializedSession_imported, + SerializedTraceData as SerializedTraceData_imported, + Session as Session_imported, + SessionAggregates as SessionAggregates_imported, + SessionContext as SessionContext_imported, + SessionEnvelope as SessionEnvelope_imported, + SessionFlusherLike as SessionFlusherLike_imported, + SessionItem as SessionItem_imported, + SessionStatus as SessionStatus_imported, + SeverityLevel as SeverityLevel_imported, + Span as Span_imported, + SpanAttributeValue as SpanAttributeValue_imported, + SpanAttributes as SpanAttributes_imported, + SpanContextData as SpanContextData_imported, + SpanEnvelope as SpanEnvelope_imported, + SpanItem as SpanItem_imported, + SpanJSON as SpanJSON_imported, + SpanOrigin as SpanOrigin_imported, + SpanStatus as SpanStatus_imported, + SpanTimeInput as SpanTimeInput_imported, + StackFrame as StackFrame_imported, + StackId as StackId_imported, + StackLineParser as StackLineParser_imported, + StackLineParserFn as StackLineParserFn_imported, + StackParser as StackParser_imported, + Stacktrace as Stacktrace_imported, + StartSpanOptions as StartSpanOptions_imported, + StatsdEnvelope as StatsdEnvelope_imported, + StatsdItem as StatsdItem_imported, + Thread as Thread_imported, + ThreadCpuFrame as ThreadCpuFrame_imported, + ThreadCpuProfile as ThreadCpuProfile_imported, + ThreadCpuSample as ThreadCpuSample_imported, + ThreadCpuStack as ThreadCpuStack_imported, + ThreadId as ThreadId_imported, + TimedEvent as TimedEvent_imported, + TraceContext as TraceContext_imported, + TraceFlag as TraceFlag_imported, + TracePropagationTargets as TracePropagationTargets_imported, + TraceparentData as TraceparentData_imported, + TransactionEvent as TransactionEvent_imported, + TransactionSource as TransactionSource_imported, + Transport as Transport_imported, + TransportMakeRequestResponse as TransportMakeRequestResponse_imported, + TransportRequest as TransportRequest_imported, + TransportRequestExecutor as TransportRequestExecutor_imported, + User as User_imported, + UserFeedback as UserFeedback_imported, + UserFeedbackItem as UserFeedbackItem_imported, + ViewHierarchyData as ViewHierarchyData_imported, + ViewHierarchyWindow as ViewHierarchyWindow_imported, + WebFetchHeaders as WebFetchHeaders_imported, + WebFetchRequest as WebFetchRequest_imported, + WorkerLocation as WorkerLocation_imported, + WrappedFunction as WrappedFunction_imported, + XhrBreadcrumbData as XhrBreadcrumbData_imported, + XhrBreadcrumbHint as XhrBreadcrumbHint_imported, } from '@sentry/core'; + +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Attachment = Attachment_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Breadcrumb = Breadcrumb_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type BreadcrumbHint = BreadcrumbHint_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type FetchBreadcrumbData = FetchBreadcrumbData_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type XhrBreadcrumbData = XhrBreadcrumbData_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type FetchBreadcrumbHint = FetchBreadcrumbHint_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type XhrBreadcrumbHint = XhrBreadcrumbHint_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Client = Client_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ClientReport = ClientReport_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Outcome = Outcome_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type EventDropReason = EventDropReason_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Context = Context_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Contexts = Contexts_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type DeviceContext = DeviceContext_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type OsContext = OsContext_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type AppContext = AppContext_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type CultureContext = CultureContext_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type TraceContext = TraceContext_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type CloudResourceContext = CloudResourceContext_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type MissingInstrumentationContext = MissingInstrumentationContext_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type DataCategory = DataCategory_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type DsnComponents = DsnComponents_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type DsnLike = DsnLike_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type DsnProtocol = DsnProtocol_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type DebugImage = DebugImage_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type DebugMeta = DebugMeta_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type AttachmentItem = AttachmentItem_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type BaseEnvelopeHeaders = BaseEnvelopeHeaders_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type BaseEnvelopeItemHeaders = BaseEnvelopeItemHeaders_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ClientReportEnvelope = ClientReportEnvelope_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ClientReportItem = ClientReportItem_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type DynamicSamplingContext = DynamicSamplingContext_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Envelope = Envelope_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type EnvelopeItemType = EnvelopeItemType_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type EnvelopeItem = EnvelopeItem_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type EventEnvelope = EventEnvelope_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type EventEnvelopeHeaders = EventEnvelopeHeaders_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type EventItem = EventItem_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ReplayEnvelope = ReplayEnvelope_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type FeedbackItem = FeedbackItem_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SessionEnvelope = SessionEnvelope_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SessionItem = SessionItem_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type UserFeedbackItem = UserFeedbackItem_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type CheckInItem = CheckInItem_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type CheckInEnvelope = CheckInEnvelope_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type StatsdItem = StatsdItem_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type StatsdEnvelope = StatsdEnvelope_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ProfileItem = ProfileItem_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ProfileChunkEnvelope = ProfileChunkEnvelope_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ProfileChunkItem = ProfileChunkItem_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SpanEnvelope = SpanEnvelope_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SpanItem = SpanItem_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ExtendedError = ExtendedError_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Event = Event_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type EventHint = EventHint_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type EventType = EventType_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ErrorEvent = ErrorEvent_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type TransactionEvent = TransactionEvent_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type EventProcessor = EventProcessor_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Exception = Exception_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Extra = Extra_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Extras = Extras_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +// eslint-disable-next-line deprecation/deprecation +export type Hub = Hub_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Integration = Integration_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type IntegrationClass = IntegrationClass_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type IntegrationFn = IntegrationFn_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Mechanism = Mechanism_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ExtractedNodeRequestData = ExtractedNodeRequestData_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type HttpHeaderValue = HttpHeaderValue_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Primitive = Primitive_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type WorkerLocation = WorkerLocation_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ClientOptions = ClientOptions_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Options = Options_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Package = Package_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type PolymorphicEvent = PolymorphicEvent_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type PolymorphicRequest = PolymorphicRequest_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ThreadId = ThreadId_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type FrameId = FrameId_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type StackId = StackId_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ThreadCpuSample = ThreadCpuSample_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ThreadCpuStack = ThreadCpuStack_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ThreadCpuFrame = ThreadCpuFrame_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ThreadCpuProfile = ThreadCpuProfile_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ContinuousThreadCpuProfile = ContinuousThreadCpuProfile_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Profile = Profile_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ProfileChunk = ProfileChunk_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ReplayEvent = ReplayEvent_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ReplayRecordingData = ReplayRecordingData_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ReplayRecordingMode = ReplayRecordingMode_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type FeedbackEvent = FeedbackEvent_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type FeedbackFormData = FeedbackFormData_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type FeedbackInternalOptions = FeedbackInternalOptions_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type FeedbackModalIntegration = FeedbackModalIntegration_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type FeedbackScreenshotIntegration = FeedbackScreenshotIntegration_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SendFeedback = SendFeedback_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SendFeedbackParams = SendFeedbackParams_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type UserFeedback = UserFeedback_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type QueryParams = QueryParams_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type RequestEventData = RequestEventData_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +// eslint-disable-next-line deprecation/deprecation +export type Request = Request_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SanitizedRequestData = SanitizedRequestData_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Runtime = Runtime_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type CaptureContext = CaptureContext_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Scope = Scope_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ScopeContext = ScopeContext_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ScopeData = ScopeData_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SdkInfo = SdkInfo_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SdkMetadata = SdkMetadata_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SessionAggregates = SessionAggregates_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type AggregationCounts = AggregationCounts_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Session = Session_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SessionContext = SessionContext_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SessionStatus = SessionStatus_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type RequestSession = RequestSession_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type RequestSessionStatus = RequestSessionStatus_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SessionFlusherLike = SessionFlusherLike_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SerializedSession = SerializedSession_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SeverityLevel = SeverityLevel_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Span = Span_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SentrySpanArguments = SentrySpanArguments_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SpanOrigin = SpanOrigin_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SpanAttributeValue = SpanAttributeValue_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SpanAttributes = SpanAttributes_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SpanTimeInput = SpanTimeInput_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SpanJSON = SpanJSON_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SpanContextData = SpanContextData_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type TraceFlag = TraceFlag_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type MetricSummary = MetricSummary_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SpanStatus = SpanStatus_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type TimedEvent = TimedEvent_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type StackFrame = StackFrame_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Stacktrace = Stacktrace_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type StackParser = StackParser_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type StackLineParser = StackLineParser_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type StackLineParserFn = StackLineParserFn_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type PropagationContext = PropagationContext_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type TracePropagationTargets = TracePropagationTargets_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SerializedTraceData = SerializedTraceData_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type StartSpanOptions = StartSpanOptions_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type TraceparentData = TraceparentData_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type TransactionSource = TransactionSource_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type CustomSamplingContext = CustomSamplingContext_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SamplingContext = SamplingContext_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type DurationUnit = DurationUnit_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type InformationUnit = InformationUnit_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type FractionUnit = FractionUnit_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type MeasurementUnit = MeasurementUnit_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type NoneUnit = NoneUnit_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Measurements = Measurements_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Thread = Thread_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Transport = Transport_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type TransportRequest = TransportRequest_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type TransportMakeRequestResponse = TransportMakeRequestResponse_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type InternalBaseTransportOptions = InternalBaseTransportOptions_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type BaseTransportOptions = BaseTransportOptions_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type TransportRequestExecutor = TransportRequestExecutor_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type User = User_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type WebFetchHeaders = WebFetchHeaders_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type WebFetchRequest = WebFetchRequest_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type WrappedFunction = WrappedFunction_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type HandlerDataFetch = HandlerDataFetch_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type HandlerDataXhr = HandlerDataXhr_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type HandlerDataDom = HandlerDataDom_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type HandlerDataConsole = HandlerDataConsole_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type HandlerDataHistory = HandlerDataHistory_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type HandlerDataError = HandlerDataError_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type HandlerDataUnhandledRejection = HandlerDataUnhandledRejection_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ConsoleLevel = ConsoleLevel_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SentryXhrData = SentryXhrData_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SentryWrappedXMLHttpRequest = SentryWrappedXMLHttpRequest_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type BrowserClientReplayOptions = BrowserClientReplayOptions_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type BrowserClientProfilingOptions = BrowserClientProfilingOptions_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type CheckIn = CheckIn_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type MonitorConfig = MonitorConfig_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type FinishedCheckIn = FinishedCheckIn_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type InProgressCheckIn = InProgressCheckIn_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type SerializedCheckIn = SerializedCheckIn_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type MetricsAggregator = MetricsAggregator_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type MetricBucketItem = MetricBucketItem_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type MetricInstance = MetricInstance_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type MetricData = MetricData_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Metrics = Metrics_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ParameterizedString = ParameterizedString_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ContinuousProfiler = ContinuousProfiler_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ProfilingIntegration = ProfilingIntegration_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type Profiler = Profiler_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ViewHierarchyData = ViewHierarchyData_imported; +/** @deprecated This type has been moved to `@sentry/core`. */ +export type ViewHierarchyWindow = ViewHierarchyWindow_imported; From ae119aef0ffeecf16b81c0807b73994bcfc78e57 Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Thu, 28 Nov 2024 15:01:33 +0000 Subject: [PATCH 7/7] missed --- .../instrumentation/eventListener/event-target/test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/event-target/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/event-target/test.ts index 7900c774a914..513b3911422a 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/event-target/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/event-target/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; import { sentryTest } from '../../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';