From 9f0f6c83fbb234e0b6a3dd2897429782821da87f Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Thu, 12 Dec 2024 18:20:47 +0200 Subject: [PATCH 1/8] chore(deps): Bumps JavaScript SDK to v8.41.0 (#4351) --- CHANGELOG.md | 7 + dev-packages/e2e-tests/package.json | 2 +- packages/core/package.json | 16 +- .../core/test/profiling/integration.test.ts | 19 +- samples/react-native-macos/package.json | 6 +- yarn.lock | 168 +++++++++--------- 6 files changed, 109 insertions(+), 109 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bf0372f0a..98544df407 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,10 @@ - Navigation Span should have no parent by default ([#4326](https://github.com/getsentry/sentry-react-native/pull/4326)) - Disable HTTP Client Errors on iOS ([#4347](https://github.com/getsentry/sentry-react-native/pull/4347)) +### Changes + +- Falsy values of `options.environment` (empty string, undefined...) default to `production` + ### Dependencies - Bump CLI from v2.38.2 to v2.39.1 ([#4305](https://github.com/getsentry/sentry-react-native/pull/4305), [#4316](https://github.com/getsentry/sentry-react-native/pull/4316)) @@ -50,6 +54,9 @@ - Bump Android SDK from v7.18.0 to v7.18.1 ([#4329](https://github.com/getsentry/sentry-react-native/pull/4329)) - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7181) - [diff](https://github.com/getsentry/sentry-java/compare/7.18.0...7.18.1) +- Bump JavaScript SDK from v8.40.0 to v8.41.0 ([#4351](https://github.com/getsentry/sentry-react-native/pull/4351)) + - [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#8410) + - [diff](https://github.com/getsentry/sentry-javascript/compare/8.40.0...8.41.0) ## 6.4.0 diff --git a/dev-packages/e2e-tests/package.json b/dev-packages/e2e-tests/package.json index ab4319cea9..50e330451e 100644 --- a/dev-packages/e2e-tests/package.json +++ b/dev-packages/e2e-tests/package.json @@ -14,7 +14,7 @@ "@babel/preset-env": "^7.25.3", "@babel/preset-typescript": "^7.18.6", "@sentry/react-native": "6.4.0", - "@sentry/utils": "8.40.0", + "@sentry/utils": "8.41.0", "@types/node": "^20.9.3", "@types/react": "^18.2.64", "appium": "2.4.1", diff --git a/packages/core/package.json b/packages/core/package.json index dd88c414f8..d44521b163 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -66,21 +66,21 @@ }, "dependencies": { "@sentry/babel-plugin-component-annotate": "2.20.1", - "@sentry/browser": "8.40.0", + "@sentry/browser": "8.41.0", "@sentry/cli": "2.39.1", - "@sentry/core": "8.40.0", - "@sentry/react": "8.40.0", - "@sentry/types": "8.40.0", - "@sentry/utils": "8.40.0" + "@sentry/core": "8.41.0", + "@sentry/react": "8.41.0", + "@sentry/types": "8.41.0", + "@sentry/utils": "8.41.0" }, "devDependencies": { "@babel/core": "^7.25.2", "@expo/metro-config": "0.19.5", "@mswjs/interceptors": "^0.25.15", "@react-native/babel-preset": "0.76.3", - "@sentry-internal/eslint-config-sdk": "8.40.0", - "@sentry-internal/eslint-plugin-sdk": "8.40.0", - "@sentry-internal/typescript": "8.40.0", + "@sentry-internal/eslint-config-sdk": "8.41.0", + "@sentry-internal/eslint-plugin-sdk": "8.41.0", + "@sentry-internal/typescript": "8.41.0", "@sentry/wizard": "3.36.0", "@testing-library/react-native": "^12.7.2", "@types/jest": "^29.5.3", diff --git a/packages/core/test/profiling/integration.test.ts b/packages/core/test/profiling/integration.test.ts index f6801aa08d..5fc7d9e519 100644 --- a/packages/core/test/profiling/integration.test.ts +++ b/packages/core/test/profiling/integration.test.ts @@ -7,7 +7,6 @@ import { getClient, spanToJSON } from '@sentry/core'; import type { Envelope, Event, Integration, Profile, Span, ThreadCpuProfile, Transport } from '@sentry/types'; import * as Sentry from '../../src/js'; -import type { NativeDeviceContextsResponse } from '../../src/js/NativeRNSentry'; import { getDebugMetadata } from '../../src/js/profiling/debugid'; import type { HermesProfilingOptions } from '../../src/js/profiling/integration'; import { hermesProfilingIntegration } from '../../src/js/profiling/integration'; @@ -79,9 +78,6 @@ describe('profiling integration', () => { describe('environment', () => { beforeEach(() => { (getDefaultEnvironment as jest.Mock).mockReturnValue('mocked'); - mockWrapper.NATIVE.fetchNativeDeviceContexts.mockResolvedValue({ - environment: 'native', - }); }); const expectTransactionWithEnvironment = (envelope: Envelope | undefined, env: string | undefined) => { @@ -114,7 +110,7 @@ describe('profiling integration', () => { expectProfileWithEnvironment(envelope, 'mocked'); }); - test('should use native environment for transaction and profile if user value is nullish', () => { + test('should use production environment (default JS) for transaction and profile if user value is nullish', () => { mock = initTestClient({ withProfiling: true, environment: '' }); Sentry.startSpan({ name: 'test-name' }, () => {}); @@ -122,14 +118,11 @@ describe('profiling integration', () => { jest.runAllTimers(); const envelope: Envelope | undefined = mock.transportSendMock.mock.lastCall?.[0]; - expectTransactionWithEnvironment(envelope, 'native'); - expectProfileWithEnvironment(envelope, 'native'); + expectTransactionWithEnvironment(envelope, 'production'); + expectProfileWithEnvironment(envelope, 'production'); }); - test('should keep nullish for transaction and profile uses default', () => { - mockWrapper.NATIVE.fetchNativeDeviceContexts.mockResolvedValue({ - environment: undefined, - }); + test('should use production environment (default JS) for transaction and profile if user value is undefined', () => { mock = initTestClient({ withProfiling: true, environment: undefined }); Sentry.startSpan({ name: 'test-name' }, () => {}); @@ -137,8 +130,8 @@ describe('profiling integration', () => { jest.runAllTimers(); const envelope: Envelope | undefined = mock.transportSendMock.mock.lastCall?.[0]; - expectTransactionWithEnvironment(envelope, undefined); - expectProfileWithEnvironment(envelope, 'mocked'); + expectTransactionWithEnvironment(envelope, 'production'); + expectProfileWithEnvironment(envelope, 'production'); }); test('should keep custom environment for transaction and profile', () => { diff --git a/samples/react-native-macos/package.json b/samples/react-native-macos/package.json index f840cfc382..ab1f947813 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/react": "8.40.0", + "@sentry/react": "8.41.0", "@sentry/react-native": "6.4.0", - "@sentry/types": "8.40.0", - "@sentry/utils": "8.40.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 2a809dbccd..29e92a4d25 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7555,22 +7555,22 @@ __metadata: languageName: node linkType: hard -"@sentry-internal/browser-utils@npm:8.40.0": - version: 8.40.0 - resolution: "@sentry-internal/browser-utils@npm:8.40.0" +"@sentry-internal/browser-utils@npm:8.41.0": + version: 8.41.0 + resolution: "@sentry-internal/browser-utils@npm:8.41.0" dependencies: - "@sentry/core": 8.40.0 - "@sentry/types": 8.40.0 - checksum: b32ce642ab4277c3d77d9ccfb0eebbd491f8b4e7eaf395985e63183cb0c298944753d2bc139606fc9b401d3f55a7d3ede15fbb2ac59ba8ff9089dc8a685bca61 + "@sentry/core": 8.41.0 + "@sentry/types": 8.41.0 + checksum: e69a20cd60086993a5a473fa247bf3c4c3ae7e7a1b650ff29cb017baac34aa597f35b8df86bc691ad5c5ad5c8394cb3f982c4da6c593b6dec6147cdd2aefeb7a languageName: node linkType: hard -"@sentry-internal/eslint-config-sdk@npm:8.40.0": - version: 8.40.0 - resolution: "@sentry-internal/eslint-config-sdk@npm:8.40.0" +"@sentry-internal/eslint-config-sdk@npm:8.41.0": + version: 8.41.0 + resolution: "@sentry-internal/eslint-config-sdk@npm:8.41.0" dependencies: - "@sentry-internal/eslint-plugin-sdk": 8.40.0 - "@sentry-internal/typescript": 8.40.0 + "@sentry-internal/eslint-plugin-sdk": 8.41.0 + "@sentry-internal/typescript": 8.41.0 "@typescript-eslint/eslint-plugin": ^5.48.0 "@typescript-eslint/parser": ^5.48.0 eslint-config-prettier: ^6.11.0 @@ -7581,46 +7581,46 @@ __metadata: eslint-plugin-simple-import-sort: ^5.0.3 peerDependencies: eslint: ">=5" - checksum: 4a39cdedfcf0afad91b6c8971032e1db282deaed909ef625dacbe9bf513993062f3abfd4e6d92e75498dcfc96266502d90336429c410960794f2e887a2a29bad + checksum: 63014266652bff78a60824928adc5e69e3ea2bb1de8c957151078509cd441da739867f35e9cac1cd2c37b0c58fec34427e2da0807a832052dd60d35f827873ba languageName: node linkType: hard -"@sentry-internal/eslint-plugin-sdk@npm:8.40.0": - version: 8.40.0 - resolution: "@sentry-internal/eslint-plugin-sdk@npm:8.40.0" - checksum: c05067add58f99838a1df57e3de97a76fd7a19a25c68149925a6ba6d1873c26a11444ae4d06523c9cb3dd175c21c94a6d7ca7ee9112f735ba2e0be5bae013dfc +"@sentry-internal/eslint-plugin-sdk@npm:8.41.0": + version: 8.41.0 + resolution: "@sentry-internal/eslint-plugin-sdk@npm:8.41.0" + checksum: a130b9a1ed2535f33b598c0830a8dbe33332ba89d65a2afd271bac2b310f458da071b5c8377f301c2bf293f6fdbdfc16123628db80639fb1c6b4011d5ed0855d languageName: node linkType: hard -"@sentry-internal/feedback@npm:8.40.0": - version: 8.40.0 - resolution: "@sentry-internal/feedback@npm:8.40.0" +"@sentry-internal/feedback@npm:8.41.0": + version: 8.41.0 + resolution: "@sentry-internal/feedback@npm:8.41.0" dependencies: - "@sentry/core": 8.40.0 - "@sentry/types": 8.40.0 - checksum: 712845b89df12d4b75f293de37b5888f8dc78e58639f11368edf095185fbb7c50bcc65e992d10b276b6feca5976b5e4ff6e8e4e5d4c9096d5fa0a3becb7c581d + "@sentry/core": 8.41.0 + "@sentry/types": 8.41.0 + checksum: 9beef2c0cacf5e9cf1650cb0ad8d95ff26a3d8fb833f009c6399b207ae6c6f49f61f9beb483d252044fd26b23a882780438c7a15fe7b32324c05f78c0abb4f01 languageName: node linkType: hard -"@sentry-internal/replay-canvas@npm:8.40.0": - version: 8.40.0 - resolution: "@sentry-internal/replay-canvas@npm:8.40.0" +"@sentry-internal/replay-canvas@npm:8.41.0": + version: 8.41.0 + resolution: "@sentry-internal/replay-canvas@npm:8.41.0" dependencies: - "@sentry-internal/replay": 8.40.0 - "@sentry/core": 8.40.0 - "@sentry/types": 8.40.0 - checksum: ed4eee113ede6c3f5dfec190a8df24957f366bf0698f78b626ae53876c8319583c5cc042d93cb3542147eab3e4e1d3c95ee24cb0bb530800cc1dd926b64ed811 + "@sentry-internal/replay": 8.41.0 + "@sentry/core": 8.41.0 + "@sentry/types": 8.41.0 + checksum: 673c6e9a48dd1929e7c41060ceca9f88073e09674ae841851d501b350f144d509a020dd8588550a6ae502e488b64b22d0ff70dd45bd5578bde558be847ecd9c5 languageName: node linkType: hard -"@sentry-internal/replay@npm:8.40.0": - version: 8.40.0 - resolution: "@sentry-internal/replay@npm:8.40.0" +"@sentry-internal/replay@npm:8.41.0": + version: 8.41.0 + resolution: "@sentry-internal/replay@npm:8.41.0" dependencies: - "@sentry-internal/browser-utils": 8.40.0 - "@sentry/core": 8.40.0 - "@sentry/types": 8.40.0 - checksum: 6e37746ec8de83551aef8001583f114b9f04bdf85dd6db9431d939263c87530ac484e826585c3ee210a9089db0743e0221974bd2e7a9aeb6ff79cd150f163d14 + "@sentry-internal/browser-utils": 8.41.0 + "@sentry/core": 8.41.0 + "@sentry/types": 8.41.0 + checksum: d7bc48e99d31d4fe8431c7169c9b427f8e04ea9bc947fad17f851dd5710674f666d9b6b892706c52b7c0d1bd376bce768b41695ee6543d2753b1f40e5df264a3 languageName: node linkType: hard @@ -7635,12 +7635,12 @@ __metadata: languageName: node linkType: hard -"@sentry-internal/typescript@npm:8.40.0": - version: 8.40.0 - resolution: "@sentry-internal/typescript@npm:8.40.0" +"@sentry-internal/typescript@npm:8.41.0": + version: 8.41.0 + resolution: "@sentry-internal/typescript@npm:8.41.0" peerDependencies: typescript: 4.9.5 - checksum: 9aa59edb8d69cb77dac7aca74ce34bc2ffb6f55ca19737978b55447bf8e651abfd1598eb6cf551bb9914f51b866c5b031734c8043915128b6058d6a2cd93cdff + checksum: b8fe6b5c384751727d21941e5d12a627e433287050ff64d00460690b5d9bee82c49c9ec439ff19b304ecb5267cd525c2ad28cabcdb4e06ea9ad20d2459e8df1b languageName: node linkType: hard @@ -7658,17 +7658,17 @@ __metadata: languageName: node linkType: hard -"@sentry/browser@npm:8.40.0": - version: 8.40.0 - resolution: "@sentry/browser@npm:8.40.0" +"@sentry/browser@npm:8.41.0": + version: 8.41.0 + resolution: "@sentry/browser@npm:8.41.0" dependencies: - "@sentry-internal/browser-utils": 8.40.0 - "@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 - checksum: b8c21570ff6a26effd1ae2843ab377c3e345624e38cea2eff916b160c8b3d33eb649d088f4f9dfcb26ae0aa8e8d02a7f947ed19af7a139ac2ad2b1f9d3adca2d + "@sentry-internal/browser-utils": 8.41.0 + "@sentry-internal/feedback": 8.41.0 + "@sentry-internal/replay": 8.41.0 + "@sentry-internal/replay-canvas": 8.41.0 + "@sentry/core": 8.41.0 + "@sentry/types": 8.41.0 + checksum: 44b96e28afe94c4a62e43fe9e1ee1dc12adb46066e25c96e8557631b25833135d919bcf02f2ea93da315bac9fd3ba7e4f1890d3bbf1409c2823d51aa7f6e8bca languageName: node linkType: hard @@ -7784,12 +7784,12 @@ __metadata: languageName: node linkType: hard -"@sentry/core@npm:8.40.0": - version: 8.40.0 - resolution: "@sentry/core@npm:8.40.0" +"@sentry/core@npm:8.41.0": + version: 8.41.0 + resolution: "@sentry/core@npm:8.41.0" dependencies: - "@sentry/types": 8.40.0 - checksum: db80e8410401c3dfd09d1bad0508e592b44082e58a44a354b9332f4dc7295e3f98bcdfb36e542e43d2e66fbfbb8f1e8035feb91994e7f40a2a869d1de979b1d2 + "@sentry/types": 8.41.0 + checksum: a7c96f155ca9f555091a0e6bfccd061c3eb6545adcaec2323e27ed60c65550d407b1de3516694fc729b43496f58bb0e3c99f1315d052fc6bec55d52c98eea2ed languageName: node linkType: hard @@ -7826,16 +7826,16 @@ __metadata: "@expo/metro-config": 0.19.5 "@mswjs/interceptors": ^0.25.15 "@react-native/babel-preset": 0.76.3 - "@sentry-internal/eslint-config-sdk": 8.40.0 - "@sentry-internal/eslint-plugin-sdk": 8.40.0 - "@sentry-internal/typescript": 8.40.0 + "@sentry-internal/eslint-config-sdk": 8.41.0 + "@sentry-internal/eslint-plugin-sdk": 8.41.0 + "@sentry-internal/typescript": 8.41.0 "@sentry/babel-plugin-component-annotate": 2.20.1 - "@sentry/browser": 8.40.0 + "@sentry/browser": 8.41.0 "@sentry/cli": 2.39.1 - "@sentry/core": 8.40.0 - "@sentry/react": 8.40.0 - "@sentry/types": 8.40.0 - "@sentry/utils": 8.40.0 + "@sentry/core": 8.41.0 + "@sentry/react": 8.41.0 + "@sentry/types": 8.41.0 + "@sentry/utils": 8.41.0 "@sentry/wizard": 3.36.0 "@testing-library/react-native": ^12.7.2 "@types/jest": ^29.5.3 @@ -7882,17 +7882,17 @@ __metadata: languageName: unknown linkType: soft -"@sentry/react@npm:8.40.0": - version: 8.40.0 - resolution: "@sentry/react@npm:8.40.0" +"@sentry/react@npm:8.41.0": + version: 8.41.0 + resolution: "@sentry/react@npm:8.41.0" dependencies: - "@sentry/browser": 8.40.0 - "@sentry/core": 8.40.0 - "@sentry/types": 8.40.0 + "@sentry/browser": 8.41.0 + "@sentry/core": 8.41.0 + "@sentry/types": 8.41.0 hoist-non-react-statics: ^3.3.2 peerDependencies: react: ^16.14.0 || 17.x || 18.x || 19.x - checksum: 53276804fb6cb82c7ed69d62db3452c55c2dc275f4afe0a07e6572b0855231b64d487a4b13fc843ee319b5e6390c34245b80e3e6784d799cc2e14f814fedf920 + checksum: ca6e209287e7c2ec7213b41044c31061a705f2c7f005d1a7a8059f57ae27308ee588495652c744ab6f68fb14d96ba79260de05d8e538ce4273abc283a0f9cb15 languageName: node linkType: hard @@ -7903,10 +7903,10 @@ __metadata: languageName: node linkType: hard -"@sentry/types@npm:8.40.0": - version: 8.40.0 - resolution: "@sentry/types@npm:8.40.0" - checksum: eb7fbb606d9178559de219e86da5dfefa78a8825d5baf03a2eb8fafdcdfb51898bde943edc375adc8cb71fcae2d854b019088c6a045541e94a1c6c1c9779cfe8 +"@sentry/types@npm:8.41.0": + version: 8.41.0 + resolution: "@sentry/types@npm:8.41.0" + checksum: 975ca97ceebcddef6db5517000cbec54afe5cda1f5ac4ea1ba32ab1be4f96f63660c9f8059753e86a2cf37df310e3e998e8d7bd3c4d1e588e298daf136fde722 languageName: node linkType: hard @@ -7919,13 +7919,13 @@ __metadata: languageName: node linkType: hard -"@sentry/utils@npm:8.40.0": - version: 8.40.0 - resolution: "@sentry/utils@npm:8.40.0" +"@sentry/utils@npm:8.41.0": + version: 8.41.0 + resolution: "@sentry/utils@npm:8.41.0" dependencies: - "@sentry/core": 8.40.0 - "@sentry/types": 8.40.0 - checksum: 18d1c5a1b259dbe6ceee9ae7ef22fa0cb0cc5650ecfe51dc2d9367992981d4ce9d5d8267e27ab2e32ca56525c11b0f3a1f41e34492d14d0059e3983d18042fd0 + "@sentry/core": 8.41.0 + "@sentry/types": 8.41.0 + checksum: 09a820928f54a87d385c628a5c8ba0fdf5b3e93befcbaf05237e6db26323d10b17900924f68384fdecece95908cd6462f9870b34000caa80ed34c599db065156 languageName: node linkType: hard @@ -24295,7 +24295,7 @@ __metadata: "@babel/preset-env": ^7.25.3 "@babel/preset-typescript": ^7.18.6 "@sentry/react-native": 6.4.0 - "@sentry/utils": 8.40.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/react": 8.40.0 + "@sentry/react": 8.41.0 "@sentry/react-native": 6.4.0 - "@sentry/types": 8.40.0 - "@sentry/utils": 8.40.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 From 98fb43fa7b8534e902d8e130606d562b005e9dc6 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Thu, 12 Dec 2024 18:33:06 +0200 Subject: [PATCH 2/8] internal: Replace sentry/utils by sentry/core (#4352) --- dev-packages/e2e-tests/package.json | 2 +- .../patch-scripts/rn.patch.app.build.gradle.js | 2 +- dev-packages/e2e-tests/patch-scripts/rn.patch.app.js | 2 +- .../patch-scripts/rn.patch.gradle.properties.js | 2 +- .../e2e-tests/patch-scripts/rn.patch.metro.config.js | 2 +- .../e2e-tests/patch-scripts/rn.patch.podfile.js | 2 +- dev-packages/e2e-tests/patch-scripts/rn.patch.xcode.js | 2 +- packages/core/package.json | 2 +- packages/core/src/js/breadcrumb.ts | 2 +- packages/core/src/js/client.ts | 3 +-- packages/core/src/js/integrations/debugsymbolicator.ts | 2 +- .../core/src/js/integrations/debugsymbolicatorutils.ts | 2 +- packages/core/src/js/integrations/devicecontext.ts | 2 +- packages/core/src/js/integrations/modulesloader.ts | 2 +- .../core/src/js/integrations/nativelinkederrors.ts | 2 +- .../src/js/integrations/reactnativeerrorhandlers.ts | 3 +-- .../js/integrations/reactnativeerrorhandlersutils.ts | 2 +- packages/core/src/js/integrations/sdkinfo.ts | 2 +- packages/core/src/js/integrations/spotlight.ts | 2 +- packages/core/src/js/integrations/viewhierarchy.ts | 2 +- packages/core/src/js/profiling/cache.ts | 2 +- packages/core/src/js/profiling/convertHermesProfile.ts | 2 +- packages/core/src/js/profiling/debugid.ts | 2 +- packages/core/src/js/profiling/integration.ts | 3 +-- packages/core/src/js/profiling/utils.ts | 2 +- packages/core/src/js/replay/CustomMask.tsx | 2 +- packages/core/src/js/replay/mobilereplay.ts | 2 +- packages/core/src/js/replay/xhrUtils.ts | 2 +- packages/core/src/js/sdk.tsx | 3 +-- packages/core/src/js/tools/ModulesCollector.ts | 2 +- packages/core/src/js/tools/enableLogger.ts | 2 +- packages/core/src/js/tools/metroMiddleware.ts | 2 +- packages/core/src/js/tools/metroconfig.ts | 6 +++--- .../core/src/js/tools/sentryBabelTransformerUtils.ts | 2 +- packages/core/src/js/touchevents.tsx | 3 +-- packages/core/src/js/tracing/gesturetracing.ts | 3 +-- packages/core/src/js/tracing/integrations/appStart.ts | 3 ++- .../core/src/js/tracing/integrations/nativeFrames.ts | 2 +- .../core/src/js/tracing/integrations/stalltracking.ts | 3 +-- .../src/js/tracing/integrations/userInteraction.ts | 10 ++++++++-- packages/core/src/js/tracing/onSpanEndUtils.ts | 3 +-- packages/core/src/js/tracing/reactnativeprofiler.tsx | 2 +- packages/core/src/js/tracing/reactnavigation.ts | 4 +++- packages/core/src/js/tracing/span.ts | 3 ++- packages/core/src/js/tracing/timetodisplay.tsx | 3 +-- packages/core/src/js/tracing/utils.ts | 5 ++++- packages/core/src/js/transports/native.ts | 4 ++-- packages/core/src/js/utils/envelope.ts | 2 +- packages/core/src/js/utils/fill.ts | 4 ++-- packages/core/src/js/utils/normalize.ts | 2 +- packages/core/src/js/utils/safe.ts | 2 +- packages/core/src/js/utils/sentryeventemitter.ts | 2 +- .../core/src/js/utils/sentryeventemitterfallback.ts | 2 +- packages/core/src/js/utils/worldwide.ts | 4 ++-- packages/core/src/js/wrapper.ts | 2 +- packages/core/test/client.test.ts | 2 +- packages/core/test/mocks/client.ts | 2 +- packages/core/test/sdk.test.ts | 3 +-- packages/core/test/sdk.withclient.test.ts | 3 +-- packages/core/test/testutils.ts | 2 +- packages/core/test/tools/collectModules.test.ts | 4 ++-- packages/core/test/tools/metroconfig.test.ts | 2 +- .../core/test/tracing/integrations/appStart.test.ts | 6 +++--- .../integrations/stallTracking/stalltracking.test.ts | 2 +- packages/core/test/tracing/reactnativetracing.test.ts | 4 ++-- .../core/test/tracing/reactnavigation.ttid.test.tsx | 2 +- packages/core/test/tracing/timetodisplay.test.tsx | 3 +-- .../test/utils/mockedSentryeventemitterfallback.ts | 2 +- .../core/test/utils/sentryeventemitterfallback.test.ts | 10 +++++----- packages/core/test/wrapper.test.ts | 2 +- samples/react-native-macos/package.json | 2 +- yarn.lock | 4 ++-- 72 files changed, 100 insertions(+), 99 deletions(-) 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 From fb698e920535f4dcbc6b8b42e0d9fe84777b7ca7 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Thu, 12 Dec 2024 19:02:10 +0200 Subject: [PATCH 3/8] internal: move the deprecated makeFifoCache implementation in the SDK (#4353) --- packages/core/src/js/profiling/cache.ts | 71 ++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 2 deletions(-) diff --git a/packages/core/src/js/profiling/cache.ts b/packages/core/src/js/profiling/cache.ts index 47126b4bd4..e6496db433 100644 --- a/packages/core/src/js/profiling/cache.ts +++ b/packages/core/src/js/profiling/cache.ts @@ -1,5 +1,72 @@ -import { makeFifoCache } from '@sentry/core'; - import type { AndroidCombinedProfileEvent, CombinedProfileEvent } from './types'; export const PROFILE_QUEUE = makeFifoCache(20); + +/** + * Creates a cache that evicts keys in fifo order + * @param size {Number} + */ +function makeFifoCache( + size: number, +): { + get: (key: Key) => Value | undefined; + add: (key: Key, value: Value) => void; + delete: (key: Key) => boolean; + clear: () => void; + size: () => number; +} { + // Maintain a fifo queue of keys, we cannot rely on Object.keys as the browser may not support it. + let evictionOrder: Key[] = []; + let cache: Record = {}; + + return { + add(key: Key, value: Value) { + while (evictionOrder.length >= size) { + // shift is O(n) but this is small size and only happens if we are + // exceeding the cache size so it should be fine. + const evictCandidate = evictionOrder.shift(); + + if (evictCandidate !== undefined) { + // eslint-disable-next-line @typescript-eslint/no-dynamic-delete + delete cache[evictCandidate]; + } + } + + // in case we have a collision, delete the old key. + if (cache[key]) { + this.delete(key); + } + + evictionOrder.push(key); + cache[key] = value; + }, + clear() { + cache = {}; + evictionOrder = []; + }, + get(key: Key): Value | undefined { + return cache[key]; + }, + size() { + return evictionOrder.length; + }, + // Delete cache key and return true if it existed, false otherwise. + delete(key: Key): boolean { + if (!cache[key]) { + return false; + } + + // eslint-disable-next-line @typescript-eslint/no-dynamic-delete + delete cache[key]; + + for (let i = 0; i < evictionOrder.length; i++) { + if (evictionOrder[i] === key) { + evictionOrder.splice(i, 1); + break; + } + } + + return true; + }, + }; +} From f54118bf430b509e9bae81c4c0758cc57c755ed1 Mon Sep 17 00:00:00 2001 From: Lizzi Lindboe Date: Thu, 12 Dec 2024 09:09:53 -0800 Subject: [PATCH 4/8] feat: Export `Span` type (#4345) --- CHANGELOG.md | 2 ++ packages/core/src/js/index.ts | 1 + 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98544df407..8598c0d622 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,8 @@ }); ``` +- Export `Span` type from `@sentry/types` ([#4345](https://github.com/getsentry/sentry-react-native/pull/4345)) + ### Fixes - Return `lastEventId` export from `@sentry/core` ([#4315](https://github.com/getsentry/sentry-react-native/pull/4315)) diff --git a/packages/core/src/js/index.ts b/packages/core/src/js/index.ts index 4aa7e2fa21..af1c1d9851 100644 --- a/packages/core/src/js/index.ts +++ b/packages/core/src/js/index.ts @@ -6,6 +6,7 @@ export type { Exception, SendFeedbackParams, SeverityLevel, + Span, StackFrame, Stacktrace, Thread, From a84dacec1019a0f6d7b95a821ef8bb697bb4b4f2 Mon Sep 17 00:00:00 2001 From: Jeffrey Hung <17494876+Jeffreyhung@users.noreply.github.com> Date: Thu, 12 Dec 2024 10:23:23 -0800 Subject: [PATCH 5/8] Replace release bot with GH app (#4354) --- .github/workflows/release.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ee35eb2d86..b31b56c8af 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,10 +17,16 @@ jobs: runs-on: ubuntu-latest name: "Release a new version" steps: + - name: Get auth token + id: token + uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0 + with: + app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }} + private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }} - name: Check out current commit (${{ github.sha }}) uses: actions/checkout@v4 with: - token: ${{ secrets.GH_RELEASE_PAT }} + token: ${{ steps.token.outputs.token }} fetch-depth: 0 - run: corepack enable - uses: actions/setup-node@v4 @@ -31,7 +37,7 @@ jobs: - name: Prepare release uses: getsentry/action-prepare-release@v1 env: - GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }} + GITHUB_TOKEN: ${{ steps.token.outputs.token }} with: version: ${{ github.event.inputs.version }} force: ${{ github.event.inputs.force }} From 9dabcce91695e113476829c1984f6ba4a92c601d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 10:25:31 +0200 Subject: [PATCH 6/8] chore: update scripts/update-android.sh to 7.19.0 (#4365) Co-authored-by: GitHub --- CHANGELOG.md | 6 +++--- packages/core/android/build.gradle | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8598c0d622..65c7ff2df8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,9 +53,9 @@ - Bump CLI from v2.38.2 to v2.39.1 ([#4305](https://github.com/getsentry/sentry-react-native/pull/4305), [#4316](https://github.com/getsentry/sentry-react-native/pull/4316)) - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2391) - [diff](https://github.com/getsentry/sentry-cli/compare/2.38.2...2.39.1) -- Bump Android SDK from v7.18.0 to v7.18.1 ([#4329](https://github.com/getsentry/sentry-react-native/pull/4329)) - - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7181) - - [diff](https://github.com/getsentry/sentry-java/compare/7.18.0...7.18.1) +- Bump Android SDK from v7.18.0 to v7.19.0 ([#4329](https://github.com/getsentry/sentry-react-native/pull/4329), [#4365](https://github.com/getsentry/sentry-react-native/pull/4365)) + - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7190) + - [diff](https://github.com/getsentry/sentry-java/compare/7.18.0...7.19.0) - Bump JavaScript SDK from v8.40.0 to v8.41.0 ([#4351](https://github.com/getsentry/sentry-react-native/pull/4351)) - [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#8410) - [diff](https://github.com/getsentry/sentry-javascript/compare/8.40.0...8.41.0) diff --git a/packages/core/android/build.gradle b/packages/core/android/build.gradle index 9467d56c65..a130f72198 100644 --- a/packages/core/android/build.gradle +++ b/packages/core/android/build.gradle @@ -54,5 +54,5 @@ android { dependencies { implementation 'com.facebook.react:react-native:+' - api 'io.sentry:sentry-android:7.18.1' + api 'io.sentry:sentry-android:7.19.0' } From fd7919f16a4fad5a948c76a86b70b7eceb762b10 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 11:16:46 +0200 Subject: [PATCH 7/8] chore: update scripts/update-javascript.sh to 8.44.0 (#4325) Co-authored-by: GitHub --- CHANGELOG.md | 6 +- dev-packages/e2e-tests/package.json | 2 +- packages/core/package.json | 16 +-- samples/react-native-macos/package.json | 6 +- yarn.lock | 163 ++++++++++++------------ 5 files changed, 93 insertions(+), 100 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65c7ff2df8..25710580e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,9 +56,9 @@ - Bump Android SDK from v7.18.0 to v7.19.0 ([#4329](https://github.com/getsentry/sentry-react-native/pull/4329), [#4365](https://github.com/getsentry/sentry-react-native/pull/4365)) - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7190) - [diff](https://github.com/getsentry/sentry-java/compare/7.18.0...7.19.0) -- Bump JavaScript SDK from v8.40.0 to v8.41.0 ([#4351](https://github.com/getsentry/sentry-react-native/pull/4351)) - - [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#8410) - - [diff](https://github.com/getsentry/sentry-javascript/compare/8.40.0...8.41.0) +- Bump JavaScript SDK from v8.40.0 to v8.44.0 ([#4351](https://github.com/getsentry/sentry-react-native/pull/4351), [#4325](https://github.com/getsentry/sentry-react-native/pull/4325)) + - [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#8440) + - [diff](https://github.com/getsentry/sentry-javascript/compare/8.40.0...8.44.0) ## 6.4.0 diff --git a/dev-packages/e2e-tests/package.json b/dev-packages/e2e-tests/package.json index 0d21a29e3b..2c3c6f4d2f 100644 --- a/dev-packages/e2e-tests/package.json +++ b/dev-packages/e2e-tests/package.json @@ -13,7 +13,7 @@ "devDependencies": { "@babel/preset-env": "^7.25.3", "@babel/preset-typescript": "^7.18.6", - "@sentry/core": "8.41.0", + "@sentry/core": "8.44.0", "@sentry/react-native": "6.4.0", "@types/node": "^20.9.3", "@types/react": "^18.2.64", diff --git a/packages/core/package.json b/packages/core/package.json index 894c1c8670..8bc6ca850d 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -66,21 +66,21 @@ }, "dependencies": { "@sentry/babel-plugin-component-annotate": "2.20.1", - "@sentry/browser": "8.41.0", + "@sentry/browser": "8.44.0", "@sentry/cli": "2.39.1", - "@sentry/core": "8.41.0", - "@sentry/react": "8.41.0", - "@sentry/types": "8.41.0", - "@sentry/utils": "8.41.0" + "@sentry/core": "8.44.0", + "@sentry/react": "8.44.0", + "@sentry/types": "8.44.0", + "@sentry/utils": "8.44.0" }, "devDependencies": { "@babel/core": "^7.25.2", "@expo/metro-config": "0.19.5", "@mswjs/interceptors": "^0.25.15", "@react-native/babel-preset": "0.76.3", - "@sentry-internal/eslint-config-sdk": "8.41.0", - "@sentry-internal/eslint-plugin-sdk": "8.41.0", - "@sentry-internal/typescript": "8.41.0", + "@sentry-internal/eslint-config-sdk": "8.44.0", + "@sentry-internal/eslint-plugin-sdk": "8.44.0", + "@sentry-internal/typescript": "8.44.0", "@sentry/wizard": "3.36.0", "@testing-library/react-native": "^12.7.2", "@types/jest": "^29.5.3", diff --git a/samples/react-native-macos/package.json b/samples/react-native-macos/package.json index dcf6e56b67..f245a7003a 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/core": "8.44.0", + "@sentry/react": "8.44.0", "@sentry/react-native": "6.4.0", - "@sentry/types": "8.41.0", + "@sentry/types": "8.44.0", "delay": "^6.0.0", "react": "18.2.0", "react-native": "0.73.9", diff --git a/yarn.lock b/yarn.lock index 52c4b84ce0..1a61cbb924 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7555,22 +7555,21 @@ __metadata: languageName: node linkType: hard -"@sentry-internal/browser-utils@npm:8.41.0": - version: 8.41.0 - resolution: "@sentry-internal/browser-utils@npm:8.41.0" +"@sentry-internal/browser-utils@npm:8.44.0": + version: 8.44.0 + resolution: "@sentry-internal/browser-utils@npm:8.44.0" dependencies: - "@sentry/core": 8.41.0 - "@sentry/types": 8.41.0 - checksum: e69a20cd60086993a5a473fa247bf3c4c3ae7e7a1b650ff29cb017baac34aa597f35b8df86bc691ad5c5ad5c8394cb3f982c4da6c593b6dec6147cdd2aefeb7a + "@sentry/core": 8.44.0 + checksum: 0eb1a158a3db6031bd61eb182a2db4ee5d4fe27c85545bfff99e0d6cd222b077ed7ff9d83063f3b8dad5127c1090ef6e1158e2ba16ea088f757e690abdca44b6 languageName: node linkType: hard -"@sentry-internal/eslint-config-sdk@npm:8.41.0": - version: 8.41.0 - resolution: "@sentry-internal/eslint-config-sdk@npm:8.41.0" +"@sentry-internal/eslint-config-sdk@npm:8.44.0": + version: 8.44.0 + resolution: "@sentry-internal/eslint-config-sdk@npm:8.44.0" dependencies: - "@sentry-internal/eslint-plugin-sdk": 8.41.0 - "@sentry-internal/typescript": 8.41.0 + "@sentry-internal/eslint-plugin-sdk": 8.44.0 + "@sentry-internal/typescript": 8.44.0 "@typescript-eslint/eslint-plugin": ^5.48.0 "@typescript-eslint/parser": ^5.48.0 eslint-config-prettier: ^6.11.0 @@ -7581,46 +7580,43 @@ __metadata: eslint-plugin-simple-import-sort: ^5.0.3 peerDependencies: eslint: ">=5" - checksum: 63014266652bff78a60824928adc5e69e3ea2bb1de8c957151078509cd441da739867f35e9cac1cd2c37b0c58fec34427e2da0807a832052dd60d35f827873ba + checksum: 713469a4fd50fb78adc483997773b167e725b4ce6ffc18ef583dab2cf883146d19c7762d5fdfefdde74daa8e64c0ed34f8cf378895b9fabd633d0850685c440e languageName: node linkType: hard -"@sentry-internal/eslint-plugin-sdk@npm:8.41.0": - version: 8.41.0 - resolution: "@sentry-internal/eslint-plugin-sdk@npm:8.41.0" - checksum: a130b9a1ed2535f33b598c0830a8dbe33332ba89d65a2afd271bac2b310f458da071b5c8377f301c2bf293f6fdbdfc16123628db80639fb1c6b4011d5ed0855d +"@sentry-internal/eslint-plugin-sdk@npm:8.44.0": + version: 8.44.0 + resolution: "@sentry-internal/eslint-plugin-sdk@npm:8.44.0" + checksum: 368cf9155060be7920f4d7255f9bd345fe229d1f611ee61c197b29db3f1431f1521b6933a9415d17713ae44d4f7a5beca9ad5f914620be9f3236bdb9678d72e2 languageName: node linkType: hard -"@sentry-internal/feedback@npm:8.41.0": - version: 8.41.0 - resolution: "@sentry-internal/feedback@npm:8.41.0" +"@sentry-internal/feedback@npm:8.44.0": + version: 8.44.0 + resolution: "@sentry-internal/feedback@npm:8.44.0" dependencies: - "@sentry/core": 8.41.0 - "@sentry/types": 8.41.0 - checksum: 9beef2c0cacf5e9cf1650cb0ad8d95ff26a3d8fb833f009c6399b207ae6c6f49f61f9beb483d252044fd26b23a882780438c7a15fe7b32324c05f78c0abb4f01 + "@sentry/core": 8.44.0 + checksum: 339b8a3451a775c0738d9cc38114411de0de2b0161dd914ae54270944972a4bb791341e235d2fb1dd83ead9c8055a6e5ce24d151ba17206d005a3c524c39395c languageName: node linkType: hard -"@sentry-internal/replay-canvas@npm:8.41.0": - version: 8.41.0 - resolution: "@sentry-internal/replay-canvas@npm:8.41.0" +"@sentry-internal/replay-canvas@npm:8.44.0": + version: 8.44.0 + resolution: "@sentry-internal/replay-canvas@npm:8.44.0" dependencies: - "@sentry-internal/replay": 8.41.0 - "@sentry/core": 8.41.0 - "@sentry/types": 8.41.0 - checksum: 673c6e9a48dd1929e7c41060ceca9f88073e09674ae841851d501b350f144d509a020dd8588550a6ae502e488b64b22d0ff70dd45bd5578bde558be847ecd9c5 + "@sentry-internal/replay": 8.44.0 + "@sentry/core": 8.44.0 + checksum: 9b5f0048917e46d0a954c40d89cce5ac297dc20f48fe47cd154e4f7faedc3125968a4f524d7474d7c64021b957b2c70d20f6418c0fc3e9be8f8701ecfc21468e languageName: node linkType: hard -"@sentry-internal/replay@npm:8.41.0": - version: 8.41.0 - resolution: "@sentry-internal/replay@npm:8.41.0" +"@sentry-internal/replay@npm:8.44.0": + version: 8.44.0 + resolution: "@sentry-internal/replay@npm:8.44.0" dependencies: - "@sentry-internal/browser-utils": 8.41.0 - "@sentry/core": 8.41.0 - "@sentry/types": 8.41.0 - checksum: d7bc48e99d31d4fe8431c7169c9b427f8e04ea9bc947fad17f851dd5710674f666d9b6b892706c52b7c0d1bd376bce768b41695ee6543d2753b1f40e5df264a3 + "@sentry-internal/browser-utils": 8.44.0 + "@sentry/core": 8.44.0 + checksum: 7a2e296f6c76e5e4775f22ad5ef9afab806f7edcbcd33bd99d79c06f1e31420651509e022e1d17739fcf0a68b36c50da8e0b0a3a03c8fe82ca2d69eb625ea841 languageName: node linkType: hard @@ -7635,12 +7631,12 @@ __metadata: languageName: node linkType: hard -"@sentry-internal/typescript@npm:8.41.0": - version: 8.41.0 - resolution: "@sentry-internal/typescript@npm:8.41.0" +"@sentry-internal/typescript@npm:8.44.0": + version: 8.44.0 + resolution: "@sentry-internal/typescript@npm:8.44.0" peerDependencies: typescript: 4.9.5 - checksum: b8fe6b5c384751727d21941e5d12a627e433287050ff64d00460690b5d9bee82c49c9ec439ff19b304ecb5267cd525c2ad28cabcdb4e06ea9ad20d2459e8df1b + checksum: 9385795b015a219e2c9156e7ec8a8583fdb9f64d75dc76143ce0f97868e72c2bec7495db1a915a701ba61aecf02d05a8e203f1bdd37be82282814dbff3559bee languageName: node linkType: hard @@ -7658,17 +7654,16 @@ __metadata: languageName: node linkType: hard -"@sentry/browser@npm:8.41.0": - version: 8.41.0 - resolution: "@sentry/browser@npm:8.41.0" +"@sentry/browser@npm:8.44.0": + version: 8.44.0 + resolution: "@sentry/browser@npm:8.44.0" dependencies: - "@sentry-internal/browser-utils": 8.41.0 - "@sentry-internal/feedback": 8.41.0 - "@sentry-internal/replay": 8.41.0 - "@sentry-internal/replay-canvas": 8.41.0 - "@sentry/core": 8.41.0 - "@sentry/types": 8.41.0 - checksum: 44b96e28afe94c4a62e43fe9e1ee1dc12adb46066e25c96e8557631b25833135d919bcf02f2ea93da315bac9fd3ba7e4f1890d3bbf1409c2823d51aa7f6e8bca + "@sentry-internal/browser-utils": 8.44.0 + "@sentry-internal/feedback": 8.44.0 + "@sentry-internal/replay": 8.44.0 + "@sentry-internal/replay-canvas": 8.44.0 + "@sentry/core": 8.44.0 + checksum: ec4249719749104d360e6de3845cf314268f370b8af7892f4b2d209666247569402b7c94484a6c37ac0cc3c0414b6510ed0a7794bb7dc115e72fea6e072fe981 languageName: node linkType: hard @@ -7784,12 +7779,10 @@ __metadata: languageName: node linkType: hard -"@sentry/core@npm:8.41.0": - version: 8.41.0 - resolution: "@sentry/core@npm:8.41.0" - dependencies: - "@sentry/types": 8.41.0 - checksum: a7c96f155ca9f555091a0e6bfccd061c3eb6545adcaec2323e27ed60c65550d407b1de3516694fc729b43496f58bb0e3c99f1315d052fc6bec55d52c98eea2ed +"@sentry/core@npm:8.44.0": + version: 8.44.0 + resolution: "@sentry/core@npm:8.44.0" + checksum: 7567730b82f4cc4f8f63d32c571f37519ece3031f41c82728326c9d7d6be35fd3ad913d0a6b091c21704a27f21b10bf5c7a2e7fd4c3df8cc86b1da7eb59bac1a languageName: node linkType: hard @@ -7826,16 +7819,16 @@ __metadata: "@expo/metro-config": 0.19.5 "@mswjs/interceptors": ^0.25.15 "@react-native/babel-preset": 0.76.3 - "@sentry-internal/eslint-config-sdk": 8.41.0 - "@sentry-internal/eslint-plugin-sdk": 8.41.0 - "@sentry-internal/typescript": 8.41.0 + "@sentry-internal/eslint-config-sdk": 8.44.0 + "@sentry-internal/eslint-plugin-sdk": 8.44.0 + "@sentry-internal/typescript": 8.44.0 "@sentry/babel-plugin-component-annotate": 2.20.1 - "@sentry/browser": 8.41.0 + "@sentry/browser": 8.44.0 "@sentry/cli": 2.39.1 - "@sentry/core": 8.41.0 - "@sentry/react": 8.41.0 - "@sentry/types": 8.41.0 - "@sentry/utils": 8.41.0 + "@sentry/core": 8.44.0 + "@sentry/react": 8.44.0 + "@sentry/types": 8.44.0 + "@sentry/utils": 8.44.0 "@sentry/wizard": 3.36.0 "@testing-library/react-native": ^12.7.2 "@types/jest": ^29.5.3 @@ -7882,17 +7875,16 @@ __metadata: languageName: unknown linkType: soft -"@sentry/react@npm:8.41.0": - version: 8.41.0 - resolution: "@sentry/react@npm:8.41.0" +"@sentry/react@npm:8.44.0": + version: 8.44.0 + resolution: "@sentry/react@npm:8.44.0" dependencies: - "@sentry/browser": 8.41.0 - "@sentry/core": 8.41.0 - "@sentry/types": 8.41.0 + "@sentry/browser": 8.44.0 + "@sentry/core": 8.44.0 hoist-non-react-statics: ^3.3.2 peerDependencies: react: ^16.14.0 || 17.x || 18.x || 19.x - checksum: ca6e209287e7c2ec7213b41044c31061a705f2c7f005d1a7a8059f57ae27308ee588495652c744ab6f68fb14d96ba79260de05d8e538ce4273abc283a0f9cb15 + checksum: d0791827b76c8e73c165b0fba968e313a507e4e81e7aa76d26946d0d4286a7d75a9ad3b2ad6699dad828f20e5130b1094ccc7b529d40b9cff65843fab0a11fc1 languageName: node linkType: hard @@ -7903,10 +7895,12 @@ __metadata: languageName: node linkType: hard -"@sentry/types@npm:8.41.0": - version: 8.41.0 - resolution: "@sentry/types@npm:8.41.0" - checksum: 975ca97ceebcddef6db5517000cbec54afe5cda1f5ac4ea1ba32ab1be4f96f63660c9f8059753e86a2cf37df310e3e998e8d7bd3c4d1e588e298daf136fde722 +"@sentry/types@npm:8.44.0": + version: 8.44.0 + resolution: "@sentry/types@npm:8.44.0" + dependencies: + "@sentry/core": 8.44.0 + checksum: b247f8eb38602ff188814a11ef7de762f038ced6b9fdfcabe39875ce30ea55f9a30e0da136d4037667f6720386fadfec508e391ea75e61ff08582938fd535600 languageName: node linkType: hard @@ -7919,13 +7913,12 @@ __metadata: languageName: node linkType: hard -"@sentry/utils@npm:8.41.0": - version: 8.41.0 - resolution: "@sentry/utils@npm:8.41.0" +"@sentry/utils@npm:8.44.0": + version: 8.44.0 + resolution: "@sentry/utils@npm:8.44.0" dependencies: - "@sentry/core": 8.41.0 - "@sentry/types": 8.41.0 - checksum: 09a820928f54a87d385c628a5c8ba0fdf5b3e93befcbaf05237e6db26323d10b17900924f68384fdecece95908cd6462f9870b34000caa80ed34c599db065156 + "@sentry/core": 8.44.0 + checksum: afb7b880ebff369edf7c3974750c592c74025d9a3ff0d38406cae42cb4c5da5606f29cb3b9ac55c1ae3b57dd7a7c88881ed55e2f04eac4d47ab456ba2f381848 languageName: node linkType: hard @@ -24294,7 +24287,7 @@ __metadata: dependencies: "@babel/preset-env": ^7.25.3 "@babel/preset-typescript": ^7.18.6 - "@sentry/core": 8.41.0 + "@sentry/core": 8.44.0 "@sentry/react-native": 6.4.0 "@types/node": ^20.9.3 "@types/react": ^18.2.64 @@ -24358,10 +24351,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/core": 8.44.0 + "@sentry/react": 8.44.0 "@sentry/react-native": 6.4.0 - "@sentry/types": 8.41.0 + "@sentry/types": 8.44.0 "@types/react": ^18.2.65 "@types/react-native-vector-icons": ^6.4.18 "@types/react-test-renderer": ^18.0.0 From 9831482ece840f6004f539c5ebfdf9d2f260b1b2 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Fri, 13 Dec 2024 11:25:00 +0200 Subject: [PATCH 8/8] Adds beta note in the changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5aa90212d5..3493f9e1df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,7 +35,7 @@ }); ``` -- Adds feedback form ([#4320](https://github.com/getsentry/sentry-react-native/pull/4328)) +- Adds feedback form (beta) ([#4320](https://github.com/getsentry/sentry-react-native/pull/4328)) You can add the form component in your UI like: ```jsx