From 0b6a6d37b947d37b77a9928f05a8e9ce4809fc08 Mon Sep 17 00:00:00 2001 From: GitHub Date: Fri, 13 Dec 2024 08:29:05 +0000 Subject: [PATCH 1/2] chore: update scripts/update-javascript.sh to 8.44.0 --- 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 65c7ff2df..25710580e 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 0d21a29e3..2c3c6f4d2 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 894c1c867..8bc6ca850 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 dcf6e56b6..f245a7003 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 52c4b84ce..1a61cbb92 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 54d35d9331fdeba46de655a91279117ca747755c Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Fri, 13 Dec 2024 11:05:35 +0200 Subject: [PATCH 2/2] Deprecates sentry/types in favor of sentry/core --- packages/core/src/js/NativeRNSentry.ts | 2 +- packages/core/src/js/breadcrumb.ts | 2 +- packages/core/src/js/client.ts | 4 ++-- packages/core/src/js/index.ts | 2 +- packages/core/src/js/integrations/debugsymbolicator.ts | 2 +- .../core/src/js/integrations/debugsymbolicatorutils.ts | 2 +- packages/core/src/js/integrations/default.ts | 2 +- packages/core/src/js/integrations/devicecontext.ts | 2 +- packages/core/src/js/integrations/eventorigin.ts | 2 +- packages/core/src/js/integrations/expocontext.ts | 2 +- packages/core/src/js/integrations/factory.ts | 2 +- packages/core/src/js/integrations/modulesloader.ts | 2 +- .../core/src/js/integrations/nativelinkederrors.ts | 4 ++-- .../src/js/integrations/reactnativeerrorhandlers.ts | 2 +- packages/core/src/js/integrations/reactnativeinfo.ts | 2 +- packages/core/src/js/integrations/release.ts | 2 +- packages/core/src/js/integrations/rewriteframes.ts | 2 +- packages/core/src/js/integrations/screenshot.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/misc.ts | 2 +- packages/core/src/js/options.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 | 2 +- packages/core/src/js/profiling/types.ts | 2 +- packages/core/src/js/profiling/utils.ts | 2 +- packages/core/src/js/replay/mobilereplay.ts | 2 +- packages/core/src/js/replay/xhrUtils.ts | 2 +- packages/core/src/js/scopeSync.ts | 2 +- packages/core/src/js/sdk.tsx | 2 +- packages/core/src/js/tools/metroMiddleware.ts | 2 +- packages/core/src/js/touchevents.tsx | 2 +- packages/core/src/js/tracing/gesturetracing.ts | 2 +- packages/core/src/js/tracing/integrations/appStart.ts | 2 +- .../core/src/js/tracing/integrations/nativeFrames.ts | 2 +- .../core/src/js/tracing/integrations/stalltracking.ts | 2 +- .../src/js/tracing/integrations/userInteraction.ts | 2 +- packages/core/src/js/tracing/onSpanEndUtils.ts | 2 +- packages/core/src/js/tracing/reactnativenavigation.ts | 2 +- packages/core/src/js/tracing/reactnativetracing.ts | 2 +- packages/core/src/js/tracing/reactnavigation.ts | 2 +- packages/core/src/js/tracing/span.ts | 2 +- packages/core/src/js/tracing/timetodisplay.tsx | 2 +- packages/core/src/js/tracing/types.ts | 2 +- packages/core/src/js/tracing/utils.ts | 2 +- packages/core/src/js/transports/native.ts | 9 +++++++-- packages/core/src/js/user.ts | 2 +- packages/core/src/js/utils/clientutils.ts | 2 +- packages/core/src/js/utils/envelope.ts | 2 +- packages/core/src/js/utils/outcome.ts | 2 +- packages/core/src/js/utils/span.ts | 2 +- packages/core/src/js/wrapper.ts | 4 ++-- packages/core/test/breadcrumb.test.ts | 2 +- packages/core/test/client.test.ts | 2 +- packages/core/test/feedback.test.ts | 2 +- .../core/test/integrations/debugsymbolicator.test.ts | 2 +- packages/core/test/integrations/devicecontext.test.ts | 2 +- packages/core/test/integrations/eventorigin.test.ts | 2 +- packages/core/test/integrations/expocontext.test.ts | 2 +- .../integrations/integrationsexecutionorder.test.ts | 2 +- packages/core/test/integrations/modulesloader.test.ts | 2 +- .../core/test/integrations/nativelinkederrors.test.ts | 2 +- .../test/integrations/reactnativeerrorhandlers.test.ts | 2 +- .../core/test/integrations/reactnativeinfo.test.ts | 2 +- packages/core/test/integrations/release.test.ts | 2 +- packages/core/test/integrations/rewriteframes.test.ts | 2 +- packages/core/test/integrations/sdkinfo.test.ts | 2 +- packages/core/test/integrations/spotlight.test.ts | 2 +- packages/core/test/integrations/viewhierarchy.test.ts | 2 +- packages/core/test/mocks/client.ts | 10 +--------- .../core/test/profiling/convertHermesProfile.test.ts | 2 +- packages/core/test/profiling/hermes.test.ts | 2 +- packages/core/test/profiling/integration.test.ts | 2 +- packages/core/test/replay/xhrUtils.test.ts | 2 +- packages/core/test/scopeSync.test.ts | 2 +- packages/core/test/sdk.test.ts | 9 +-------- packages/core/test/testutils.ts | 2 +- packages/core/test/tools/metroMiddleware.test.ts | 2 +- packages/core/test/touchevents.test.tsx | 2 +- packages/core/test/tracing/gesturetracing.test.ts | 2 +- packages/core/test/tracing/idleNavigationSpan.test.ts | 2 +- .../core/test/tracing/integrations/appStart.test.ts | 2 +- .../test/tracing/integrations/nativeframes.test.ts | 2 +- .../integrations/stallTracking/stalltracking.test.ts | 2 +- .../integrations/stallTracking/stalltrackingutils.ts | 2 +- .../test/tracing/integrations/userInteraction.test.ts | 2 +- .../core/test/tracing/reactnativenavigation.test.ts | 2 +- packages/core/test/tracing/reactnativetracing.test.ts | 2 +- packages/core/test/tracing/reactnavigation.test.ts | 2 +- .../core/test/tracing/reactnavigation.ttid.test.tsx | 2 +- packages/core/test/tracing/timetodisplay.test.tsx | 2 +- packages/core/test/transports/native.test.ts | 2 +- packages/core/test/wrapper.test.ts | 2 +- samples/expo/app/_layout.tsx | 2 +- samples/expo/utils/setScopeProperties.ts | 2 +- samples/react-native-macos/package.json | 1 - samples/react-native-macos/src/App.tsx | 2 +- .../src/Screens/GesturesTracingScreen.tsx | 2 +- .../src/Screens/ManualTrackerScreen.tsx | 2 +- samples/react-native-macos/src/setScopeProperties.ts | 2 +- samples/react-native/src/App.tsx | 2 +- .../react-native/src/Screens/GesturesTracingScreen.tsx | 2 +- samples/react-native/src/setScopeProperties.ts | 2 +- yarn.lock | 1 - 106 files changed, 113 insertions(+), 125 deletions(-) diff --git a/packages/core/src/js/NativeRNSentry.ts b/packages/core/src/js/NativeRNSentry.ts index c82debe90..2d553e548 100644 --- a/packages/core/src/js/NativeRNSentry.ts +++ b/packages/core/src/js/NativeRNSentry.ts @@ -1,4 +1,4 @@ -import type { Package } from '@sentry/types'; +import type { Package } from '@sentry/core'; import type { TurboModule } from 'react-native'; import { TurboModuleRegistry } from 'react-native'; diff --git a/packages/core/src/js/breadcrumb.ts b/packages/core/src/js/breadcrumb.ts index c8b43b529..65a87c605 100644 --- a/packages/core/src/js/breadcrumb.ts +++ b/packages/core/src/js/breadcrumb.ts @@ -1,5 +1,5 @@ +import type { Breadcrumb, SeverityLevel } from '@sentry/core'; import { severityLevelFromString } from '@sentry/core'; -import type { Breadcrumb, SeverityLevel } from '@sentry/types'; export const DEFAULT_BREADCRUMB_LEVEL: SeverityLevel = 'info'; diff --git a/packages/core/src/js/client.ts b/packages/core/src/js/client.ts index cf623765a..d83816709 100644 --- a/packages/core/src/js/client.ts +++ b/packages/core/src/js/client.ts @@ -1,5 +1,4 @@ import { eventFromException, eventFromMessage } from '@sentry/browser'; -import { BaseClient, dateTimestampInSeconds, logger, SentryError } from '@sentry/core'; import type { ClientReportEnvelope, ClientReportItem, @@ -10,7 +9,8 @@ import type { SeverityLevel, TransportMakeRequestResponse, UserFeedback, -} from '@sentry/types'; +} from '@sentry/core'; +import { BaseClient, dateTimestampInSeconds, logger, SentryError } from '@sentry/core'; import { Alert } from 'react-native'; import { getDevServer } from './integrations/debugsymbolicatorutils'; diff --git a/packages/core/src/js/index.ts b/packages/core/src/js/index.ts index af1c1d985..e7c541161 100644 --- a/packages/core/src/js/index.ts +++ b/packages/core/src/js/index.ts @@ -12,7 +12,7 @@ export type { Thread, User, UserFeedback, -} from '@sentry/types'; +} from '@sentry/core'; export { addBreadcrumb, diff --git a/packages/core/src/js/integrations/debugsymbolicator.ts b/packages/core/src/js/integrations/debugsymbolicator.ts index 3aad20b81..8529d0eeb 100644 --- a/packages/core/src/js/integrations/debugsymbolicator.ts +++ b/packages/core/src/js/integrations/debugsymbolicator.ts @@ -1,5 +1,5 @@ +import type { Event, EventHint, Exception, Integration, StackFrame as SentryStackFrame } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { Event, EventHint, Exception, Integration, StackFrame as SentryStackFrame } from '@sentry/types'; import type { ExtendedError } from '../utils/error'; import { getFramesToPop, isErrorLike } from '../utils/error'; diff --git a/packages/core/src/js/integrations/debugsymbolicatorutils.ts b/packages/core/src/js/integrations/debugsymbolicatorutils.ts index 41cc4d7d1..2b51171b3 100644 --- a/packages/core/src/js/integrations/debugsymbolicatorutils.ts +++ b/packages/core/src/js/integrations/debugsymbolicatorutils.ts @@ -1,5 +1,5 @@ +import type { StackFrame as SentryStackFrame } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { StackFrame as SentryStackFrame } from '@sentry/types'; import { ReactNativeLibraries } from '../utils/rnlibraries'; import { createStealthXhr, XHR_READYSTATE_DONE } from '../utils/xhr'; diff --git a/packages/core/src/js/integrations/default.ts b/packages/core/src/js/integrations/default.ts index 0f32ba6b1..8d48c4b2f 100644 --- a/packages/core/src/js/integrations/default.ts +++ b/packages/core/src/js/integrations/default.ts @@ -1,6 +1,6 @@ /* eslint-disable complexity */ +import type { Integration } from '@sentry/core'; import type { BrowserOptions } from '@sentry/react'; -import type { Integration } from '@sentry/types'; import type { ReactNativeClientOptions } from '../options'; import { reactNativeTracingIntegration } from '../tracing'; diff --git a/packages/core/src/js/integrations/devicecontext.ts b/packages/core/src/js/integrations/devicecontext.ts index df32574ed..27875972a 100644 --- a/packages/core/src/js/integrations/devicecontext.ts +++ b/packages/core/src/js/integrations/devicecontext.ts @@ -1,6 +1,6 @@ /* eslint-disable complexity */ +import type { Client, Event, EventHint, Integration } from '@sentry/core'; import { logger, severityLevelFromString } from '@sentry/core'; -import type { Client, Event, EventHint, Integration } from '@sentry/types'; import { AppState } from 'react-native'; import { breadcrumbFromObject } from '../breadcrumb'; diff --git a/packages/core/src/js/integrations/eventorigin.ts b/packages/core/src/js/integrations/eventorigin.ts index b5163c55f..e93074ce6 100644 --- a/packages/core/src/js/integrations/eventorigin.ts +++ b/packages/core/src/js/integrations/eventorigin.ts @@ -1,4 +1,4 @@ -import type { Event, Integration } from '@sentry/types'; +import type { Event, Integration } from '@sentry/core'; const INTEGRATION_NAME = 'EventOrigin'; diff --git a/packages/core/src/js/integrations/expocontext.ts b/packages/core/src/js/integrations/expocontext.ts index 8a1dc6838..8e1db1a3a 100644 --- a/packages/core/src/js/integrations/expocontext.ts +++ b/packages/core/src/js/integrations/expocontext.ts @@ -1,4 +1,4 @@ -import type { DeviceContext, Event, Integration, OsContext } from '@sentry/types'; +import type { DeviceContext, Event, Integration, OsContext } from '@sentry/core'; import { getExpoDevice } from '../utils/expomodules'; diff --git a/packages/core/src/js/integrations/factory.ts b/packages/core/src/js/integrations/factory.ts index 6dbea2eae..21d8064ca 100644 --- a/packages/core/src/js/integrations/factory.ts +++ b/packages/core/src/js/integrations/factory.ts @@ -1,4 +1,4 @@ -import type { Integration } from '@sentry/types'; +import type { Integration } from '@sentry/core'; /** * Creates an integration out of the provided name and setup function. diff --git a/packages/core/src/js/integrations/modulesloader.ts b/packages/core/src/js/integrations/modulesloader.ts index bd65e4f69..7a31154d3 100644 --- a/packages/core/src/js/integrations/modulesloader.ts +++ b/packages/core/src/js/integrations/modulesloader.ts @@ -1,5 +1,5 @@ +import type { Event, Integration } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { Event, Integration } from '@sentry/types'; import { NATIVE } from '../wrapper'; diff --git a/packages/core/src/js/integrations/nativelinkederrors.ts b/packages/core/src/js/integrations/nativelinkederrors.ts index 020a4d565..39d8d5587 100644 --- a/packages/core/src/js/integrations/nativelinkederrors.ts +++ b/packages/core/src/js/integrations/nativelinkederrors.ts @@ -1,5 +1,4 @@ import { exceptionFromError } from '@sentry/browser'; -import { isInstanceOf, isPlainObject, isString } from '@sentry/core'; import type { Client, DebugImage, @@ -10,7 +9,8 @@ import type { Integration, StackFrame, StackParser, -} from '@sentry/types'; +} from '@sentry/core'; +import { isInstanceOf, isPlainObject, isString } from '@sentry/core'; import type { NativeStackFrames } from '../NativeRNSentry'; import { NATIVE } from '../wrapper'; diff --git a/packages/core/src/js/integrations/reactnativeerrorhandlers.ts b/packages/core/src/js/integrations/reactnativeerrorhandlers.ts index eef7e7812..78b68f23e 100644 --- a/packages/core/src/js/integrations/reactnativeerrorhandlers.ts +++ b/packages/core/src/js/integrations/reactnativeerrorhandlers.ts @@ -1,5 +1,5 @@ +import type { EventHint, Integration, SeverityLevel } from '@sentry/core'; import { addExceptionMechanism, captureException, getClient, getCurrentScope, logger } from '@sentry/core'; -import type { EventHint, Integration, SeverityLevel } from '@sentry/types'; import { createSyntheticError, isErrorLike } from '../utils/error'; import { RN_GLOBAL_OBJ } from '../utils/worldwide'; diff --git a/packages/core/src/js/integrations/reactnativeinfo.ts b/packages/core/src/js/integrations/reactnativeinfo.ts index a84285fa9..b24e20f91 100644 --- a/packages/core/src/js/integrations/reactnativeinfo.ts +++ b/packages/core/src/js/integrations/reactnativeinfo.ts @@ -1,4 +1,4 @@ -import type { Context, Event, EventHint, Integration } from '@sentry/types'; +import type { Context, Event, EventHint, Integration } from '@sentry/core'; import { getExpoGoVersion, diff --git a/packages/core/src/js/integrations/release.ts b/packages/core/src/js/integrations/release.ts index 66632acbb..f414f8a9a 100644 --- a/packages/core/src/js/integrations/release.ts +++ b/packages/core/src/js/integrations/release.ts @@ -1,4 +1,4 @@ -import type { BaseTransportOptions, Client, ClientOptions, Event, EventHint, Integration } from '@sentry/types'; +import type { BaseTransportOptions, Client, ClientOptions, Event, EventHint, Integration } from '@sentry/core'; import { NATIVE } from '../wrapper'; diff --git a/packages/core/src/js/integrations/rewriteframes.ts b/packages/core/src/js/integrations/rewriteframes.ts index 4b4bbba9b..09ee8b639 100644 --- a/packages/core/src/js/integrations/rewriteframes.ts +++ b/packages/core/src/js/integrations/rewriteframes.ts @@ -1,5 +1,5 @@ +import type { Integration, StackFrame } from '@sentry/core'; import { rewriteFramesIntegration } from '@sentry/core'; -import type { Integration, StackFrame } from '@sentry/types'; import { Platform } from 'react-native'; import { isExpo, isHermesEnabled } from '../utils/environment'; diff --git a/packages/core/src/js/integrations/screenshot.ts b/packages/core/src/js/integrations/screenshot.ts index 3c24948b7..6f504fa76 100644 --- a/packages/core/src/js/integrations/screenshot.ts +++ b/packages/core/src/js/integrations/screenshot.ts @@ -1,4 +1,4 @@ -import type { Event, EventHint, Integration } from '@sentry/types'; +import type { Event, EventHint, Integration } from '@sentry/core'; import type { ReactNativeClient } from '../client'; import type { Screenshot as ScreenshotAttachment } from '../wrapper'; diff --git a/packages/core/src/js/integrations/sdkinfo.ts b/packages/core/src/js/integrations/sdkinfo.ts index 27440ce5b..b90614d5c 100644 --- a/packages/core/src/js/integrations/sdkinfo.ts +++ b/packages/core/src/js/integrations/sdkinfo.ts @@ -1,5 +1,5 @@ +import type { Event, Integration, Package, SdkInfo as SdkInfoType } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { Event, Integration, Package, SdkInfo as SdkInfoType } from '@sentry/types'; import { isExpoGo, notWeb } from '../utils/environment'; import { SDK_NAME, SDK_PACKAGE_NAME, SDK_VERSION } from '../version'; diff --git a/packages/core/src/js/integrations/spotlight.ts b/packages/core/src/js/integrations/spotlight.ts index 2ce8be3cb..b4f62e06d 100644 --- a/packages/core/src/js/integrations/spotlight.ts +++ b/packages/core/src/js/integrations/spotlight.ts @@ -1,5 +1,5 @@ +import type { BaseTransportOptions, Client, ClientOptions, Envelope, Integration } from '@sentry/core'; import { logger, serializeEnvelope } from '@sentry/core'; -import type { BaseTransportOptions, Client, ClientOptions, Envelope, Integration } from '@sentry/types'; import { ReactNativeLibraries } from '../utils/rnlibraries'; import { createStealthXhr, XHR_READYSTATE_DONE } from '../utils/xhr'; diff --git a/packages/core/src/js/integrations/viewhierarchy.ts b/packages/core/src/js/integrations/viewhierarchy.ts index e4589db2a..9b84ece27 100644 --- a/packages/core/src/js/integrations/viewhierarchy.ts +++ b/packages/core/src/js/integrations/viewhierarchy.ts @@ -1,5 +1,5 @@ +import type { Attachment, Event, EventHint, Integration } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { Attachment, Event, EventHint, Integration } from '@sentry/types'; import { NATIVE } from '../wrapper'; diff --git a/packages/core/src/js/misc.ts b/packages/core/src/js/misc.ts index 17dca82f1..17ae67ac5 100644 --- a/packages/core/src/js/misc.ts +++ b/packages/core/src/js/misc.ts @@ -1,4 +1,4 @@ -import type { EnvelopeItem, Exception } from '@sentry/types'; +import type { EnvelopeItem, Exception } from '@sentry/core'; type EnvelopeItemPayload = EnvelopeItem[1]; diff --git a/packages/core/src/js/options.ts b/packages/core/src/js/options.ts index 4d7f46a92..b984af7a0 100644 --- a/packages/core/src/js/options.ts +++ b/packages/core/src/js/options.ts @@ -1,6 +1,6 @@ import type { makeFetchTransport } from '@sentry/browser'; +import type { CaptureContext, ClientOptions, Event, EventHint, Options } from '@sentry/core'; import type { Profiler } from '@sentry/react'; -import type { CaptureContext, ClientOptions, Event, EventHint, Options } from '@sentry/types'; import type * as React from 'react'; import { Platform } from 'react-native'; diff --git a/packages/core/src/js/profiling/convertHermesProfile.ts b/packages/core/src/js/profiling/convertHermesProfile.ts index 876f6a13f..39ed9ac75 100644 --- a/packages/core/src/js/profiling/convertHermesProfile.ts +++ b/packages/core/src/js/profiling/convertHermesProfile.ts @@ -1,5 +1,5 @@ +import type { FrameId, StackId, ThreadCpuFrame, ThreadCpuSample, ThreadCpuStack, ThreadId } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { FrameId, StackId, ThreadCpuFrame, ThreadCpuSample, ThreadCpuStack, ThreadId } from '@sentry/types'; import { MAX_PROFILE_DURATION_MS } from './constants'; import type * as Hermes from './hermes'; diff --git a/packages/core/src/js/profiling/debugid.ts b/packages/core/src/js/profiling/debugid.ts index 45375506a..f5843eb2b 100644 --- a/packages/core/src/js/profiling/debugid.ts +++ b/packages/core/src/js/profiling/debugid.ts @@ -1,5 +1,5 @@ +import type { DebugImage } from '@sentry/core'; import { GLOBAL_OBJ, logger } from '@sentry/core'; -import type { DebugImage } from '@sentry/types'; import { DEFAULT_BUNDLE_NAME } from './hermes'; diff --git a/packages/core/src/js/profiling/integration.ts b/packages/core/src/js/profiling/integration.ts index b9735aa34..e2e4134fe 100644 --- a/packages/core/src/js/profiling/integration.ts +++ b/packages/core/src/js/profiling/integration.ts @@ -1,6 +1,6 @@ /* eslint-disable complexity */ +import type { Envelope, Event, Integration, Span, ThreadCpuProfile } from '@sentry/core'; import { getActiveSpan, getClient, logger, spanIsSampled, uuid4 } from '@sentry/core'; -import type { Envelope, Event, Integration, Span, ThreadCpuProfile } from '@sentry/types'; import { Platform } from 'react-native'; import type { ReactNativeClient } from '../client'; diff --git a/packages/core/src/js/profiling/types.ts b/packages/core/src/js/profiling/types.ts index b869339b7..871c97540 100644 --- a/packages/core/src/js/profiling/types.ts +++ b/packages/core/src/js/profiling/types.ts @@ -1,4 +1,4 @@ -import type { DebugImage, MeasurementUnit, Profile, ThreadCpuFrame, ThreadCpuProfile } from '@sentry/types'; +import type { DebugImage, MeasurementUnit, Profile, ThreadCpuFrame, ThreadCpuProfile } from '@sentry/core'; import type { NativeProfileEvent } from './nativeTypes'; diff --git a/packages/core/src/js/profiling/utils.ts b/packages/core/src/js/profiling/utils.ts index 2473b8cdb..c83342b50 100644 --- a/packages/core/src/js/profiling/utils.ts +++ b/packages/core/src/js/profiling/utils.ts @@ -1,6 +1,6 @@ /* eslint-disable complexity */ +import type { Envelope, Event, ThreadCpuProfile } from '@sentry/core'; import { forEachEnvelopeItem, logger } from '@sentry/core'; -import type { Envelope, Event, ThreadCpuProfile } from '@sentry/types'; import { getDefaultEnvironment } from '../utils/environment'; import { getDebugMetadata } from './debugid'; diff --git a/packages/core/src/js/replay/mobilereplay.ts b/packages/core/src/js/replay/mobilereplay.ts index f11a0f96a..de27fcb24 100644 --- a/packages/core/src/js/replay/mobilereplay.ts +++ b/packages/core/src/js/replay/mobilereplay.ts @@ -1,5 +1,5 @@ +import type { Client, DynamicSamplingContext, Event, Integration } from '@sentry/core'; import { logger } from '@sentry/core'; -import type { Client, DynamicSamplingContext, Event, Integration } from '@sentry/types'; import { isHardCrash } from '../misc'; import { hasHooks } from '../utils/clientutils'; diff --git a/packages/core/src/js/replay/xhrUtils.ts b/packages/core/src/js/replay/xhrUtils.ts index 2a6c1b90f..8118296ee 100644 --- a/packages/core/src/js/replay/xhrUtils.ts +++ b/packages/core/src/js/replay/xhrUtils.ts @@ -1,5 +1,5 @@ +import type { Breadcrumb, BreadcrumbHint, SentryWrappedXMLHttpRequest, XhrBreadcrumbHint } from '@sentry/core'; import { dropUndefinedKeys } from '@sentry/core'; -import type { Breadcrumb, BreadcrumbHint, SentryWrappedXMLHttpRequest, XhrBreadcrumbHint } from '@sentry/types'; import type { RequestBody } from './networkUtils'; import { getBodySize, parseContentLengthHeader } from './networkUtils'; diff --git a/packages/core/src/js/scopeSync.ts b/packages/core/src/js/scopeSync.ts index 770d7c9d4..bc9f20c59 100644 --- a/packages/core/src/js/scopeSync.ts +++ b/packages/core/src/js/scopeSync.ts @@ -1,4 +1,4 @@ -import type { Breadcrumb, Scope } from '@sentry/types'; +import type { Breadcrumb, Scope } from '@sentry/core'; import { DEFAULT_BREADCRUMB_LEVEL } from './breadcrumb'; import { fillTyped } from './utils/fill'; diff --git a/packages/core/src/js/sdk.tsx b/packages/core/src/js/sdk.tsx index ee19e6dbc..0d37fb215 100644 --- a/packages/core/src/js/sdk.tsx +++ b/packages/core/src/js/sdk.tsx @@ -1,10 +1,10 @@ /* eslint-disable complexity */ +import type { Breadcrumb, BreadcrumbHint, Integration, Scope, SendFeedbackParams, UserFeedback } from '@sentry/core'; import { captureFeedback, getClient, getGlobalScope, getIntegrationsToSetup, getIsolationScope, initAndBind, logger, stackParserFromStackParserOptions, withScope as coreWithScope } from '@sentry/core'; import { defaultStackParser, makeFetchTransport, } from '@sentry/react'; -import type { Breadcrumb, BreadcrumbHint, Integration, Scope, SendFeedbackParams, UserFeedback } from '@sentry/types'; import * as React from 'react'; import { ReactNativeClient } from './client'; diff --git a/packages/core/src/js/tools/metroMiddleware.ts b/packages/core/src/js/tools/metroMiddleware.ts index fe72cd000..aba23971a 100644 --- a/packages/core/src/js/tools/metroMiddleware.ts +++ b/packages/core/src/js/tools/metroMiddleware.ts @@ -1,5 +1,5 @@ +import type { StackFrame } from '@sentry/core'; import { addContextToFrame, logger } from '@sentry/core'; -import type { StackFrame } from '@sentry/types'; import { readFile } from 'fs'; import type { IncomingMessage, ServerResponse } from 'http'; import type { InputConfigT, Middleware } from 'metro-config'; diff --git a/packages/core/src/js/touchevents.tsx b/packages/core/src/js/touchevents.tsx index 979544602..293391a83 100644 --- a/packages/core/src/js/touchevents.tsx +++ b/packages/core/src/js/touchevents.tsx @@ -1,5 +1,5 @@ +import type { SeverityLevel } from '@sentry/core'; import { addBreadcrumb, dropUndefinedKeys, getClient, logger, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core'; -import type { SeverityLevel } from '@sentry/types'; import * as React from 'react'; import type { GestureResponderEvent } from 'react-native'; import { StyleSheet, View } from 'react-native'; diff --git a/packages/core/src/js/tracing/gesturetracing.ts b/packages/core/src/js/tracing/gesturetracing.ts index cd126e9ea..4dd012fe7 100644 --- a/packages/core/src/js/tracing/gesturetracing.ts +++ b/packages/core/src/js/tracing/gesturetracing.ts @@ -1,5 +1,5 @@ +import type { Breadcrumb } from '@sentry/core'; import { addBreadcrumb, logger, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core'; -import type { Breadcrumb } from '@sentry/types'; import { startUserInteractionSpan } from './integrations/userInteraction'; import { UI_ACTION } from './ops'; diff --git a/packages/core/src/js/tracing/integrations/appStart.ts b/packages/core/src/js/tracing/integrations/appStart.ts index f2db5184c..0f96557d4 100644 --- a/packages/core/src/js/tracing/integrations/appStart.ts +++ b/packages/core/src/js/tracing/integrations/appStart.ts @@ -1,4 +1,5 @@ /* eslint-disable complexity */ +import type { Client, Event, Integration, SpanJSON, TransactionEvent } from '@sentry/core'; import { getCapturedScopesOnSpan, getClient, @@ -9,7 +10,6 @@ import { startInactiveSpan, timestampInSeconds, } from '@sentry/core'; -import type { Client, Event, Integration, SpanJSON, TransactionEvent } from '@sentry/types'; import { APP_START_COLD as APP_START_COLD_MEASUREMENT, diff --git a/packages/core/src/js/tracing/integrations/nativeFrames.ts b/packages/core/src/js/tracing/integrations/nativeFrames.ts index d98eac51c..ceec914b8 100644 --- a/packages/core/src/js/tracing/integrations/nativeFrames.ts +++ b/packages/core/src/js/tracing/integrations/nativeFrames.ts @@ -1,5 +1,5 @@ +import type { Client, Event, Integration, Measurements, MeasurementUnit, Span } from '@sentry/core'; import { logger, timestampInSeconds } from '@sentry/core'; -import type { Client, Event, Integration, Measurements, MeasurementUnit, Span } from '@sentry/types'; import type { NativeFramesResponse } from '../../NativeRNSentry'; import { AsyncExpiringMap } from '../../utils/AsyncExpiringMap'; diff --git a/packages/core/src/js/tracing/integrations/stalltracking.ts b/packages/core/src/js/tracing/integrations/stalltracking.ts index a8cee2ecd..e2b05c8d9 100644 --- a/packages/core/src/js/tracing/integrations/stalltracking.ts +++ b/packages/core/src/js/tracing/integrations/stalltracking.ts @@ -1,6 +1,6 @@ /* eslint-disable max-lines */ +import type { Client, Integration, Measurements, MeasurementUnit, Span } from '@sentry/core'; import { getRootSpan, logger, spanToJSON, timestampInSeconds } from '@sentry/core'; -import type { Client, Integration, Measurements, MeasurementUnit, Span } from '@sentry/types'; import type { AppStateStatus } from 'react-native'; import { AppState } from 'react-native'; diff --git a/packages/core/src/js/tracing/integrations/userInteraction.ts b/packages/core/src/js/tracing/integrations/userInteraction.ts index 1405aeb5e..378181016 100644 --- a/packages/core/src/js/tracing/integrations/userInteraction.ts +++ b/packages/core/src/js/tracing/integrations/userInteraction.ts @@ -1,3 +1,4 @@ +import type { Integration, Span, StartSpanOptions } from '@sentry/core'; import { getActiveSpan, getClient, @@ -6,7 +7,6 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, spanToJSON, } from '@sentry/core'; -import type { Integration, Span, StartSpanOptions } from '@sentry/types'; import type { ReactNativeClientOptions } from '../../options'; import { onlySampleIfChildSpans } from '../onSpanEndUtils'; diff --git a/packages/core/src/js/tracing/onSpanEndUtils.ts b/packages/core/src/js/tracing/onSpanEndUtils.ts index 5c64bff19..40365b33f 100644 --- a/packages/core/src/js/tracing/onSpanEndUtils.ts +++ b/packages/core/src/js/tracing/onSpanEndUtils.ts @@ -1,5 +1,5 @@ +import type { Client, Span } from '@sentry/core'; import { getSpanDescendants, logger, SPAN_STATUS_ERROR, spanToJSON } from '@sentry/core'; -import type { Client, Span } from '@sentry/types'; import type { AppStateStatus } from 'react-native'; import { AppState } from 'react-native'; diff --git a/packages/core/src/js/tracing/reactnativenavigation.ts b/packages/core/src/js/tracing/reactnativenavigation.ts index 45f517353..0b0f696c6 100644 --- a/packages/core/src/js/tracing/reactnativenavigation.ts +++ b/packages/core/src/js/tracing/reactnativenavigation.ts @@ -1,3 +1,4 @@ +import type { Client, Integration, Span } from '@sentry/core'; import { addBreadcrumb, getClient, @@ -6,7 +7,6 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, spanToJSON, } from '@sentry/core'; -import type { Client, Integration, Span } from '@sentry/types'; import type { EmitterSubscription } from '../utils/rnlibrariesinterface'; import { isSentrySpan } from '../utils/span'; diff --git a/packages/core/src/js/tracing/reactnativetracing.ts b/packages/core/src/js/tracing/reactnativetracing.ts index a90abe1ca..d9ada0ff9 100644 --- a/packages/core/src/js/tracing/reactnativetracing.ts +++ b/packages/core/src/js/tracing/reactnativetracing.ts @@ -1,7 +1,7 @@ /* eslint-disable max-lines */ import { instrumentOutgoingRequests } from '@sentry/browser'; +import type { Client, Event, Integration, StartSpanOptions } from '@sentry/core'; import { getClient } from '@sentry/core'; -import type { Client, Event, Integration, StartSpanOptions } from '@sentry/types'; import { isWeb } from '../utils/environment'; import { getDevServer } from './../integrations/debugsymbolicatorutils'; diff --git a/packages/core/src/js/tracing/reactnavigation.ts b/packages/core/src/js/tracing/reactnavigation.ts index 8ab754791..6fb08890e 100644 --- a/packages/core/src/js/tracing/reactnavigation.ts +++ b/packages/core/src/js/tracing/reactnavigation.ts @@ -1,4 +1,5 @@ /* eslint-disable max-lines */ +import type { Client, Integration, Span } from '@sentry/core'; import { addBreadcrumb, getActiveSpan, @@ -12,7 +13,6 @@ import { startInactiveSpan, timestampInSeconds, } from '@sentry/core'; -import type { Client, Integration, Span } from '@sentry/types'; import type { NewFrameEvent } from '../utils/sentryeventemitter'; import type { SentryEventEmitterFallback } from '../utils/sentryeventemitterfallback'; diff --git a/packages/core/src/js/tracing/span.ts b/packages/core/src/js/tracing/span.ts index 733395a58..b44425691 100644 --- a/packages/core/src/js/tracing/span.ts +++ b/packages/core/src/js/tracing/span.ts @@ -1,3 +1,4 @@ +import type { Client, Scope, Span, StartSpanOptions } from '@sentry/core'; import { generatePropagationContext, getActiveSpan, @@ -11,7 +12,6 @@ import { spanToJSON, startIdleSpan as coreStartIdleSpan, } from '@sentry/core'; -import type { Client, Scope, Span, StartSpanOptions } from '@sentry/types'; import { isRootSpan } from '../utils/span'; import { adjustTransactionDuration, cancelInBackground } from './onSpanEndUtils'; diff --git a/packages/core/src/js/tracing/timetodisplay.tsx b/packages/core/src/js/tracing/timetodisplay.tsx index c72640967..12d1198bc 100644 --- a/packages/core/src/js/tracing/timetodisplay.tsx +++ b/packages/core/src/js/tracing/timetodisplay.tsx @@ -1,5 +1,5 @@ +import type { Span,StartSpanOptions } from '@sentry/core'; import { fill, getActiveSpan, getSpanDescendants, logger, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SPAN_STATUS_ERROR, SPAN_STATUS_OK, spanToJSON, startInactiveSpan } from '@sentry/core'; -import type { Span,StartSpanOptions } from '@sentry/types'; import * as React from 'react'; import { isTurboModuleEnabled } from '../utils/environment'; diff --git a/packages/core/src/js/tracing/types.ts b/packages/core/src/js/tracing/types.ts index 94b235993..13cfb9739 100644 --- a/packages/core/src/js/tracing/types.ts +++ b/packages/core/src/js/tracing/types.ts @@ -1,4 +1,4 @@ -import type { Span } from '@sentry/types'; +import type { Span } from '@sentry/core'; export interface ReactNavigationRoute { name: string; diff --git a/packages/core/src/js/tracing/utils.ts b/packages/core/src/js/tracing/utils.ts index 044aee9ab..27b49306a 100644 --- a/packages/core/src/js/tracing/utils.ts +++ b/packages/core/src/js/tracing/utils.ts @@ -1,3 +1,4 @@ +import type { MeasurementUnit, Span, SpanJSON, TransactionSource } from '@sentry/core'; import { dropUndefinedKeys, getSpanDescendants, @@ -11,7 +12,6 @@ import { timestampInSeconds, uuid4, } from '@sentry/core'; -import type { MeasurementUnit, Span, SpanJSON, TransactionSource } from '@sentry/types'; import { RN_GLOBAL_OBJ } from '../utils/worldwide'; diff --git a/packages/core/src/js/transports/native.ts b/packages/core/src/js/transports/native.ts index 4f1785ad7..ea0ae8812 100644 --- a/packages/core/src/js/transports/native.ts +++ b/packages/core/src/js/transports/native.ts @@ -1,6 +1,11 @@ -import type { PromiseBuffer } from '@sentry/core'; +import type { + BaseTransportOptions, + Envelope, + PromiseBuffer, + Transport, + TransportMakeRequestResponse, +} from '@sentry/core'; import { makePromiseBuffer } from '@sentry/core'; -import type { BaseTransportOptions, Envelope, Transport, TransportMakeRequestResponse } from '@sentry/types'; import { NATIVE } from '../wrapper'; diff --git a/packages/core/src/js/user.ts b/packages/core/src/js/user.ts index 5380929ec..0b02be64c 100644 --- a/packages/core/src/js/user.ts +++ b/packages/core/src/js/user.ts @@ -1,4 +1,4 @@ -import type { User } from '@sentry/types'; +import type { User } from '@sentry/core'; /** Requires all the keys defined on User interface to be present on an object */ export type RequiredKeysUser = { [P in keyof Required]: User[P] | undefined }; diff --git a/packages/core/src/js/utils/clientutils.ts b/packages/core/src/js/utils/clientutils.ts index 95047fa00..d03f3bf5b 100644 --- a/packages/core/src/js/utils/clientutils.ts +++ b/packages/core/src/js/utils/clientutils.ts @@ -1,4 +1,4 @@ -import type { Client } from '@sentry/types'; +import type { Client } from '@sentry/core'; /** * Checks if the provided Sentry client has hooks implemented. diff --git a/packages/core/src/js/utils/envelope.ts b/packages/core/src/js/utils/envelope.ts index 135e8b67e..f115ca4bd 100644 --- a/packages/core/src/js/utils/envelope.ts +++ b/packages/core/src/js/utils/envelope.ts @@ -1,5 +1,5 @@ +import type { DsnComponents, EventEnvelope, SdkMetadata, UserFeedback, UserFeedbackItem } from '@sentry/core'; import { createEnvelope, dsnToString } from '@sentry/core'; -import type { DsnComponents, EventEnvelope, SdkMetadata, UserFeedback, UserFeedbackItem } from '@sentry/types'; export const header = 0; export const items = 1; diff --git a/packages/core/src/js/utils/outcome.ts b/packages/core/src/js/utils/outcome.ts index cd4279d46..95936c0e7 100644 --- a/packages/core/src/js/utils/outcome.ts +++ b/packages/core/src/js/utils/outcome.ts @@ -1,4 +1,4 @@ -import type { Outcome } from '@sentry/types'; +import type { Outcome } from '@sentry/core'; /** * Merges buffer with new outcomes. diff --git a/packages/core/src/js/utils/span.ts b/packages/core/src/js/utils/span.ts index 900e2414b..7338e1d49 100644 --- a/packages/core/src/js/utils/span.ts +++ b/packages/core/src/js/utils/span.ts @@ -1,5 +1,5 @@ +import type { Span, TransactionEvent } from '@sentry/core'; import { getRootSpan, SentrySpan } from '@sentry/core'; -import type { Span, TransactionEvent } from '@sentry/types'; /** * diff --git a/packages/core/src/js/wrapper.ts b/packages/core/src/js/wrapper.ts index d7bdba074..4db45f085 100644 --- a/packages/core/src/js/wrapper.ts +++ b/packages/core/src/js/wrapper.ts @@ -1,5 +1,4 @@ /* eslint-disable max-lines */ -import { logger, normalize, SentryError } from '@sentry/core'; import type { BaseEnvelopeItemHeaders, Breadcrumb, @@ -9,7 +8,8 @@ import type { Package, SeverityLevel, User, -} from '@sentry/types'; +} from '@sentry/core'; +import { logger, normalize, SentryError } from '@sentry/core'; import { NativeModules, Platform } from 'react-native'; import { isHardCrash } from './misc'; diff --git a/packages/core/test/breadcrumb.test.ts b/packages/core/test/breadcrumb.test.ts index 5df834d49..e0b7db4c6 100644 --- a/packages/core/test/breadcrumb.test.ts +++ b/packages/core/test/breadcrumb.test.ts @@ -1,4 +1,4 @@ -import type { Breadcrumb } from '@sentry/types'; +import type { Breadcrumb } from '@sentry/core'; import { breadcrumbFromObject } from '../src/js/breadcrumb'; diff --git a/packages/core/test/client.test.ts b/packages/core/test/client.test.ts index ec7e67398..8cb421735 100644 --- a/packages/core/test/client.test.ts +++ b/packages/core/test/client.test.ts @@ -2,8 +2,8 @@ import * as mockedtimetodisplaynative from './tracing/mockedtimetodisplaynative' jest.mock('../src/js/tracing/timetodisplaynative', () => mockedtimetodisplaynative); import { defaultStackParser } from '@sentry/browser'; +import type { Envelope, Event, Outcome, Transport, TransportMakeRequestResponse } from '@sentry/core'; import { rejectedSyncPromise, SentryError } from '@sentry/core'; -import type { Envelope, Event, Outcome, Transport, TransportMakeRequestResponse } from '@sentry/types'; import * as RN from 'react-native'; import { ReactNativeClient } from '../src/js/client'; diff --git a/packages/core/test/feedback.test.ts b/packages/core/test/feedback.test.ts index f36a69700..6b1831934 100644 --- a/packages/core/test/feedback.test.ts +++ b/packages/core/test/feedback.test.ts @@ -1,3 +1,4 @@ +import type { Span } from '@sentry/core'; import { addBreadcrumb, captureFeedback, @@ -8,7 +9,6 @@ import { withIsolationScope, withScope, } from '@sentry/core'; -import type { Span } from '@sentry/types'; import { getDefaultTestClientOptions, TestClient } from './mocks/client'; diff --git a/packages/core/test/integrations/debugsymbolicator.test.ts b/packages/core/test/integrations/debugsymbolicator.test.ts index e989bedf3..9ed572831 100644 --- a/packages/core/test/integrations/debugsymbolicator.test.ts +++ b/packages/core/test/integrations/debugsymbolicator.test.ts @@ -1,6 +1,6 @@ jest.mock('../../src/js/integrations/debugsymbolicatorutils'); -import type { Client, Event, EventHint, StackFrame } from '@sentry/types'; +import type { Client, Event, EventHint, StackFrame } from '@sentry/core'; import { debugSymbolicatorIntegration } from '../../src/js/integrations/debugsymbolicator'; import { diff --git a/packages/core/test/integrations/devicecontext.test.ts b/packages/core/test/integrations/devicecontext.test.ts index d8ad810d8..014b4939e 100644 --- a/packages/core/test/integrations/devicecontext.test.ts +++ b/packages/core/test/integrations/devicecontext.test.ts @@ -1,4 +1,4 @@ -import type { Client, Event, EventHint, SeverityLevel } from '@sentry/types'; +import type { Client, Event, EventHint, SeverityLevel } from '@sentry/core'; import { deviceContextIntegration } from '../../src/js/integrations/devicecontext'; import type { NativeDeviceContextsResponse } from '../../src/js/NativeRNSentry'; diff --git a/packages/core/test/integrations/eventorigin.test.ts b/packages/core/test/integrations/eventorigin.test.ts index 017d75129..dd3e0cbd9 100644 --- a/packages/core/test/integrations/eventorigin.test.ts +++ b/packages/core/test/integrations/eventorigin.test.ts @@ -1,4 +1,4 @@ -import type { Client } from '@sentry/types'; +import type { Client } from '@sentry/core'; import { eventOriginIntegration } from '../../src/js/integrations/eventorigin'; diff --git a/packages/core/test/integrations/expocontext.test.ts b/packages/core/test/integrations/expocontext.test.ts index 7b449269f..91059a4bc 100644 --- a/packages/core/test/integrations/expocontext.test.ts +++ b/packages/core/test/integrations/expocontext.test.ts @@ -1,4 +1,4 @@ -import type { Client, Event } from '@sentry/types'; +import type { Client, Event } from '@sentry/core'; import { expoContextIntegration } from '../../src/js/integrations/expocontext'; import { getExpoDevice } from '../../src/js/utils/expomodules'; diff --git a/packages/core/test/integrations/integrationsexecutionorder.test.ts b/packages/core/test/integrations/integrationsexecutionorder.test.ts index 64ceadd57..08b4a4f5a 100644 --- a/packages/core/test/integrations/integrationsexecutionorder.test.ts +++ b/packages/core/test/integrations/integrationsexecutionorder.test.ts @@ -3,7 +3,7 @@ jest.mock('../../src/js/wrapper', () => mockWrapper); jest.mock('../../src/js/utils/environment'); import { defaultStackParser } from '@sentry/browser'; -import type { Integration } from '@sentry/types'; +import type { Integration } from '@sentry/core'; import { ReactNativeClient } from '../../src/js/client'; import { getDefaultIntegrations } from '../../src/js/integrations/default'; diff --git a/packages/core/test/integrations/modulesloader.test.ts b/packages/core/test/integrations/modulesloader.test.ts index 73f2b0845..c6fb43bb2 100644 --- a/packages/core/test/integrations/modulesloader.test.ts +++ b/packages/core/test/integrations/modulesloader.test.ts @@ -1,4 +1,4 @@ -import type { Client, Event, EventHint } from '@sentry/types'; +import type { Client, Event, EventHint } from '@sentry/core'; import { modulesLoaderIntegration } from '../../src/js/integrations/modulesloader'; import { NATIVE } from '../../src/js/wrapper'; diff --git a/packages/core/test/integrations/nativelinkederrors.test.ts b/packages/core/test/integrations/nativelinkederrors.test.ts index 6dbc73fe5..9dd1a2da1 100644 --- a/packages/core/test/integrations/nativelinkederrors.test.ts +++ b/packages/core/test/integrations/nativelinkederrors.test.ts @@ -1,5 +1,5 @@ import { defaultStackParser } from '@sentry/browser'; -import type { Client, DebugImage, Event, EventHint, ExtendedError } from '@sentry/types'; +import type { Client, DebugImage, Event, EventHint, ExtendedError } from '@sentry/core'; import { nativeLinkedErrorsIntegration } from '../../src/js/integrations/nativelinkederrors'; import type { NativeStackFrames } from '../../src/js/NativeRNSentry'; diff --git a/packages/core/test/integrations/reactnativeerrorhandlers.test.ts b/packages/core/test/integrations/reactnativeerrorhandlers.test.ts index 69932a931..2cca84044 100644 --- a/packages/core/test/integrations/reactnativeerrorhandlers.test.ts +++ b/packages/core/test/integrations/reactnativeerrorhandlers.test.ts @@ -1,7 +1,7 @@ jest.mock('../../src/js/integrations/reactnativeerrorhandlersutils'); +import type { ExtendedError, SeverityLevel } from '@sentry/core'; import { setCurrentClient } from '@sentry/core'; -import type { ExtendedError, SeverityLevel } from '@sentry/types'; import { reactNativeErrorHandlersIntegration } from '../../src/js/integrations/reactnativeerrorhandlers'; import { requireRejectionTracking } from '../../src/js/integrations/reactnativeerrorhandlersutils'; diff --git a/packages/core/test/integrations/reactnativeinfo.test.ts b/packages/core/test/integrations/reactnativeinfo.test.ts index 2b6819e15..f7f9f3bfb 100644 --- a/packages/core/test/integrations/reactnativeinfo.test.ts +++ b/packages/core/test/integrations/reactnativeinfo.test.ts @@ -1,4 +1,4 @@ -import type { Client, Event, EventHint } from '@sentry/types'; +import type { Client, Event, EventHint } from '@sentry/core'; import type { ReactNativeError } from '../../src/js/integrations/debugsymbolicator'; import type { ReactNativeContext } from '../../src/js/integrations/reactnativeinfo'; diff --git a/packages/core/test/integrations/release.test.ts b/packages/core/test/integrations/release.test.ts index 71ba72888..be3a4f1b1 100644 --- a/packages/core/test/integrations/release.test.ts +++ b/packages/core/test/integrations/release.test.ts @@ -1,4 +1,4 @@ -import type { Client } from '@sentry/types'; +import type { Client } from '@sentry/core'; import { nativeReleaseIntegration } from '../../src/js/integrations/release'; diff --git a/packages/core/test/integrations/rewriteframes.test.ts b/packages/core/test/integrations/rewriteframes.test.ts index d6bb400e5..45eb9f094 100644 --- a/packages/core/test/integrations/rewriteframes.test.ts +++ b/packages/core/test/integrations/rewriteframes.test.ts @@ -1,6 +1,6 @@ import type { Exception } from '@sentry/browser'; import { defaultStackParser, eventFromException } from '@sentry/browser'; -import type { Client, Event, EventHint } from '@sentry/types'; +import type { Client, Event, EventHint } from '@sentry/core'; import { Platform } from 'react-native'; import { createReactNativeRewriteFrames } from '../../src/js/integrations/rewriteframes'; diff --git a/packages/core/test/integrations/sdkinfo.test.ts b/packages/core/test/integrations/sdkinfo.test.ts index 71d19d0ec..912d7f7d9 100644 --- a/packages/core/test/integrations/sdkinfo.test.ts +++ b/packages/core/test/integrations/sdkinfo.test.ts @@ -1,4 +1,4 @@ -import type { Event, EventHint, Package } from '@sentry/types'; +import type { Event, EventHint, Package } from '@sentry/core'; import { SDK_NAME, SDK_VERSION } from '../../src/js'; import { sdkInfoIntegration } from '../../src/js/integrations/sdkinfo'; diff --git a/packages/core/test/integrations/spotlight.test.ts b/packages/core/test/integrations/spotlight.test.ts index 306580d66..dba566f26 100644 --- a/packages/core/test/integrations/spotlight.test.ts +++ b/packages/core/test/integrations/spotlight.test.ts @@ -1,6 +1,6 @@ import type { HttpRequestEventMap } from '@mswjs/interceptors'; import { XMLHttpRequestInterceptor } from '@mswjs/interceptors/XMLHttpRequest'; -import type { Client, Envelope } from '@sentry/types'; +import type { Client, Envelope } from '@sentry/core'; import { spotlightIntegration } from '../../src/js/integrations/spotlight'; diff --git a/packages/core/test/integrations/viewhierarchy.test.ts b/packages/core/test/integrations/viewhierarchy.test.ts index 68cfc0cc7..69020ce8a 100644 --- a/packages/core/test/integrations/viewhierarchy.test.ts +++ b/packages/core/test/integrations/viewhierarchy.test.ts @@ -1,4 +1,4 @@ -import type { Client, Event, EventHint } from '@sentry/types'; +import type { Client, Event, EventHint } from '@sentry/core'; import { viewHierarchyIntegration } from '../../src/js/integrations/viewhierarchy'; import { NATIVE } from '../../src/js/wrapper'; diff --git a/packages/core/test/mocks/client.ts b/packages/core/test/mocks/client.ts index bc90b88c3..8a0df75eb 100644 --- a/packages/core/test/mocks/client.ts +++ b/packages/core/test/mocks/client.ts @@ -1,3 +1,4 @@ +import type { Event, EventHint, Integration, Outcome, ParameterizedString, Session, SeverityLevel } from '@sentry/core'; import { BaseClient, createTransport, @@ -8,15 +9,6 @@ import { resolvedSyncPromise, setCurrentClient, } from '@sentry/core'; -import type { - Event, - EventHint, - Integration, - Outcome, - ParameterizedString, - Session, - SeverityLevel, -} from '@sentry/types'; import type { ReactNativeClientOptions } from '../../src/js/options'; diff --git a/packages/core/test/profiling/convertHermesProfile.test.ts b/packages/core/test/profiling/convertHermesProfile.test.ts index 6e2ccfdd8..807d662fc 100644 --- a/packages/core/test/profiling/convertHermesProfile.test.ts +++ b/packages/core/test/profiling/convertHermesProfile.test.ts @@ -1,4 +1,4 @@ -import type { ThreadCpuSample } from '@sentry/types'; +import type { ThreadCpuSample } from '@sentry/core'; import { convertToSentryProfile, mapSamples } from '../../src/js/profiling/convertHermesProfile'; import type * as Hermes from '../../src/js/profiling/hermes'; diff --git a/packages/core/test/profiling/hermes.test.ts b/packages/core/test/profiling/hermes.test.ts index 0d7852d4f..21255b95f 100644 --- a/packages/core/test/profiling/hermes.test.ts +++ b/packages/core/test/profiling/hermes.test.ts @@ -1,4 +1,4 @@ -import type { ThreadCpuFrame } from '@sentry/types'; +import type { ThreadCpuFrame } from '@sentry/core'; import { parseHermesJSStackFrame } from '../../src/js/profiling/convertHermesProfile'; diff --git a/packages/core/test/profiling/integration.test.ts b/packages/core/test/profiling/integration.test.ts index 5fc7d9e51..83da5cc53 100644 --- a/packages/core/test/profiling/integration.test.ts +++ b/packages/core/test/profiling/integration.test.ts @@ -3,8 +3,8 @@ jest.mock('../../src/js/wrapper', () => mockWrapper); jest.mock('../../src/js/utils/environment'); jest.mock('../../src/js/profiling/debugid'); +import type { Envelope, Event, Integration, Profile, Span, ThreadCpuProfile, Transport } from '@sentry/core'; import { getClient, spanToJSON } from '@sentry/core'; -import type { Envelope, Event, Integration, Profile, Span, ThreadCpuProfile, Transport } from '@sentry/types'; import * as Sentry from '../../src/js'; import { getDebugMetadata } from '../../src/js/profiling/debugid'; diff --git a/packages/core/test/replay/xhrUtils.test.ts b/packages/core/test/replay/xhrUtils.test.ts index 614dae4be..477e8bc66 100644 --- a/packages/core/test/replay/xhrUtils.test.ts +++ b/packages/core/test/replay/xhrUtils.test.ts @@ -1,4 +1,4 @@ -import type { Breadcrumb } from '@sentry/types'; +import type { Breadcrumb } from '@sentry/core'; import { enrichXhrBreadcrumbsForMobileReplay } from '../../src/js/replay/xhrUtils'; diff --git a/packages/core/test/scopeSync.test.ts b/packages/core/test/scopeSync.test.ts index fc0635aa9..85d14fe27 100644 --- a/packages/core/test/scopeSync.test.ts +++ b/packages/core/test/scopeSync.test.ts @@ -1,7 +1,7 @@ jest.mock('../src/js/wrapper', () => jest.requireActual('./mockWrapper')); +import type { Breadcrumb } from '@sentry/core'; import * as SentryCore from '@sentry/core'; import { Scope } from '@sentry/core'; -import type { Breadcrumb } from '@sentry/types'; import { enableSyncToNative } from '../src/js/scopeSync'; import { getDefaultTestClientOptions, TestClient } from './mocks/client'; diff --git a/packages/core/test/sdk.test.ts b/packages/core/test/sdk.test.ts index 94cbed0aa..931d7fd6d 100644 --- a/packages/core/test/sdk.test.ts +++ b/packages/core/test/sdk.test.ts @@ -1,13 +1,6 @@ +import type { BaseTransportOptions, Breadcrumb, BreadcrumbHint, ClientOptions, Integration, Scope } from '@sentry/core'; import { initAndBind, logger } from '@sentry/core'; import { makeFetchTransport } from '@sentry/react'; -import type { - BaseTransportOptions, - Breadcrumb, - BreadcrumbHint, - ClientOptions, - Integration, - Scope, -} from '@sentry/types'; import { getDevServer } from '../src/js/integrations/debugsymbolicatorutils'; import { init, withScope } from '../src/js/sdk'; diff --git a/packages/core/test/testutils.ts b/packages/core/test/testutils.ts index 2cff0aa26..76bdd990a 100644 --- a/packages/core/test/testutils.ts +++ b/packages/core/test/testutils.ts @@ -1,5 +1,5 @@ +import type { Session, Transport, UserFeedback } from '@sentry/core'; import { rejectedSyncPromise } from '@sentry/core'; -import type { Session, Transport, UserFeedback } from '@sentry/types'; export type MockInterface = { [K in keyof T]: T[K] extends (...args: infer A) => infer B ? jest.Mock : T[K]; diff --git a/packages/core/test/tools/metroMiddleware.test.ts b/packages/core/test/tools/metroMiddleware.test.ts index f7631e316..b1743e27a 100644 --- a/packages/core/test/tools/metroMiddleware.test.ts +++ b/packages/core/test/tools/metroMiddleware.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it, jest } from '@jest/globals'; -import type { StackFrame } from '@sentry/types'; +import type { StackFrame } from '@sentry/core'; import * as fs from 'fs'; import * as metroMiddleware from '../../src/js/tools/metroMiddleware'; diff --git a/packages/core/test/touchevents.test.tsx b/packages/core/test/touchevents.test.tsx index 4d5dd1f3c..4266f62d4 100644 --- a/packages/core/test/touchevents.test.tsx +++ b/packages/core/test/touchevents.test.tsx @@ -1,8 +1,8 @@ /** * @jest-environment jsdom */ +import type { SeverityLevel } from '@sentry/core'; import * as core from '@sentry/core'; -import type { SeverityLevel } from '@sentry/types'; import { TouchEventBoundary } from '../src/js/touchevents'; import { getDefaultTestClientOptions, TestClient } from './mocks/client'; diff --git a/packages/core/test/tracing/gesturetracing.test.ts b/packages/core/test/tracing/gesturetracing.test.ts index cc19777a9..10c5ccf39 100644 --- a/packages/core/test/tracing/gesturetracing.test.ts +++ b/packages/core/test/tracing/gesturetracing.test.ts @@ -1,5 +1,5 @@ +import type { Breadcrumb } from '@sentry/core'; import { getActiveSpan, spanToJSON, startSpan } from '@sentry/core'; -import type { Breadcrumb } from '@sentry/types'; import { UI_ACTION } from '../../src/js/tracing'; import { diff --git a/packages/core/test/tracing/idleNavigationSpan.test.ts b/packages/core/test/tracing/idleNavigationSpan.test.ts index 27d45c491..ec4ddf764 100644 --- a/packages/core/test/tracing/idleNavigationSpan.test.ts +++ b/packages/core/test/tracing/idleNavigationSpan.test.ts @@ -1,5 +1,5 @@ +import type { Span } from '@sentry/core'; import { getActiveSpan, getCurrentScope, spanToJSON, startSpanManual } from '@sentry/core'; -import type { Span } from '@sentry/types'; import type { AppState, AppStateStatus } from 'react-native'; import type { ScopeWithMaybeSpan } from '../../src/js/tracing/span'; diff --git a/packages/core/test/tracing/integrations/appStart.test.ts b/packages/core/test/tracing/integrations/appStart.test.ts index e11e3616d..4337e3e2b 100644 --- a/packages/core/test/tracing/integrations/appStart.test.ts +++ b/packages/core/test/tracing/integrations/appStart.test.ts @@ -1,3 +1,4 @@ +import type { ErrorEvent, Event, SpanJSON, TransactionEvent } from '@sentry/core'; import { getCurrentScope, getGlobalScope, @@ -7,7 +8,6 @@ import { setCurrentClient, timestampInSeconds, } from '@sentry/core'; -import type { ErrorEvent, Event, SpanJSON, TransactionEvent } from '@sentry/types'; import { APP_START_COLD as APP_START_COLD_MEASUREMENT, diff --git a/packages/core/test/tracing/integrations/nativeframes.test.ts b/packages/core/test/tracing/integrations/nativeframes.test.ts index c5453dcc8..839bdd5d1 100644 --- a/packages/core/test/tracing/integrations/nativeframes.test.ts +++ b/packages/core/test/tracing/integrations/nativeframes.test.ts @@ -1,5 +1,5 @@ +import type { Event, Measurements } from '@sentry/core'; import { getCurrentScope, getGlobalScope, getIsolationScope, setCurrentClient, startSpan } from '@sentry/core'; -import type { Event, Measurements } from '@sentry/types'; import { nativeFramesIntegration } from '../../../src/js'; import { NATIVE } from '../../../src/js/wrapper'; diff --git a/packages/core/test/tracing/integrations/stallTracking/stalltracking.test.ts b/packages/core/test/tracing/integrations/stallTracking/stalltracking.test.ts index 125583fcc..12fc59f1a 100644 --- a/packages/core/test/tracing/integrations/stallTracking/stalltracking.test.ts +++ b/packages/core/test/tracing/integrations/stallTracking/stalltracking.test.ts @@ -1,3 +1,4 @@ +import type { Span } from '@sentry/core'; import { getCurrentScope, getGlobalScope, @@ -8,7 +9,6 @@ import { startSpanManual, timestampInSeconds, } from '@sentry/core'; -import type { Span } from '@sentry/types'; import { stallTrackingIntegration } from '../../../../src/js/tracing/integrations/stalltracking'; import { getDefaultTestClientOptions, TestClient } from '../../../mocks/client'; diff --git a/packages/core/test/tracing/integrations/stallTracking/stalltrackingutils.ts b/packages/core/test/tracing/integrations/stallTracking/stalltrackingutils.ts index edcf8956c..8f338a31f 100644 --- a/packages/core/test/tracing/integrations/stallTracking/stalltrackingutils.ts +++ b/packages/core/test/tracing/integrations/stallTracking/stalltrackingutils.ts @@ -1,4 +1,4 @@ -import type { Measurements } from '@sentry/types'; +import type { Measurements } from '@sentry/core'; export function expectStallMeasurements(measurements: Measurements | undefined) { expect(measurements).toBeDefined(); diff --git a/packages/core/test/tracing/integrations/userInteraction.test.ts b/packages/core/test/tracing/integrations/userInteraction.test.ts index 72dfaeea0..a026e79c0 100644 --- a/packages/core/test/tracing/integrations/userInteraction.test.ts +++ b/packages/core/test/tracing/integrations/userInteraction.test.ts @@ -1,3 +1,4 @@ +import type { Span } from '@sentry/core'; import { getActiveSpan, getCurrentScope, @@ -6,7 +7,6 @@ import { startInactiveSpan, startSpanManual, } from '@sentry/core'; -import type { Span } from '@sentry/types'; import type { AppState, AppStateStatus } from 'react-native'; import { diff --git a/packages/core/test/tracing/reactnativenavigation.test.ts b/packages/core/test/tracing/reactnativenavigation.test.ts index c6939c6b5..09acbaa25 100644 --- a/packages/core/test/tracing/reactnativenavigation.test.ts +++ b/packages/core/test/tracing/reactnativenavigation.test.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/no-empty-function */ +import type { Event, StartSpanOptions } from '@sentry/core'; import { getActiveSpan, getCurrentScope, @@ -7,7 +8,6 @@ import { setCurrentClient, spanToJSON, } from '@sentry/core'; -import type { Event, StartSpanOptions } from '@sentry/types'; import type { EmitterSubscription } from 'react-native'; import { reactNativeTracingIntegration } from '../../src/js'; diff --git a/packages/core/test/tracing/reactnativetracing.test.ts b/packages/core/test/tracing/reactnativetracing.test.ts index 031a8afae..861b94ba1 100644 --- a/packages/core/test/tracing/reactnativetracing.test.ts +++ b/packages/core/test/tracing/reactnativetracing.test.ts @@ -1,5 +1,5 @@ import * as SentryBrowser from '@sentry/browser'; -import type { Event } from '@sentry/types'; +import type { Event } from '@sentry/core'; jest.mock('../../src/js/wrapper', () => { return { diff --git a/packages/core/test/tracing/reactnavigation.test.ts b/packages/core/test/tracing/reactnavigation.test.ts index 1e702c1e7..5c8b805e9 100644 --- a/packages/core/test/tracing/reactnavigation.test.ts +++ b/packages/core/test/tracing/reactnavigation.test.ts @@ -1,8 +1,8 @@ /* eslint-disable deprecation/deprecation */ /* eslint-disable @typescript-eslint/no-explicit-any */ import type { SentrySpan } from '@sentry/core'; +import type { Event, Measurements, StartSpanOptions } from '@sentry/core'; import { getActiveSpan, getCurrentScope, getGlobalScope, getIsolationScope, setCurrentClient } from '@sentry/core'; -import type { Event, Measurements, StartSpanOptions } from '@sentry/types'; import { nativeFramesIntegration, reactNativeTracingIntegration } from '../../src/js'; import { SPAN_ORIGIN_AUTO_NAVIGATION_REACT_NAVIGATION } from '../../src/js/tracing/origin'; diff --git a/packages/core/test/tracing/reactnavigation.ttid.test.tsx b/packages/core/test/tracing/reactnavigation.ttid.test.tsx index 73823d8cb..7c0637b89 100644 --- a/packages/core/test/tracing/reactnavigation.ttid.test.tsx +++ b/packages/core/test/tracing/reactnavigation.ttid.test.tsx @@ -1,5 +1,5 @@ +import type { Scope, Span, SpanJSON, TransactionEvent, Transport } from '@sentry/core'; import { timestampInSeconds } from '@sentry/core'; -import type { Scope, Span, SpanJSON, TransactionEvent, Transport } from '@sentry/types'; import * as TestRenderer from '@testing-library/react-native' import * as React from "react"; diff --git a/packages/core/test/tracing/timetodisplay.test.tsx b/packages/core/test/tracing/timetodisplay.test.tsx index f5f12607c..bfdbd3baa 100644 --- a/packages/core/test/tracing/timetodisplay.test.tsx +++ b/packages/core/test/tracing/timetodisplay.test.tsx @@ -9,7 +9,7 @@ jest.mock('../../src/js/utils/environment', () => ({ isTurboModuleEnabled: jest.fn().mockReturnValue(false), })); -import type { Event, Measurements, Span, SpanJSON} from '@sentry/types'; +import type { Event, Measurements, Span, SpanJSON} from '@sentry/core'; import * as React from "react"; import * as TestRenderer from 'react-test-renderer'; diff --git a/packages/core/test/transports/native.test.ts b/packages/core/test/transports/native.test.ts index 1f466ca8c..267f2b4d5 100644 --- a/packages/core/test/transports/native.test.ts +++ b/packages/core/test/transports/native.test.ts @@ -1,4 +1,4 @@ -import type { Envelope } from '@sentry/types'; +import type { Envelope } from '@sentry/core'; import { NativeTransport } from '../../src/js/transports/native'; diff --git a/packages/core/test/wrapper.test.ts b/packages/core/test/wrapper.test.ts index 4663c34a7..9a260f1a1 100644 --- a/packages/core/test/wrapper.test.ts +++ b/packages/core/test/wrapper.test.ts @@ -1,5 +1,5 @@ +import type { Event, EventEnvelope, EventItem, SeverityLevel } from '@sentry/core'; import { createEnvelope, logger } from '@sentry/core'; -import type { Event, EventEnvelope, EventItem, SeverityLevel } from '@sentry/types'; import * as RN from 'react-native'; import type { Spec } from '../src/js/NativeRNSentry'; diff --git a/samples/expo/app/_layout.tsx b/samples/expo/app/_layout.tsx index 31a6a42bb..1dd559efe 100644 --- a/samples/expo/app/_layout.tsx +++ b/samples/expo/app/_layout.tsx @@ -7,7 +7,7 @@ import { useEffect } from 'react'; import { useColorScheme } from '@/components/useColorScheme'; import { SENTRY_INTERNAL_DSN } from '../utils/dsn'; import * as Sentry from '@sentry/react-native'; -import { ErrorEvent } from '@sentry/types'; +import { ErrorEvent } from '@sentry/core'; import { isExpoGo } from '../utils/isExpoGo'; import { LogBox } from 'react-native'; diff --git a/samples/expo/utils/setScopeProperties.ts b/samples/expo/utils/setScopeProperties.ts index ec68866a5..1fbfca423 100644 --- a/samples/expo/utils/setScopeProperties.ts +++ b/samples/expo/utils/setScopeProperties.ts @@ -1,5 +1,5 @@ import * as Sentry from '@sentry/react-native'; -import { SeverityLevel } from '@sentry/types'; +import { SeverityLevel } from '@sentry/core'; export const setScopeProperties = () => { const dateString = new Date().toString(); diff --git a/samples/react-native-macos/package.json b/samples/react-native-macos/package.json index f245a7003..3e7dc38d0 100644 --- a/samples/react-native-macos/package.json +++ b/samples/react-native-macos/package.json @@ -19,7 +19,6 @@ "@sentry/core": "8.44.0", "@sentry/react": "8.44.0", "@sentry/react-native": "6.4.0", - "@sentry/types": "8.44.0", "delay": "^6.0.0", "react": "18.2.0", "react-native": "0.73.9", diff --git a/samples/react-native-macos/src/App.tsx b/samples/react-native-macos/src/App.tsx index d274783d5..bf6a3c4be 100644 --- a/samples/react-native-macos/src/App.tsx +++ b/samples/react-native-macos/src/App.tsx @@ -31,7 +31,7 @@ import { LogBox, Platform, StyleSheet, View } from 'react-native'; import Ionicons from 'react-native-vector-icons/Ionicons'; import PlaygroundScreen from './Screens/PlaygroundScreen'; import { logWithoutTracing } from './utils'; -import { ErrorEvent } from '@sentry/types'; +import { ErrorEvent } from '@sentry/core'; LogBox.ignoreAllLogs(); const isMobileOs = Platform.OS === 'android' || Platform.OS === 'ios'; diff --git a/samples/react-native-macos/src/Screens/GesturesTracingScreen.tsx b/samples/react-native-macos/src/Screens/GesturesTracingScreen.tsx index 16e217dfd..fa440c364 100644 --- a/samples/react-native-macos/src/Screens/GesturesTracingScreen.tsx +++ b/samples/react-native-macos/src/Screens/GesturesTracingScreen.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { StyleSheet, Text, View } from 'react-native'; import { Gesture, GestureDetector } from 'react-native-gesture-handler'; import { sentryTraceGesture, startSpanManual } from '@sentry/react-native'; -import { Span } from '@sentry/types'; +import { Span } from '@sentry/core'; const GesturesTracingScreen = () => { const gesture = Gesture.Pinch().onBegin(() => { diff --git a/samples/react-native-macos/src/Screens/ManualTrackerScreen.tsx b/samples/react-native-macos/src/Screens/ManualTrackerScreen.tsx index 51242ab2e..090cb5292 100644 --- a/samples/react-native-macos/src/Screens/ManualTrackerScreen.tsx +++ b/samples/react-native-macos/src/Screens/ManualTrackerScreen.tsx @@ -8,7 +8,7 @@ import { } from 'react-native'; import * as Sentry from '@sentry/react-native'; -import { Span } from '@sentry/types'; +import { Span } from '@sentry/core'; /** * An example of how to add a Sentry Transaction to a React component manually. diff --git a/samples/react-native-macos/src/setScopeProperties.ts b/samples/react-native-macos/src/setScopeProperties.ts index ec68866a5..1fbfca423 100644 --- a/samples/react-native-macos/src/setScopeProperties.ts +++ b/samples/react-native-macos/src/setScopeProperties.ts @@ -1,5 +1,5 @@ import * as Sentry from '@sentry/react-native'; -import { SeverityLevel } from '@sentry/types'; +import { SeverityLevel } from '@sentry/core'; export const setScopeProperties = () => { const dateString = new Date().toString(); diff --git a/samples/react-native/src/App.tsx b/samples/react-native/src/App.tsx index 04348fa5c..34e0680f5 100644 --- a/samples/react-native/src/App.tsx +++ b/samples/react-native/src/App.tsx @@ -32,7 +32,7 @@ import { LogBox, Platform, StyleSheet, View } from 'react-native'; import Ionicons from 'react-native-vector-icons/Ionicons'; import PlaygroundScreen from './Screens/PlaygroundScreen'; import { logWithoutTracing } from './utils'; -import { ErrorEvent } from '@sentry/types'; +import { ErrorEvent } from '@sentry/core'; import HeavyNavigationScreen from './Screens/HeavyNavigationScreen'; import WebviewScreen from './Screens/WebviewScreen'; import { isTurboModuleEnabled } from '@sentry/react-native/dist/js/utils/environment'; diff --git a/samples/react-native/src/Screens/GesturesTracingScreen.tsx b/samples/react-native/src/Screens/GesturesTracingScreen.tsx index 16e217dfd..fa440c364 100644 --- a/samples/react-native/src/Screens/GesturesTracingScreen.tsx +++ b/samples/react-native/src/Screens/GesturesTracingScreen.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { StyleSheet, Text, View } from 'react-native'; import { Gesture, GestureDetector } from 'react-native-gesture-handler'; import { sentryTraceGesture, startSpanManual } from '@sentry/react-native'; -import { Span } from '@sentry/types'; +import { Span } from '@sentry/core'; const GesturesTracingScreen = () => { const gesture = Gesture.Pinch().onBegin(() => { diff --git a/samples/react-native/src/setScopeProperties.ts b/samples/react-native/src/setScopeProperties.ts index ec68866a5..1fbfca423 100644 --- a/samples/react-native/src/setScopeProperties.ts +++ b/samples/react-native/src/setScopeProperties.ts @@ -1,5 +1,5 @@ import * as Sentry from '@sentry/react-native'; -import { SeverityLevel } from '@sentry/types'; +import { SeverityLevel } from '@sentry/core'; export const setScopeProperties = () => { const dateString = new Date().toString(); diff --git a/yarn.lock b/yarn.lock index 1a61cbb92..c9cd8e5b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -24354,7 +24354,6 @@ __metadata: "@sentry/core": 8.44.0 "@sentry/react": 8.44.0 "@sentry/react-native": 6.4.0 - "@sentry/types": 8.44.0 "@types/react": ^18.2.65 "@types/react-native-vector-icons": ^6.4.18 "@types/react-test-renderer": ^18.0.0