diff --git a/dev-packages/e2e-tests/package.json b/dev-packages/e2e-tests/package.json index 50e330451e..0d21a29e3b 100644 --- a/dev-packages/e2e-tests/package.json +++ b/dev-packages/e2e-tests/package.json @@ -13,8 +13,8 @@ "devDependencies": { "@babel/preset-env": "^7.25.3", "@babel/preset-typescript": "^7.18.6", + "@sentry/core": "8.41.0", "@sentry/react-native": "6.4.0", - "@sentry/utils": "8.41.0", "@types/node": "^20.9.3", "@types/react": "^18.2.64", "appium": "2.4.1", diff --git a/dev-packages/e2e-tests/patch-scripts/rn.patch.app.build.gradle.js b/dev-packages/e2e-tests/patch-scripts/rn.patch.app.build.gradle.js index aadf38979a..8eec66240b 100755 --- a/dev-packages/e2e-tests/patch-scripts/rn.patch.app.build.gradle.js +++ b/dev-packages/e2e-tests/patch-scripts/rn.patch.app.build.gradle.js @@ -4,7 +4,7 @@ const fs = require('fs'); const { argv } = require('process'); const parseArgs = require('minimist'); -const { logger } = require('@sentry/utils'); +const { logger } = require('@sentry/core'); logger.enable(); const args = parseArgs(argv.slice(2)); diff --git a/dev-packages/e2e-tests/patch-scripts/rn.patch.app.js b/dev-packages/e2e-tests/patch-scripts/rn.patch.app.js index fcee381601..a670278da1 100755 --- a/dev-packages/e2e-tests/patch-scripts/rn.patch.app.js +++ b/dev-packages/e2e-tests/patch-scripts/rn.patch.app.js @@ -5,7 +5,7 @@ const path = require('path'); const { argv, env } = require('process'); const parseArgs = require('minimist'); -const { logger } = require('@sentry/utils'); +const { logger } = require('@sentry/core'); logger.enable(); const SENTRY_RELEASE = env.SENTRY_RELEASE; diff --git a/dev-packages/e2e-tests/patch-scripts/rn.patch.gradle.properties.js b/dev-packages/e2e-tests/patch-scripts/rn.patch.gradle.properties.js index f968c15cc2..2292e52a3e 100755 --- a/dev-packages/e2e-tests/patch-scripts/rn.patch.gradle.properties.js +++ b/dev-packages/e2e-tests/patch-scripts/rn.patch.gradle.properties.js @@ -4,7 +4,7 @@ const fs = require('fs'); const { argv } = require('process'); const parseArgs = require('minimist'); -const { logger } = require('@sentry/utils'); +const { logger } = require('@sentry/core'); logger.enable(); const args = parseArgs(argv.slice(2)); diff --git a/dev-packages/e2e-tests/patch-scripts/rn.patch.metro.config.js b/dev-packages/e2e-tests/patch-scripts/rn.patch.metro.config.js index f4354c2153..b92d2a983b 100755 --- a/dev-packages/e2e-tests/patch-scripts/rn.patch.metro.config.js +++ b/dev-packages/e2e-tests/patch-scripts/rn.patch.metro.config.js @@ -4,7 +4,7 @@ const fs = require('fs'); const { argv } = require('process'); const parseArgs = require('minimist'); -const { logger } = require('@sentry/utils'); +const { logger } = require('@sentry/core'); logger.enable(); const args = parseArgs(argv.slice(2)); diff --git a/dev-packages/e2e-tests/patch-scripts/rn.patch.podfile.js b/dev-packages/e2e-tests/patch-scripts/rn.patch.podfile.js index a3ef8c65cc..44aed0693c 100755 --- a/dev-packages/e2e-tests/patch-scripts/rn.patch.podfile.js +++ b/dev-packages/e2e-tests/patch-scripts/rn.patch.podfile.js @@ -4,7 +4,7 @@ const fs = require('fs'); const { argv } = require('process'); const parseArgs = require('minimist'); -const { logger } = require('@sentry/utils'); +const { logger } = require('@sentry/core'); logger.enable(); const args = parseArgs(argv.slice(2)); diff --git a/dev-packages/e2e-tests/patch-scripts/rn.patch.xcode.js b/dev-packages/e2e-tests/patch-scripts/rn.patch.xcode.js index ba5f14eec4..f9be9e3329 100755 --- a/dev-packages/e2e-tests/patch-scripts/rn.patch.xcode.js +++ b/dev-packages/e2e-tests/patch-scripts/rn.patch.xcode.js @@ -6,7 +6,7 @@ const { argv } = require('process'); const xcode = require('xcode'); const parseArgs = require('minimist'); const semver = require('semver'); -const { logger } = require('@sentry/utils'); +const { logger } = require('@sentry/core'); logger.enable(); const args = parseArgs(argv.slice(2)); diff --git a/packages/core/package.json b/packages/core/package.json index d44521b163..894c1c8670 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -33,7 +33,7 @@ "test:sdk": "npx jest", "test:tools": "npx jest --config jest.config.tools.js", "test:watch": "npx jest --watch", - "yalc:add:sentry-javascript": "yalc add @sentry/browser @sentry/core @sentry/react @sentry/types @sentry/utils", + "yalc:add:sentry-javascript": "yalc add @sentry/browser @sentry/core @sentry/react @sentry/types", "fix": "npx run-s fix:eslint fix:prettier", "fix:eslint": "eslint --config .eslintrc.js --fix .", "fix:prettier": "prettier --config ../../.prettierrc.json --ignore-path ../../.prettierignore --write \"{src,test,scripts,plugin/src}/**/**.ts\"", diff --git a/packages/core/src/js/breadcrumb.ts b/packages/core/src/js/breadcrumb.ts index eaf3388156..c8b43b5290 100644 --- a/packages/core/src/js/breadcrumb.ts +++ b/packages/core/src/js/breadcrumb.ts @@ -1,5 +1,5 @@ +import { severityLevelFromString } from '@sentry/core'; import type { Breadcrumb, SeverityLevel } from '@sentry/types'; -import { severityLevelFromString } from '@sentry/utils'; export const DEFAULT_BREADCRUMB_LEVEL: SeverityLevel = 'info'; diff --git a/packages/core/src/js/client.ts b/packages/core/src/js/client.ts index 1e2c858264..cf623765a7 100644 --- a/packages/core/src/js/client.ts +++ b/packages/core/src/js/client.ts @@ -1,5 +1,5 @@ import { eventFromException, eventFromMessage } from '@sentry/browser'; -import { BaseClient } from '@sentry/core'; +import { BaseClient, dateTimestampInSeconds, logger, SentryError } from '@sentry/core'; import type { ClientReportEnvelope, ClientReportItem, @@ -11,7 +11,6 @@ import type { TransportMakeRequestResponse, UserFeedback, } from '@sentry/types'; -import { dateTimestampInSeconds, logger, SentryError } from '@sentry/utils'; import { Alert } from 'react-native'; import { getDevServer } from './integrations/debugsymbolicatorutils'; diff --git a/packages/core/src/js/integrations/debugsymbolicator.ts b/packages/core/src/js/integrations/debugsymbolicator.ts index 51e66472a2..3aad20b81b 100644 --- a/packages/core/src/js/integrations/debugsymbolicator.ts +++ b/packages/core/src/js/integrations/debugsymbolicator.ts @@ -1,5 +1,5 @@ +import { logger } from '@sentry/core'; import type { Event, EventHint, Exception, Integration, StackFrame as SentryStackFrame } from '@sentry/types'; -import { logger } from '@sentry/utils'; import type { ExtendedError } from '../utils/error'; import { getFramesToPop, isErrorLike } from '../utils/error'; diff --git a/packages/core/src/js/integrations/debugsymbolicatorutils.ts b/packages/core/src/js/integrations/debugsymbolicatorutils.ts index 7015867ac0..41cc4d7d1a 100644 --- a/packages/core/src/js/integrations/debugsymbolicatorutils.ts +++ b/packages/core/src/js/integrations/debugsymbolicatorutils.ts @@ -1,5 +1,5 @@ +import { logger } from '@sentry/core'; import type { StackFrame as SentryStackFrame } from '@sentry/types'; -import { logger } from '@sentry/utils'; import { ReactNativeLibraries } from '../utils/rnlibraries'; import { createStealthXhr, XHR_READYSTATE_DONE } from '../utils/xhr'; diff --git a/packages/core/src/js/integrations/devicecontext.ts b/packages/core/src/js/integrations/devicecontext.ts index 9948557c8a..df32574ed9 100644 --- a/packages/core/src/js/integrations/devicecontext.ts +++ b/packages/core/src/js/integrations/devicecontext.ts @@ -1,6 +1,6 @@ /* eslint-disable complexity */ +import { logger, severityLevelFromString } from '@sentry/core'; import type { Client, Event, EventHint, Integration } from '@sentry/types'; -import { logger, severityLevelFromString } from '@sentry/utils'; import { AppState } from 'react-native'; import { breadcrumbFromObject } from '../breadcrumb'; diff --git a/packages/core/src/js/integrations/modulesloader.ts b/packages/core/src/js/integrations/modulesloader.ts index f354b603c9..bd65e4f69e 100644 --- a/packages/core/src/js/integrations/modulesloader.ts +++ b/packages/core/src/js/integrations/modulesloader.ts @@ -1,5 +1,5 @@ +import { logger } from '@sentry/core'; import type { Event, Integration } from '@sentry/types'; -import { logger } from '@sentry/utils'; import { NATIVE } from '../wrapper'; diff --git a/packages/core/src/js/integrations/nativelinkederrors.ts b/packages/core/src/js/integrations/nativelinkederrors.ts index 5a5a11e544..020a4d5656 100644 --- a/packages/core/src/js/integrations/nativelinkederrors.ts +++ b/packages/core/src/js/integrations/nativelinkederrors.ts @@ -1,4 +1,5 @@ import { exceptionFromError } from '@sentry/browser'; +import { isInstanceOf, isPlainObject, isString } from '@sentry/core'; import type { Client, DebugImage, @@ -10,7 +11,6 @@ import type { StackFrame, StackParser, } from '@sentry/types'; -import { isInstanceOf, isPlainObject, isString } from '@sentry/utils'; import type { NativeStackFrames } from '../NativeRNSentry'; import { NATIVE } from '../wrapper'; diff --git a/packages/core/src/js/integrations/reactnativeerrorhandlers.ts b/packages/core/src/js/integrations/reactnativeerrorhandlers.ts index 2f75d45953..eef7e7812b 100644 --- a/packages/core/src/js/integrations/reactnativeerrorhandlers.ts +++ b/packages/core/src/js/integrations/reactnativeerrorhandlers.ts @@ -1,6 +1,5 @@ -import { captureException, getClient, getCurrentScope } from '@sentry/core'; +import { addExceptionMechanism, captureException, getClient, getCurrentScope, logger } from '@sentry/core'; import type { EventHint, Integration, SeverityLevel } from '@sentry/types'; -import { addExceptionMechanism, logger } from '@sentry/utils'; import { createSyntheticError, isErrorLike } from '../utils/error'; import { RN_GLOBAL_OBJ } from '../utils/worldwide'; diff --git a/packages/core/src/js/integrations/reactnativeerrorhandlersutils.ts b/packages/core/src/js/integrations/reactnativeerrorhandlersutils.ts index 835f77b719..7453f696d6 100644 --- a/packages/core/src/js/integrations/reactnativeerrorhandlersutils.ts +++ b/packages/core/src/js/integrations/reactnativeerrorhandlersutils.ts @@ -1,4 +1,4 @@ -import { logger } from '@sentry/utils'; +import { logger } from '@sentry/core'; import { ReactNativeLibraries } from '../utils/rnlibraries'; import { RN_GLOBAL_OBJ } from '../utils/worldwide'; diff --git a/packages/core/src/js/integrations/sdkinfo.ts b/packages/core/src/js/integrations/sdkinfo.ts index 86be3f1099..27440ce5b6 100644 --- a/packages/core/src/js/integrations/sdkinfo.ts +++ b/packages/core/src/js/integrations/sdkinfo.ts @@ -1,5 +1,5 @@ +import { logger } from '@sentry/core'; import type { Event, Integration, Package, SdkInfo as SdkInfoType } from '@sentry/types'; -import { logger } from '@sentry/utils'; import { isExpoGo, notWeb } from '../utils/environment'; import { SDK_NAME, SDK_PACKAGE_NAME, SDK_VERSION } from '../version'; diff --git a/packages/core/src/js/integrations/spotlight.ts b/packages/core/src/js/integrations/spotlight.ts index 9707e95026..2ce8be3cbc 100644 --- a/packages/core/src/js/integrations/spotlight.ts +++ b/packages/core/src/js/integrations/spotlight.ts @@ -1,5 +1,5 @@ +import { logger, serializeEnvelope } from '@sentry/core'; import type { BaseTransportOptions, Client, ClientOptions, Envelope, Integration } from '@sentry/types'; -import { logger, serializeEnvelope } from '@sentry/utils'; import { ReactNativeLibraries } from '../utils/rnlibraries'; import { createStealthXhr, XHR_READYSTATE_DONE } from '../utils/xhr'; diff --git a/packages/core/src/js/integrations/viewhierarchy.ts b/packages/core/src/js/integrations/viewhierarchy.ts index 374d8d659a..e4589db2a1 100644 --- a/packages/core/src/js/integrations/viewhierarchy.ts +++ b/packages/core/src/js/integrations/viewhierarchy.ts @@ -1,5 +1,5 @@ +import { logger } from '@sentry/core'; import type { Attachment, Event, EventHint, Integration } from '@sentry/types'; -import { logger } from '@sentry/utils'; import { NATIVE } from '../wrapper'; diff --git a/packages/core/src/js/profiling/cache.ts b/packages/core/src/js/profiling/cache.ts index 2d751e98de..47126b4bd4 100644 --- a/packages/core/src/js/profiling/cache.ts +++ b/packages/core/src/js/profiling/cache.ts @@ -1,4 +1,4 @@ -import { makeFifoCache } from '@sentry/utils'; +import { makeFifoCache } from '@sentry/core'; import type { AndroidCombinedProfileEvent, CombinedProfileEvent } from './types'; diff --git a/packages/core/src/js/profiling/convertHermesProfile.ts b/packages/core/src/js/profiling/convertHermesProfile.ts index e91f6c1235..876f6a13f5 100644 --- a/packages/core/src/js/profiling/convertHermesProfile.ts +++ b/packages/core/src/js/profiling/convertHermesProfile.ts @@ -1,5 +1,5 @@ +import { logger } from '@sentry/core'; import type { FrameId, StackId, ThreadCpuFrame, ThreadCpuSample, ThreadCpuStack, ThreadId } from '@sentry/types'; -import { logger } from '@sentry/utils'; import { MAX_PROFILE_DURATION_MS } from './constants'; import type * as Hermes from './hermes'; diff --git a/packages/core/src/js/profiling/debugid.ts b/packages/core/src/js/profiling/debugid.ts index a4369f797f..45375506a4 100644 --- a/packages/core/src/js/profiling/debugid.ts +++ b/packages/core/src/js/profiling/debugid.ts @@ -1,5 +1,5 @@ +import { GLOBAL_OBJ, logger } from '@sentry/core'; import type { DebugImage } from '@sentry/types'; -import { GLOBAL_OBJ, logger } from '@sentry/utils'; import { DEFAULT_BUNDLE_NAME } from './hermes'; diff --git a/packages/core/src/js/profiling/integration.ts b/packages/core/src/js/profiling/integration.ts index 66c5be5433..b9735aa340 100644 --- a/packages/core/src/js/profiling/integration.ts +++ b/packages/core/src/js/profiling/integration.ts @@ -1,7 +1,6 @@ /* eslint-disable complexity */ -import { getActiveSpan, getClient, spanIsSampled } from '@sentry/core'; +import { getActiveSpan, getClient, logger, spanIsSampled, uuid4 } from '@sentry/core'; import type { Envelope, Event, Integration, Span, ThreadCpuProfile } from '@sentry/types'; -import { logger, uuid4 } from '@sentry/utils'; import { Platform } from 'react-native'; import type { ReactNativeClient } from '../client'; diff --git a/packages/core/src/js/profiling/utils.ts b/packages/core/src/js/profiling/utils.ts index 70cd853494..2473b8cdb9 100644 --- a/packages/core/src/js/profiling/utils.ts +++ b/packages/core/src/js/profiling/utils.ts @@ -1,6 +1,6 @@ /* eslint-disable complexity */ +import { forEachEnvelopeItem, logger } from '@sentry/core'; import type { Envelope, Event, ThreadCpuProfile } from '@sentry/types'; -import { forEachEnvelopeItem, logger } from '@sentry/utils'; import { getDefaultEnvironment } from '../utils/environment'; import { getDebugMetadata } from './debugid'; diff --git a/packages/core/src/js/replay/CustomMask.tsx b/packages/core/src/js/replay/CustomMask.tsx index df4e3c1cfc..a43a198be0 100644 --- a/packages/core/src/js/replay/CustomMask.tsx +++ b/packages/core/src/js/replay/CustomMask.tsx @@ -1,4 +1,4 @@ -import { logger } from '@sentry/utils'; +import { logger } from '@sentry/core'; import * as React from 'react'; import type { HostComponent, ViewProps } from 'react-native'; import { UIManager, View } from 'react-native'; diff --git a/packages/core/src/js/replay/mobilereplay.ts b/packages/core/src/js/replay/mobilereplay.ts index ba72d07f7b..f11a0f96ad 100644 --- a/packages/core/src/js/replay/mobilereplay.ts +++ b/packages/core/src/js/replay/mobilereplay.ts @@ -1,5 +1,5 @@ +import { logger } from '@sentry/core'; import type { Client, DynamicSamplingContext, Event, Integration } from '@sentry/types'; -import { logger } from '@sentry/utils'; import { isHardCrash } from '../misc'; import { hasHooks } from '../utils/clientutils'; diff --git a/packages/core/src/js/replay/xhrUtils.ts b/packages/core/src/js/replay/xhrUtils.ts index a0ac892b99..2a6c1b90f6 100644 --- a/packages/core/src/js/replay/xhrUtils.ts +++ b/packages/core/src/js/replay/xhrUtils.ts @@ -1,5 +1,5 @@ +import { dropUndefinedKeys } from '@sentry/core'; import type { Breadcrumb, BreadcrumbHint, SentryWrappedXMLHttpRequest, XhrBreadcrumbHint } from '@sentry/types'; -import { dropUndefinedKeys } from '@sentry/utils'; import type { RequestBody } from './networkUtils'; import { getBodySize, parseContentLengthHeader } from './networkUtils'; diff --git a/packages/core/src/js/sdk.tsx b/packages/core/src/js/sdk.tsx index 448ce99148..ee19e6dbc0 100644 --- a/packages/core/src/js/sdk.tsx +++ b/packages/core/src/js/sdk.tsx @@ -1,11 +1,10 @@ /* eslint-disable complexity */ -import { captureFeedback, getClient, getGlobalScope,getIntegrationsToSetup, getIsolationScope,initAndBind, withScope as coreWithScope } from '@sentry/core'; +import { captureFeedback, getClient, getGlobalScope, getIntegrationsToSetup, getIsolationScope, initAndBind, logger, stackParserFromStackParserOptions, withScope as coreWithScope } from '@sentry/core'; import { defaultStackParser, makeFetchTransport, } from '@sentry/react'; import type { Breadcrumb, BreadcrumbHint, Integration, Scope, SendFeedbackParams, UserFeedback } from '@sentry/types'; -import { logger, stackParserFromStackParserOptions } from '@sentry/utils'; import * as React from 'react'; import { ReactNativeClient } from './client'; diff --git a/packages/core/src/js/tools/ModulesCollector.ts b/packages/core/src/js/tools/ModulesCollector.ts index 739fe4427c..9d942d1a07 100644 --- a/packages/core/src/js/tools/ModulesCollector.ts +++ b/packages/core/src/js/tools/ModulesCollector.ts @@ -1,4 +1,4 @@ -import { logger } from '@sentry/utils'; +import { logger } from '@sentry/core'; import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs'; import { posix, sep } from 'path'; diff --git a/packages/core/src/js/tools/enableLogger.ts b/packages/core/src/js/tools/enableLogger.ts index a5d36ade2a..4dbc691916 100644 --- a/packages/core/src/js/tools/enableLogger.ts +++ b/packages/core/src/js/tools/enableLogger.ts @@ -1,4 +1,4 @@ -import { logger } from '@sentry/utils'; +import { logger } from '@sentry/core'; /** * Enables debug logger when SENTRY_LOG_LEVEL=debug. diff --git a/packages/core/src/js/tools/metroMiddleware.ts b/packages/core/src/js/tools/metroMiddleware.ts index a66e932b17..fe72cd0006 100644 --- a/packages/core/src/js/tools/metroMiddleware.ts +++ b/packages/core/src/js/tools/metroMiddleware.ts @@ -1,5 +1,5 @@ +import { addContextToFrame, logger } from '@sentry/core'; import type { StackFrame } from '@sentry/types'; -import { addContextToFrame, logger } from '@sentry/utils'; import { readFile } from 'fs'; import type { IncomingMessage, ServerResponse } from 'http'; import type { InputConfigT, Middleware } from 'metro-config'; diff --git a/packages/core/src/js/tools/metroconfig.ts b/packages/core/src/js/tools/metroconfig.ts index 1acec9d378..71c43389a1 100644 --- a/packages/core/src/js/tools/metroconfig.ts +++ b/packages/core/src/js/tools/metroconfig.ts @@ -1,4 +1,4 @@ -import { logger } from '@sentry/utils'; +import { logger } from '@sentry/core'; import type { MetroConfig, MixedOutput, Module, ReadOnlyGraph } from 'metro'; import type { CustomResolutionContext, CustomResolver, Resolution } from 'metro-resolver'; import * as process from 'process'; @@ -246,8 +246,8 @@ export function withSentryFramesCollapsed(config: MetroConfig): MetroConfig { const originalCustomizeFrame = config.symbolicator?.customizeFrame; const collapseSentryInternalFrames = (frame: MetroFrame): boolean => typeof frame.file === 'string' && - (frame.file.includes('node_modules/@sentry/utils/cjs/instrument.js') || - frame.file.includes('node_modules/@sentry/utils/cjs/logger.js')); + (frame.file.includes('node_modules/@sentry/core/cjs/instrument.js') || + frame.file.includes('node_modules/@sentry/core/cjs/logger.js')); const customizeFrame = (frame: MetroFrame): MetroCustomizeFrameReturnValue => { const originalOrSentryCustomizeFrame = ( diff --git a/packages/core/src/js/tools/sentryBabelTransformerUtils.ts b/packages/core/src/js/tools/sentryBabelTransformerUtils.ts index 29cb715e52..952a4defcc 100644 --- a/packages/core/src/js/tools/sentryBabelTransformerUtils.ts +++ b/packages/core/src/js/tools/sentryBabelTransformerUtils.ts @@ -1,4 +1,4 @@ -import { logger } from '@sentry/utils'; +import { logger } from '@sentry/core'; import * as process from 'process'; import type { BabelTransformer } from './vendor/metro/metroBabelTransformer'; diff --git a/packages/core/src/js/touchevents.tsx b/packages/core/src/js/touchevents.tsx index 35a150c7b1..9795446021 100644 --- a/packages/core/src/js/touchevents.tsx +++ b/packages/core/src/js/touchevents.tsx @@ -1,6 +1,5 @@ -import { addBreadcrumb, getClient, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core'; +import { addBreadcrumb, dropUndefinedKeys, getClient, logger, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core'; import type { SeverityLevel } from '@sentry/types'; -import { dropUndefinedKeys, logger } from '@sentry/utils'; import * as React from 'react'; import type { GestureResponderEvent } from 'react-native'; import { StyleSheet, View } from 'react-native'; diff --git a/packages/core/src/js/tracing/gesturetracing.ts b/packages/core/src/js/tracing/gesturetracing.ts index be7ee5d3d3..cd126e9ea8 100644 --- a/packages/core/src/js/tracing/gesturetracing.ts +++ b/packages/core/src/js/tracing/gesturetracing.ts @@ -1,6 +1,5 @@ -import { addBreadcrumb, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core'; +import { addBreadcrumb, logger, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core'; import type { Breadcrumb } from '@sentry/types'; -import { logger } from '@sentry/utils'; import { startUserInteractionSpan } from './integrations/userInteraction'; import { UI_ACTION } from './ops'; diff --git a/packages/core/src/js/tracing/integrations/appStart.ts b/packages/core/src/js/tracing/integrations/appStart.ts index 7d203fa83a..f2db5184c4 100644 --- a/packages/core/src/js/tracing/integrations/appStart.ts +++ b/packages/core/src/js/tracing/integrations/appStart.ts @@ -3,12 +3,13 @@ import { getCapturedScopesOnSpan, getClient, getCurrentScope, + logger, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SentryNonRecordingSpan, startInactiveSpan, + timestampInSeconds, } from '@sentry/core'; import type { Client, Event, Integration, SpanJSON, TransactionEvent } from '@sentry/types'; -import { logger, timestampInSeconds } from '@sentry/utils'; import { APP_START_COLD as APP_START_COLD_MEASUREMENT, diff --git a/packages/core/src/js/tracing/integrations/nativeFrames.ts b/packages/core/src/js/tracing/integrations/nativeFrames.ts index cab5256850..d98eac51ca 100644 --- a/packages/core/src/js/tracing/integrations/nativeFrames.ts +++ b/packages/core/src/js/tracing/integrations/nativeFrames.ts @@ -1,5 +1,5 @@ +import { logger, timestampInSeconds } from '@sentry/core'; import type { Client, Event, Integration, Measurements, MeasurementUnit, Span } from '@sentry/types'; -import { logger, timestampInSeconds } from '@sentry/utils'; import type { NativeFramesResponse } from '../../NativeRNSentry'; import { AsyncExpiringMap } from '../../utils/AsyncExpiringMap'; diff --git a/packages/core/src/js/tracing/integrations/stalltracking.ts b/packages/core/src/js/tracing/integrations/stalltracking.ts index a109cb7956..a8cee2ecd3 100644 --- a/packages/core/src/js/tracing/integrations/stalltracking.ts +++ b/packages/core/src/js/tracing/integrations/stalltracking.ts @@ -1,7 +1,6 @@ /* eslint-disable max-lines */ -import { getRootSpan, spanToJSON } from '@sentry/core'; +import { getRootSpan, logger, spanToJSON, timestampInSeconds } from '@sentry/core'; import type { Client, Integration, Measurements, MeasurementUnit, Span } from '@sentry/types'; -import { logger, timestampInSeconds } from '@sentry/utils'; import type { AppStateStatus } from 'react-native'; import { AppState } from 'react-native'; diff --git a/packages/core/src/js/tracing/integrations/userInteraction.ts b/packages/core/src/js/tracing/integrations/userInteraction.ts index 73d6fb7693..1405aeb5e0 100644 --- a/packages/core/src/js/tracing/integrations/userInteraction.ts +++ b/packages/core/src/js/tracing/integrations/userInteraction.ts @@ -1,6 +1,12 @@ -import { getActiveSpan, getClient, getCurrentScope, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, spanToJSON } from '@sentry/core'; +import { + getActiveSpan, + getClient, + getCurrentScope, + logger, + SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, + spanToJSON, +} from '@sentry/core'; import type { Integration, Span, StartSpanOptions } from '@sentry/types'; -import { logger } from '@sentry/utils'; import type { ReactNativeClientOptions } from '../../options'; import { onlySampleIfChildSpans } from '../onSpanEndUtils'; diff --git a/packages/core/src/js/tracing/onSpanEndUtils.ts b/packages/core/src/js/tracing/onSpanEndUtils.ts index 993d22c40f..5c64bff196 100644 --- a/packages/core/src/js/tracing/onSpanEndUtils.ts +++ b/packages/core/src/js/tracing/onSpanEndUtils.ts @@ -1,6 +1,5 @@ -import { getSpanDescendants, SPAN_STATUS_ERROR, spanToJSON } from '@sentry/core'; +import { getSpanDescendants, logger, SPAN_STATUS_ERROR, spanToJSON } from '@sentry/core'; import type { Client, Span } from '@sentry/types'; -import { logger } from '@sentry/utils'; import type { AppStateStatus } from 'react-native'; import { AppState } from 'react-native'; diff --git a/packages/core/src/js/tracing/reactnativeprofiler.tsx b/packages/core/src/js/tracing/reactnativeprofiler.tsx index 048a48954f..35b5d3073d 100644 --- a/packages/core/src/js/tracing/reactnativeprofiler.tsx +++ b/packages/core/src/js/tracing/reactnativeprofiler.tsx @@ -1,5 +1,5 @@ +import { timestampInSeconds } from '@sentry/core'; import { getClient, Profiler } from '@sentry/react'; -import { timestampInSeconds } from '@sentry/utils'; import { createIntegration } from '../integrations/factory'; import { _captureAppStart, _setRootComponentCreationTimestampMs } from '../tracing/integrations/appStart'; diff --git a/packages/core/src/js/tracing/reactnavigation.ts b/packages/core/src/js/tracing/reactnavigation.ts index ce2bb1032c..8ab7547918 100644 --- a/packages/core/src/js/tracing/reactnavigation.ts +++ b/packages/core/src/js/tracing/reactnavigation.ts @@ -3,14 +3,16 @@ import { addBreadcrumb, getActiveSpan, getClient, + isPlainObject, + logger, SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SPAN_STATUS_OK, spanToJSON, startInactiveSpan, + timestampInSeconds, } from '@sentry/core'; import type { Client, Integration, Span } from '@sentry/types'; -import { isPlainObject, logger, timestampInSeconds } from '@sentry/utils'; import type { NewFrameEvent } from '../utils/sentryeventemitter'; import type { SentryEventEmitterFallback } from '../utils/sentryeventemitterfallback'; diff --git a/packages/core/src/js/tracing/span.ts b/packages/core/src/js/tracing/span.ts index a1c21848f6..733395a58b 100644 --- a/packages/core/src/js/tracing/span.ts +++ b/packages/core/src/js/tracing/span.ts @@ -1,7 +1,9 @@ import { + generatePropagationContext, getActiveSpan, getClient, getCurrentScope, + logger, SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SentryNonRecordingSpan, @@ -10,7 +12,6 @@ import { startIdleSpan as coreStartIdleSpan, } from '@sentry/core'; import type { Client, Scope, Span, StartSpanOptions } from '@sentry/types'; -import { generatePropagationContext, logger } from '@sentry/utils'; import { isRootSpan } from '../utils/span'; import { adjustTransactionDuration, cancelInBackground } from './onSpanEndUtils'; diff --git a/packages/core/src/js/tracing/timetodisplay.tsx b/packages/core/src/js/tracing/timetodisplay.tsx index 95c02d6d5f..c726409678 100644 --- a/packages/core/src/js/tracing/timetodisplay.tsx +++ b/packages/core/src/js/tracing/timetodisplay.tsx @@ -1,6 +1,5 @@ -import { getActiveSpan, getSpanDescendants, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SPAN_STATUS_ERROR, SPAN_STATUS_OK, spanToJSON, startInactiveSpan } from '@sentry/core'; +import { fill, getActiveSpan, getSpanDescendants, logger, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SPAN_STATUS_ERROR, SPAN_STATUS_OK, spanToJSON, startInactiveSpan } from '@sentry/core'; import type { Span,StartSpanOptions } from '@sentry/types'; -import { fill, logger } from '@sentry/utils'; import * as React from 'react'; import { isTurboModuleEnabled } from '../utils/environment'; diff --git a/packages/core/src/js/tracing/utils.ts b/packages/core/src/js/tracing/utils.ts index 3947e1eed3..044aee9ab0 100644 --- a/packages/core/src/js/tracing/utils.ts +++ b/packages/core/src/js/tracing/utils.ts @@ -1,14 +1,17 @@ import { + dropUndefinedKeys, getSpanDescendants, + logger, SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_UNIT, SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_VALUE, SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, setMeasurement, spanToJSON, + timestampInSeconds, + uuid4, } from '@sentry/core'; import type { MeasurementUnit, Span, SpanJSON, TransactionSource } from '@sentry/types'; -import { dropUndefinedKeys, logger, timestampInSeconds, uuid4 } from '@sentry/utils'; import { RN_GLOBAL_OBJ } from '../utils/worldwide'; diff --git a/packages/core/src/js/transports/native.ts b/packages/core/src/js/transports/native.ts index e46d9587e0..4f1785ad71 100644 --- a/packages/core/src/js/transports/native.ts +++ b/packages/core/src/js/transports/native.ts @@ -1,6 +1,6 @@ +import type { PromiseBuffer } from '@sentry/core'; +import { makePromiseBuffer } from '@sentry/core'; import type { BaseTransportOptions, Envelope, Transport, TransportMakeRequestResponse } from '@sentry/types'; -import type { PromiseBuffer } from '@sentry/utils'; -import { makePromiseBuffer } from '@sentry/utils'; import { NATIVE } from '../wrapper'; diff --git a/packages/core/src/js/utils/envelope.ts b/packages/core/src/js/utils/envelope.ts index a5b7386537..135e8b67e6 100644 --- a/packages/core/src/js/utils/envelope.ts +++ b/packages/core/src/js/utils/envelope.ts @@ -1,5 +1,5 @@ +import { createEnvelope, dsnToString } from '@sentry/core'; import type { DsnComponents, EventEnvelope, SdkMetadata, UserFeedback, UserFeedbackItem } from '@sentry/types'; -import { createEnvelope, dsnToString } from '@sentry/utils'; export const header = 0; export const items = 1; diff --git a/packages/core/src/js/utils/fill.ts b/packages/core/src/js/utils/fill.ts index 25e034ba9e..044aee1d5c 100644 --- a/packages/core/src/js/utils/fill.ts +++ b/packages/core/src/js/utils/fill.ts @@ -1,7 +1,7 @@ -import { fill } from '@sentry/utils'; +import { fill } from '@sentry/core'; /** - * The same as `import { fill } from '@sentry/utils';` but with explicit types. + * The same as `import { fill } from '@sentry/core';` but with explicit types. */ // eslint-disable-next-line @typescript-eslint/no-explicit-any export function fillTyped( diff --git a/packages/core/src/js/utils/normalize.ts b/packages/core/src/js/utils/normalize.ts index 2a6214b2fb..8bcf0eabde 100644 --- a/packages/core/src/js/utils/normalize.ts +++ b/packages/core/src/js/utils/normalize.ts @@ -1,4 +1,4 @@ -import { normalize } from '@sentry/utils'; +import { normalize } from '@sentry/core'; const KEY = 'value'; diff --git a/packages/core/src/js/utils/safe.ts b/packages/core/src/js/utils/safe.ts index 03dcc33c47..911c0d3de1 100644 --- a/packages/core/src/js/utils/safe.ts +++ b/packages/core/src/js/utils/safe.ts @@ -1,4 +1,4 @@ -import { logger } from '@sentry/utils'; +import { logger } from '@sentry/core'; import type { ReactNativeOptions } from '../options'; diff --git a/packages/core/src/js/utils/sentryeventemitter.ts b/packages/core/src/js/utils/sentryeventemitter.ts index 63146f30c5..55362df3cd 100644 --- a/packages/core/src/js/utils/sentryeventemitter.ts +++ b/packages/core/src/js/utils/sentryeventemitter.ts @@ -1,4 +1,4 @@ -import { logger } from '@sentry/utils'; +import { logger } from '@sentry/core'; import type { EmitterSubscription, NativeModule } from 'react-native'; import { NativeEventEmitter } from 'react-native'; diff --git a/packages/core/src/js/utils/sentryeventemitterfallback.ts b/packages/core/src/js/utils/sentryeventemitterfallback.ts index 8eaeb947a8..74f1ab58e8 100644 --- a/packages/core/src/js/utils/sentryeventemitterfallback.ts +++ b/packages/core/src/js/utils/sentryeventemitterfallback.ts @@ -1,4 +1,4 @@ -import { logger, timestampInSeconds } from '@sentry/utils'; +import { logger, timestampInSeconds } from '@sentry/core'; import { NATIVE } from '../wrapper'; import type { NewFrameEvent, SentryEventEmitter } from './sentryeventemitter'; diff --git a/packages/core/src/js/utils/worldwide.ts b/packages/core/src/js/utils/worldwide.ts index 7215613672..c1a4ae5dbb 100644 --- a/packages/core/src/js/utils/worldwide.ts +++ b/packages/core/src/js/utils/worldwide.ts @@ -1,5 +1,5 @@ -import type { InternalGlobal } from '@sentry/utils'; -import { GLOBAL_OBJ } from '@sentry/utils'; +import type { InternalGlobal } from '@sentry/core'; +import { GLOBAL_OBJ } from '@sentry/core'; import type { ErrorUtils } from 'react-native/types'; import type { ExpoGlobalObject } from './expoglobalobject'; diff --git a/packages/core/src/js/wrapper.ts b/packages/core/src/js/wrapper.ts index ef7396f666..d7bdba0741 100644 --- a/packages/core/src/js/wrapper.ts +++ b/packages/core/src/js/wrapper.ts @@ -1,4 +1,5 @@ /* eslint-disable max-lines */ +import { logger, normalize, SentryError } from '@sentry/core'; import type { BaseEnvelopeItemHeaders, Breadcrumb, @@ -9,7 +10,6 @@ import type { SeverityLevel, User, } from '@sentry/types'; -import { logger, normalize, SentryError } from '@sentry/utils'; import { NativeModules, Platform } from 'react-native'; import { isHardCrash } from './misc'; diff --git a/packages/core/test/client.test.ts b/packages/core/test/client.test.ts index a0e5b13201..ec7e673988 100644 --- a/packages/core/test/client.test.ts +++ b/packages/core/test/client.test.ts @@ -2,8 +2,8 @@ import * as mockedtimetodisplaynative from './tracing/mockedtimetodisplaynative' jest.mock('../src/js/tracing/timetodisplaynative', () => mockedtimetodisplaynative); import { defaultStackParser } from '@sentry/browser'; +import { rejectedSyncPromise, SentryError } from '@sentry/core'; import type { Envelope, Event, Outcome, Transport, TransportMakeRequestResponse } from '@sentry/types'; -import { rejectedSyncPromise, SentryError } from '@sentry/utils'; import * as RN from 'react-native'; import { ReactNativeClient } from '../src/js/client'; diff --git a/packages/core/test/mocks/client.ts b/packages/core/test/mocks/client.ts index 6d6b4898b4..bc90b88c38 100644 --- a/packages/core/test/mocks/client.ts +++ b/packages/core/test/mocks/client.ts @@ -5,6 +5,7 @@ import { getGlobalScope, getIsolationScope, initAndBind, + resolvedSyncPromise, setCurrentClient, } from '@sentry/core'; import type { @@ -16,7 +17,6 @@ import type { Session, SeverityLevel, } from '@sentry/types'; -import { resolvedSyncPromise } from '@sentry/utils'; import type { ReactNativeClientOptions } from '../../src/js/options'; diff --git a/packages/core/test/sdk.test.ts b/packages/core/test/sdk.test.ts index c78774edea..94cbed0aa4 100644 --- a/packages/core/test/sdk.test.ts +++ b/packages/core/test/sdk.test.ts @@ -1,4 +1,4 @@ -import { initAndBind } from '@sentry/core'; +import { initAndBind, logger } from '@sentry/core'; import { makeFetchTransport } from '@sentry/react'; import type { BaseTransportOptions, @@ -8,7 +8,6 @@ import type { Integration, Scope, } from '@sentry/types'; -import { logger } from '@sentry/utils'; import { getDevServer } from '../src/js/integrations/debugsymbolicatorutils'; import { init, withScope } from '../src/js/sdk'; diff --git a/packages/core/test/sdk.withclient.test.ts b/packages/core/test/sdk.withclient.test.ts index 2e2a2bfc5e..693d1817a9 100644 --- a/packages/core/test/sdk.withclient.test.ts +++ b/packages/core/test/sdk.withclient.test.ts @@ -1,5 +1,4 @@ -import { setCurrentClient } from '@sentry/core'; -import { logger } from '@sentry/utils'; +import { logger, setCurrentClient } from '@sentry/core'; import { crashedLastRun, flush } from '../src/js/sdk'; import { getDefaultTestClientOptions, TestClient } from './mocks/client'; diff --git a/packages/core/test/testutils.ts b/packages/core/test/testutils.ts index 4548eef092..2cff0aa26a 100644 --- a/packages/core/test/testutils.ts +++ b/packages/core/test/testutils.ts @@ -1,5 +1,5 @@ +import { rejectedSyncPromise } from '@sentry/core'; import type { Session, Transport, UserFeedback } from '@sentry/types'; -import { rejectedSyncPromise } from '@sentry/utils'; export type MockInterface = { [K in keyof T]: T[K] extends (...args: infer A) => infer B ? jest.Mock : T[K]; diff --git a/packages/core/test/tools/collectModules.test.ts b/packages/core/test/tools/collectModules.test.ts index 866465b2ac..3b65e3aa7a 100644 --- a/packages/core/test/tools/collectModules.test.ts +++ b/packages/core/test/tools/collectModules.test.ts @@ -1,8 +1,8 @@ -import { logger } from '@sentry/utils'; +import { logger } from '@sentry/core'; import { existsSync, readFileSync, rmdirSync, unlinkSync } from 'fs'; import { dirname } from 'path'; -jest.mock('@sentry/utils'); +jest.mock('@sentry/core'); (logger.enable as jest.Mock).mockImplementation(() => {}); import ModulesCollector from '../../src/js/tools/ModulesCollector'; diff --git a/packages/core/test/tools/metroconfig.test.ts b/packages/core/test/tools/metroconfig.test.ts index 3c8a9a10b3..fb7096ca83 100644 --- a/packages/core/test/tools/metroconfig.test.ts +++ b/packages/core/test/tools/metroconfig.test.ts @@ -274,5 +274,5 @@ describe('metroconfig', () => { // function create mock metro frame function createMockSentryInstrumentMetroFrame(): MetroFrame { - return { file: 'node_modules/@sentry/utils/cjs/instrument.js' }; + return { file: 'node_modules/@sentry/core/cjs/instrument.js' }; } diff --git a/packages/core/test/tracing/integrations/appStart.test.ts b/packages/core/test/tracing/integrations/appStart.test.ts index 3c0e983a48..e11e3616dc 100644 --- a/packages/core/test/tracing/integrations/appStart.test.ts +++ b/packages/core/test/tracing/integrations/appStart.test.ts @@ -5,9 +5,9 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, setCurrentClient, + timestampInSeconds, } from '@sentry/core'; import type { ErrorEvent, Event, SpanJSON, TransactionEvent } from '@sentry/types'; -import { timestampInSeconds } from '@sentry/utils'; import { APP_START_COLD as APP_START_COLD_MEASUREMENT, @@ -56,8 +56,8 @@ jest.mock('../../../src/js/tracing/utils', () => { }; }); -jest.mock('@sentry/utils', () => { - const originalUtils = jest.requireActual('@sentry/utils'); +jest.mock('@sentry/core', () => { + const originalUtils = jest.requireActual('@sentry/core'); return { ...originalUtils, diff --git a/packages/core/test/tracing/integrations/stallTracking/stalltracking.test.ts b/packages/core/test/tracing/integrations/stallTracking/stalltracking.test.ts index a59d74bb7d..125583fcc7 100644 --- a/packages/core/test/tracing/integrations/stallTracking/stalltracking.test.ts +++ b/packages/core/test/tracing/integrations/stallTracking/stalltracking.test.ts @@ -6,9 +6,9 @@ import { startIdleSpan, startSpan, startSpanManual, + timestampInSeconds, } from '@sentry/core'; import type { Span } from '@sentry/types'; -import { timestampInSeconds } from '@sentry/utils'; import { stallTrackingIntegration } from '../../../../src/js/tracing/integrations/stalltracking'; import { getDefaultTestClientOptions, TestClient } from '../../../mocks/client'; diff --git a/packages/core/test/tracing/reactnativetracing.test.ts b/packages/core/test/tracing/reactnativetracing.test.ts index 3605a25f7d..031a8afaec 100644 --- a/packages/core/test/tracing/reactnativetracing.test.ts +++ b/packages/core/test/tracing/reactnativetracing.test.ts @@ -22,8 +22,8 @@ jest.mock('../../src/js/tracing/utils', () => { }; }); -jest.mock('@sentry/utils', () => { - const originalUtils = jest.requireActual('@sentry/utils'); +jest.mock('@sentry/core', () => { + const originalUtils = jest.requireActual('@sentry/core'); return { ...originalUtils, diff --git a/packages/core/test/tracing/reactnavigation.ttid.test.tsx b/packages/core/test/tracing/reactnavigation.ttid.test.tsx index 4ef5a644d9..73823d8cbb 100644 --- a/packages/core/test/tracing/reactnavigation.ttid.test.tsx +++ b/packages/core/test/tracing/reactnavigation.ttid.test.tsx @@ -1,5 +1,5 @@ +import { timestampInSeconds } from '@sentry/core'; import type { Scope, Span, SpanJSON, TransactionEvent, Transport } from '@sentry/types'; -import { timestampInSeconds } from '@sentry/utils'; import * as TestRenderer from '@testing-library/react-native' import * as React from "react"; diff --git a/packages/core/test/tracing/timetodisplay.test.tsx b/packages/core/test/tracing/timetodisplay.test.tsx index 5b700e1033..f5f12607c4 100644 --- a/packages/core/test/tracing/timetodisplay.test.tsx +++ b/packages/core/test/tracing/timetodisplay.test.tsx @@ -1,4 +1,4 @@ -import { logger } from '@sentry/utils'; +import { getActiveSpan, getCurrentScope, getGlobalScope, getIsolationScope, getSpanDescendants, logger , setCurrentClient, spanToJSON, startSpanManual} from '@sentry/core'; jest.spyOn(logger, 'warn'); import * as mockedtimetodisplaynative from './mockedtimetodisplaynative'; @@ -9,7 +9,6 @@ jest.mock('../../src/js/utils/environment', () => ({ isTurboModuleEnabled: jest.fn().mockReturnValue(false), })); -import { getActiveSpan, getCurrentScope, getGlobalScope, getIsolationScope, getSpanDescendants, setCurrentClient, spanToJSON, startSpanManual} from '@sentry/core'; import type { Event, Measurements, Span, SpanJSON} from '@sentry/types'; import * as React from "react"; import * as TestRenderer from 'react-test-renderer'; diff --git a/packages/core/test/utils/mockedSentryeventemitterfallback.ts b/packages/core/test/utils/mockedSentryeventemitterfallback.ts index 481b109d68..74ebd4f53a 100644 --- a/packages/core/test/utils/mockedSentryeventemitterfallback.ts +++ b/packages/core/test/utils/mockedSentryeventemitterfallback.ts @@ -1,4 +1,4 @@ -import { timestampInSeconds } from '@sentry/utils'; +import { timestampInSeconds } from '@sentry/core'; import * as EventEmitter from 'events'; import type { NewFrameEvent } from '../../src/js/utils/sentryeventemitter'; diff --git a/packages/core/test/utils/sentryeventemitterfallback.test.ts b/packages/core/test/utils/sentryeventemitterfallback.test.ts index e96567ae29..28353fa490 100644 --- a/packages/core/test/utils/sentryeventemitterfallback.test.ts +++ b/packages/core/test/utils/sentryeventemitterfallback.test.ts @@ -1,4 +1,4 @@ -import { logger } from '@sentry/utils'; +import { logger } from '@sentry/core'; import { NewFrameEventName } from '../../src/js/utils/sentryeventemitter'; import { createSentryFallbackEventEmitter } from '../../src/js/utils/sentryeventemitterfallback'; @@ -35,7 +35,7 @@ describe('SentryEventEmitterFallback', () => { it('should start listener and use fallback when native call returned undefined/null', async () => { jest.useFakeTimers(); - const spy = jest.spyOn(require('@sentry/utils'), 'timestampInSeconds'); + const spy = jest.spyOn(require('@sentry/core'), 'timestampInSeconds'); const fallbackTime = Date.now() / 1000; spy.mockReturnValue(fallbackTime); @@ -70,7 +70,7 @@ describe('SentryEventEmitterFallback', () => { (NATIVE.getNewScreenTimeToDisplay as jest.Mock).mockRejectedValue(new Error('Failed')); - const spy = jest.spyOn(require('@sentry/utils'), 'timestampInSeconds'); + const spy = jest.spyOn(require('@sentry/core'), 'timestampInSeconds'); const fallbackTime = Date.now() / 1000; spy.mockReturnValue(fallbackTime); @@ -100,7 +100,7 @@ describe('SentryEventEmitterFallback', () => { it('should start listener and use fallback when native call fails', async () => { jest.useFakeTimers(); - const spy = jest.spyOn(require('@sentry/utils'), 'timestampInSeconds'); + const spy = jest.spyOn(require('@sentry/core'), 'timestampInSeconds'); const fallbackTime = Date.now() / 1000; spy.mockReturnValue(fallbackTime); @@ -132,7 +132,7 @@ describe('SentryEventEmitterFallback', () => { it('should start listener and use fallback when native call is not available', async () => { jest.useFakeTimers(); - const spy = jest.spyOn(require('@sentry/utils'), 'timestampInSeconds'); + const spy = jest.spyOn(require('@sentry/core'), 'timestampInSeconds'); const fallbackTime = Date.now() / 1000; spy.mockReturnValue(fallbackTime); diff --git a/packages/core/test/wrapper.test.ts b/packages/core/test/wrapper.test.ts index 34869b9f7c..4663c34a73 100644 --- a/packages/core/test/wrapper.test.ts +++ b/packages/core/test/wrapper.test.ts @@ -1,5 +1,5 @@ +import { createEnvelope, logger } from '@sentry/core'; import type { Event, EventEnvelope, EventItem, SeverityLevel } from '@sentry/types'; -import { createEnvelope, logger } from '@sentry/utils'; import * as RN from 'react-native'; import type { Spec } from '../src/js/NativeRNSentry'; diff --git a/samples/react-native-macos/package.json b/samples/react-native-macos/package.json index ab1f947813..dcf6e56b67 100644 --- a/samples/react-native-macos/package.json +++ b/samples/react-native-macos/package.json @@ -16,10 +16,10 @@ "@react-navigation/bottom-tabs": "^6.5.12", "@react-navigation/native": "^6.1.9", "@react-navigation/stack": "^6.3.20", + "@sentry/core": "8.41.0", "@sentry/react": "8.41.0", "@sentry/react-native": "6.4.0", "@sentry/types": "8.41.0", - "@sentry/utils": "8.41.0", "delay": "^6.0.0", "react": "18.2.0", "react-native": "0.73.9", diff --git a/yarn.lock b/yarn.lock index 29e92a4d25..52c4b84ce0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -24294,8 +24294,8 @@ __metadata: dependencies: "@babel/preset-env": ^7.25.3 "@babel/preset-typescript": ^7.18.6 + "@sentry/core": 8.41.0 "@sentry/react-native": 6.4.0 - "@sentry/utils": 8.41.0 "@types/node": ^20.9.3 "@types/react": ^18.2.64 appium: 2.4.1 @@ -24358,10 +24358,10 @@ __metadata: "@react-navigation/bottom-tabs": ^6.5.12 "@react-navigation/native": ^6.1.9 "@react-navigation/stack": ^6.3.20 + "@sentry/core": 8.41.0 "@sentry/react": 8.41.0 "@sentry/react-native": 6.4.0 "@sentry/types": 8.41.0 - "@sentry/utils": 8.41.0 "@types/react": ^18.2.65 "@types/react-native-vector-icons": ^6.4.18 "@types/react-test-renderer": ^18.0.0