Skip to content

Commit 13fff3c

Browse files
antonisantonis
authored
Merge 3f1e817 into 1332acb 
2 parents 1332acb + 3f1e817 commit 13fff3c

File tree

6 files changed

+105
-109
lines changed

6 files changed

+105
-109
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@
4949
- Bump Android SDK from v7.18.0 to v7.18.1 ([#4329](https://github.com/getsentry/sentry-react-native/pull/4329))
5050
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7181)
5151
- [diff](https://github.com/getsentry/sentry-java/compare/7.18.0...7.18.1)
52+
- Bump JavaScript SDK from v8.40.0 to v8.41.0 ([#4351](https://github.com/getsentry/sentry-react-native/pull/4351))
53+
- [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#8410)
54+
- [diff](https://github.com/getsentry/sentry-javascript/compare/8.40.0...8.41.0)
5255

5356
## 6.4.0-beta.1
5457

‎dev-packages/e2e-tests/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@babel/preset-env": "^7.25.3",
1515
"@babel/preset-typescript": "^7.18.6",
1616
"@sentry/react-native": "6.4.0-beta.1",
17-
"@sentry/utils": "8.40.0",
17+
"@sentry/utils": "8.41.0",
1818
"@types/node": "^20.9.3",
1919
"@types/react": "^18.2.64",
2020
"appium": "2.4.1",

‎packages/core/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,21 +66,21 @@
6666
},
6767
"dependencies": {
6868
"@sentry/babel-plugin-component-annotate": "2.20.1",
69-
"@sentry/browser": "8.40.0",
69+
"@sentry/browser": "8.41.0",
7070
"@sentry/cli": "2.39.1",
71-
"@sentry/core": "8.40.0",
72-
"@sentry/react": "8.40.0",
73-
"@sentry/types": "8.40.0",
74-
"@sentry/utils": "8.40.0"
71+
"@sentry/core": "8.41.0",
72+
"@sentry/react": "8.41.0",
73+
"@sentry/types": "8.41.0",
74+
"@sentry/utils": "8.41.0"
7575
},
7676
"devDependencies": {
7777
"@babel/core": "^7.25.2",
7878
"@expo/metro-config": "0.19.5",
7979
"@mswjs/interceptors": "^0.25.15",
8080
"@react-native/babel-preset": "0.76.3",
81-
"@sentry-internal/eslint-config-sdk": "8.40.0",
82-
"@sentry-internal/eslint-plugin-sdk": "8.40.0",
83-
"@sentry-internal/typescript": "8.40.0",
81+
"@sentry-internal/eslint-config-sdk": "8.41.0",
82+
"@sentry-internal/eslint-plugin-sdk": "8.41.0",
83+
"@sentry-internal/typescript": "8.41.0",
8484
"@sentry/wizard": "3.36.0",
8585
"@testing-library/react-native": "^12.7.2",
8686
"@types/jest": "^29.5.3",

‎packages/core/test/profiling/integration.test.ts‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { getClient, spanToJSON } from '@sentry/core';
77
import type { Envelope, Event, Integration, Profile, Span, ThreadCpuProfile, Transport } from '@sentry/types';
88

99
import * as Sentry from '../../src/js';
10-
import type { NativeDeviceContextsResponse } from '../../src/js/NativeRNSentry';
1110
import { getDebugMetadata } from '../../src/js/profiling/debugid';
1211
import type { HermesProfilingOptions } from '../../src/js/profiling/integration';
1312
import { hermesProfilingIntegration } from '../../src/js/profiling/integration';
@@ -79,9 +78,6 @@ describe('profiling integration', () => {
7978
describe('environment', () => {
8079
beforeEach(() => {
8180
(getDefaultEnvironment as jest.Mock).mockReturnValue('mocked');
82-
mockWrapper.NATIVE.fetchNativeDeviceContexts.mockResolvedValue(<NativeDeviceContextsResponse>{
83-
environment: 'native',
84-
});
8581
});
8682

8783
const expectTransactionWithEnvironment = (envelope: Envelope | undefined, env: string | undefined) => {
@@ -114,31 +110,28 @@ describe('profiling integration', () => {
114110
expectProfileWithEnvironment(envelope, 'mocked');
115111
});
116112

117-
test('should use native environment for transaction and profile if user value is nullish', () => {
113+
test('should use production environment (default JS) for transaction and profile if user value is nullish', () => {
118114
mock = initTestClient({ withProfiling: true, environment: '' });
119115

120116
Sentry.startSpan({ name: 'test-name' }, () => {});
121117

122118
jest.runAllTimers();
123119

124120
const envelope: Envelope | undefined = mock.transportSendMock.mock.lastCall?.[0];
125-
expectTransactionWithEnvironment(envelope, 'native');
126-
expectProfileWithEnvironment(envelope, 'native');
121+
expectTransactionWithEnvironment(envelope, 'production');
122+
expectProfileWithEnvironment(envelope, 'production');
127123
});
128124

129-
test('should keep nullish for transaction and profile uses default', () => {
130-
mockWrapper.NATIVE.fetchNativeDeviceContexts.mockResolvedValue(<NativeDeviceContextsResponse>{
131-
environment: undefined,
132-
});
125+
test('should use production environment (default JS) for transaction and profile if user value is undefined', () => {
133126
mock = initTestClient({ withProfiling: true, environment: undefined });
134127

135128
Sentry.startSpan({ name: 'test-name' }, () => {});
136129

137130
jest.runAllTimers();
138131

139132
const envelope: Envelope | undefined = mock.transportSendMock.mock.lastCall?.[0];
140-
expectTransactionWithEnvironment(envelope, undefined);
141-
expectProfileWithEnvironment(envelope, 'mocked');
133+
expectTransactionWithEnvironment(envelope, 'production');
134+
expectProfileWithEnvironment(envelope, 'production');
142135
});
143136

144137
test('should keep custom environment for transaction and profile', () => {

‎samples/react-native-macos/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
"@react-navigation/bottom-tabs": "^6.5.12",
1717
"@react-navigation/native": "^6.1.9",
1818
"@react-navigation/stack": "^6.3.20",
19-
"@sentry/react": "8.40.0",
19+
"@sentry/react": "8.41.0",
2020
"@sentry/react-native": "6.4.0-beta.1",
21-
"@sentry/types": "8.40.0",
22-
"@sentry/utils": "8.40.0",
21+
"@sentry/types": "8.41.0",
22+
"@sentry/utils": "8.41.0",
2323
"delay": "^6.0.0",
2424
"react": "18.2.0",
2525
"react-native": "0.73.9",

‎yarn.lock‎

Lines changed: 84 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -7555,22 +7555,22 @@ __metadata:
75557555
languageName: node
75567556
linkType: hard
75577557

7558-
"@sentry-internal/browser-utils@npm:8.40.0":
7559-
version: 8.40.0
7560-
resolution: "@sentry-internal/browser-utils@npm:8.40.0"
7558+
"@sentry-internal/browser-utils@npm:8.41.0":
7559+
version: 8.41.0
7560+
resolution: "@sentry-internal/browser-utils@npm:8.41.0"
75617561
dependencies:
7562-
"@sentry/core": 8.40.0
7563-
"@sentry/types": 8.40.0
7564-
checksum: b32ce642ab4277c3d77d9ccfb0eebbd491f8b4e7eaf395985e63183cb0c298944753d2bc139606fc9b401d3f55a7d3ede15fbb2ac59ba8ff9089dc8a685bca61
7562+
"@sentry/core": 8.41.0
7563+
"@sentry/types": 8.41.0
7564+
checksum: e69a20cd60086993a5a473fa247bf3c4c3ae7e7a1b650ff29cb017baac34aa597f35b8df86bc691ad5c5ad5c8394cb3f982c4da6c593b6dec6147cdd2aefeb7a
75657565
languageName: node
75667566
linkType: hard
75677567

7568-
"@sentry-internal/eslint-config-sdk@npm:8.40.0":
7569-
version: 8.40.0
7570-
resolution: "@sentry-internal/eslint-config-sdk@npm:8.40.0"
7568+
"@sentry-internal/eslint-config-sdk@npm:8.41.0":
7569+
version: 8.41.0
7570+
resolution: "@sentry-internal/eslint-config-sdk@npm:8.41.0"
75717571
dependencies:
7572-
"@sentry-internal/eslint-plugin-sdk": 8.40.0
7573-
"@sentry-internal/typescript": 8.40.0
7572+
"@sentry-internal/eslint-plugin-sdk": 8.41.0
7573+
"@sentry-internal/typescript": 8.41.0
75747574
"@typescript-eslint/eslint-plugin": ^5.48.0
75757575
"@typescript-eslint/parser": ^5.48.0
75767576
eslint-config-prettier: ^6.11.0
@@ -7581,46 +7581,46 @@ __metadata:
75817581
eslint-plugin-simple-import-sort: ^5.0.3
75827582
peerDependencies:
75837583
eslint: ">=5"
7584-
checksum: 4a39cdedfcf0afad91b6c8971032e1db282deaed909ef625dacbe9bf513993062f3abfd4e6d92e75498dcfc96266502d90336429c410960794f2e887a2a29bad
7584+
checksum: 63014266652bff78a60824928adc5e69e3ea2bb1de8c957151078509cd441da739867f35e9cac1cd2c37b0c58fec34427e2da0807a832052dd60d35f827873ba
75857585
languageName: node
75867586
linkType: hard
75877587

7588-
"@sentry-internal/eslint-plugin-sdk@npm:8.40.0":
7589-
version: 8.40.0
7590-
resolution: "@sentry-internal/eslint-plugin-sdk@npm:8.40.0"
7591-
checksum: c05067add58f99838a1df57e3de97a76fd7a19a25c68149925a6ba6d1873c26a11444ae4d06523c9cb3dd175c21c94a6d7ca7ee9112f735ba2e0be5bae013dfc
7588+
"@sentry-internal/eslint-plugin-sdk@npm:8.41.0":
7589+
version: 8.41.0
7590+
resolution: "@sentry-internal/eslint-plugin-sdk@npm:8.41.0"
7591+
checksum: a130b9a1ed2535f33b598c0830a8dbe33332ba89d65a2afd271bac2b310f458da071b5c8377f301c2bf293f6fdbdfc16123628db80639fb1c6b4011d5ed0855d
75927592
languageName: node
75937593
linkType: hard
75947594

7595-
"@sentry-internal/feedback@npm:8.40.0":
7596-
version: 8.40.0
7597-
resolution: "@sentry-internal/feedback@npm:8.40.0"
7595+
"@sentry-internal/feedback@npm:8.41.0":
7596+
version: 8.41.0
7597+
resolution: "@sentry-internal/feedback@npm:8.41.0"
75987598
dependencies:
7599-
"@sentry/core": 8.40.0
7600-
"@sentry/types": 8.40.0
7601-
checksum: 712845b89df12d4b75f293de37b5888f8dc78e58639f11368edf095185fbb7c50bcc65e992d10b276b6feca5976b5e4ff6e8e4e5d4c9096d5fa0a3becb7c581d
7599+
"@sentry/core": 8.41.0
7600+
"@sentry/types": 8.41.0
7601+
checksum: 9beef2c0cacf5e9cf1650cb0ad8d95ff26a3d8fb833f009c6399b207ae6c6f49f61f9beb483d252044fd26b23a882780438c7a15fe7b32324c05f78c0abb4f01
76027602
languageName: node
76037603
linkType: hard
76047604

7605-
"@sentry-internal/replay-canvas@npm:8.40.0":
7606-
version: 8.40.0
7607-
resolution: "@sentry-internal/replay-canvas@npm:8.40.0"
7605+
"@sentry-internal/replay-canvas@npm:8.41.0":
7606+
version: 8.41.0
7607+
resolution: "@sentry-internal/replay-canvas@npm:8.41.0"
76087608
dependencies:
7609-
"@sentry-internal/replay": 8.40.0
7610-
"@sentry/core": 8.40.0
7611-
"@sentry/types": 8.40.0
7612-
checksum: ed4eee113ede6c3f5dfec190a8df24957f366bf0698f78b626ae53876c8319583c5cc042d93cb3542147eab3e4e1d3c95ee24cb0bb530800cc1dd926b64ed811
7609+
"@sentry-internal/replay": 8.41.0
7610+
"@sentry/core": 8.41.0
7611+
"@sentry/types": 8.41.0
7612+
checksum: 673c6e9a48dd1929e7c41060ceca9f88073e09674ae841851d501b350f144d509a020dd8588550a6ae502e488b64b22d0ff70dd45bd5578bde558be847ecd9c5
76137613
languageName: node
76147614
linkType: hard
76157615

7616-
"@sentry-internal/replay@npm:8.40.0":
7617-
version: 8.40.0
7618-
resolution: "@sentry-internal/replay@npm:8.40.0"
7616+
"@sentry-internal/replay@npm:8.41.0":
7617+
version: 8.41.0
7618+
resolution: "@sentry-internal/replay@npm:8.41.0"
76197619
dependencies:
7620-
"@sentry-internal/browser-utils": 8.40.0
7621-
"@sentry/core": 8.40.0
7622-
"@sentry/types": 8.40.0
7623-
checksum: 6e37746ec8de83551aef8001583f114b9f04bdf85dd6db9431d939263c87530ac484e826585c3ee210a9089db0743e0221974bd2e7a9aeb6ff79cd150f163d14
7620+
"@sentry-internal/browser-utils": 8.41.0
7621+
"@sentry/core": 8.41.0
7622+
"@sentry/types": 8.41.0
7623+
checksum: d7bc48e99d31d4fe8431c7169c9b427f8e04ea9bc947fad17f851dd5710674f666d9b6b892706c52b7c0d1bd376bce768b41695ee6543d2753b1f40e5df264a3
76247624
languageName: node
76257625
linkType: hard
76267626

@@ -7635,12 +7635,12 @@ __metadata:
76357635
languageName: node
76367636
linkType: hard
76377637

7638-
"@sentry-internal/typescript@npm:8.40.0":
7639-
version: 8.40.0
7640-
resolution: "@sentry-internal/typescript@npm:8.40.0"
7638+
"@sentry-internal/typescript@npm:8.41.0":
7639+
version: 8.41.0
7640+
resolution: "@sentry-internal/typescript@npm:8.41.0"
76417641
peerDependencies:
76427642
typescript: 4.9.5
7643-
checksum: 9aa59edb8d69cb77dac7aca74ce34bc2ffb6f55ca19737978b55447bf8e651abfd1598eb6cf551bb9914f51b866c5b031734c8043915128b6058d6a2cd93cdff
7643+
checksum: b8fe6b5c384751727d21941e5d12a627e433287050ff64d00460690b5d9bee82c49c9ec439ff19b304ecb5267cd525c2ad28cabcdb4e06ea9ad20d2459e8df1b
76447644
languageName: node
76457645
linkType: hard
76467646

@@ -7658,17 +7658,17 @@ __metadata:
76587658
languageName: node
76597659
linkType: hard
76607660

7661-
"@sentry/browser@npm:8.40.0":
7662-
version: 8.40.0
7663-
resolution: "@sentry/browser@npm:8.40.0"
7661+
"@sentry/browser@npm:8.41.0":
7662+
version: 8.41.0
7663+
resolution: "@sentry/browser@npm:8.41.0"
76647664
dependencies:
7665-
"@sentry-internal/browser-utils": 8.40.0
7666-
"@sentry-internal/feedback": 8.40.0
7667-
"@sentry-internal/replay": 8.40.0
7668-
"@sentry-internal/replay-canvas": 8.40.0
7669-
"@sentry/core": 8.40.0
7670-
"@sentry/types": 8.40.0
7671-
checksum: b8c21570ff6a26effd1ae2843ab377c3e345624e38cea2eff916b160c8b3d33eb649d088f4f9dfcb26ae0aa8e8d02a7f947ed19af7a139ac2ad2b1f9d3adca2d
7665+
"@sentry-internal/browser-utils": 8.41.0
7666+
"@sentry-internal/feedback": 8.41.0
7667+
"@sentry-internal/replay": 8.41.0
7668+
"@sentry-internal/replay-canvas": 8.41.0
7669+
"@sentry/core": 8.41.0
7670+
"@sentry/types": 8.41.0
7671+
checksum: 44b96e28afe94c4a62e43fe9e1ee1dc12adb46066e25c96e8557631b25833135d919bcf02f2ea93da315bac9fd3ba7e4f1890d3bbf1409c2823d51aa7f6e8bca
76727672
languageName: node
76737673
linkType: hard
76747674

@@ -7784,12 +7784,12 @@ __metadata:
77847784
languageName: node
77857785
linkType: hard
77867786

7787-
"@sentry/core@npm:8.40.0":
7788-
version: 8.40.0
7789-
resolution: "@sentry/core@npm:8.40.0"
7787+
"@sentry/core@npm:8.41.0":
7788+
version: 8.41.0
7789+
resolution: "@sentry/core@npm:8.41.0"
77907790
dependencies:
7791-
"@sentry/types": 8.40.0
7792-
checksum: db80e8410401c3dfd09d1bad0508e592b44082e58a44a354b9332f4dc7295e3f98bcdfb36e542e43d2e66fbfbb8f1e8035feb91994e7f40a2a869d1de979b1d2
7791+
"@sentry/types": 8.41.0
7792+
checksum: a7c96f155ca9f555091a0e6bfccd061c3eb6545adcaec2323e27ed60c65550d407b1de3516694fc729b43496f58bb0e3c99f1315d052fc6bec55d52c98eea2ed
77937793
languageName: node
77947794
linkType: hard
77957795

@@ -7826,16 +7826,16 @@ __metadata:
78267826
"@expo/metro-config": 0.19.5
78277827
"@mswjs/interceptors": ^0.25.15
78287828
"@react-native/babel-preset": 0.76.3
7829-
"@sentry-internal/eslint-config-sdk": 8.40.0
7830-
"@sentry-internal/eslint-plugin-sdk": 8.40.0
7831-
"@sentry-internal/typescript": 8.40.0
7829+
"@sentry-internal/eslint-config-sdk": 8.41.0
7830+
"@sentry-internal/eslint-plugin-sdk": 8.41.0
7831+
"@sentry-internal/typescript": 8.41.0
78327832
"@sentry/babel-plugin-component-annotate": 2.20.1
7833-
"@sentry/browser": 8.40.0
7833+
"@sentry/browser": 8.41.0
78347834
"@sentry/cli": 2.39.1
7835-
"@sentry/core": 8.40.0
7836-
"@sentry/react": 8.40.0
7837-
"@sentry/types": 8.40.0
7838-
"@sentry/utils": 8.40.0
7835+
"@sentry/core": 8.41.0
7836+
"@sentry/react": 8.41.0
7837+
"@sentry/types": 8.41.0
7838+
"@sentry/utils": 8.41.0
78397839
"@sentry/wizard": 3.36.0
78407840
"@testing-library/react-native": ^12.7.2
78417841
"@types/jest": ^29.5.3
@@ -7882,17 +7882,17 @@ __metadata:
78827882
languageName: unknown
78837883
linkType: soft
78847884

7885-
"@sentry/react@npm:8.40.0":
7886-
version: 8.40.0
7887-
resolution: "@sentry/react@npm:8.40.0"
7885+
"@sentry/react@npm:8.41.0":
7886+
version: 8.41.0
7887+
resolution: "@sentry/react@npm:8.41.0"
78887888
dependencies:
7889-
"@sentry/browser": 8.40.0
7890-
"@sentry/core": 8.40.0
7891-
"@sentry/types": 8.40.0
7889+
"@sentry/browser": 8.41.0
7890+
"@sentry/core": 8.41.0
7891+
"@sentry/types": 8.41.0
78927892
hoist-non-react-statics: ^3.3.2
78937893
peerDependencies:
78947894
react: ^16.14.0 || 17.x || 18.x || 19.x
7895-
checksum: 53276804fb6cb82c7ed69d62db3452c55c2dc275f4afe0a07e6572b0855231b64d487a4b13fc843ee319b5e6390c34245b80e3e6784d799cc2e14f814fedf920
7895+
checksum: ca6e209287e7c2ec7213b41044c31061a705f2c7f005d1a7a8059f57ae27308ee588495652c744ab6f68fb14d96ba79260de05d8e538ce4273abc283a0f9cb15
78967896
languageName: node
78977897
linkType: hard
78987898

@@ -7903,10 +7903,10 @@ __metadata:
79037903
languageName: node
79047904
linkType: hard
79057905

7906-
"@sentry/types@npm:8.40.0":
7907-
version: 8.40.0
7908-
resolution: "@sentry/types@npm:8.40.0"
7909-
checksum: eb7fbb606d9178559de219e86da5dfefa78a8825d5baf03a2eb8fafdcdfb51898bde943edc375adc8cb71fcae2d854b019088c6a045541e94a1c6c1c9779cfe8
7906+
"@sentry/types@npm:8.41.0":
7907+
version: 8.41.0
7908+
resolution: "@sentry/types@npm:8.41.0"
7909+
checksum: 975ca97ceebcddef6db5517000cbec54afe5cda1f5ac4ea1ba32ab1be4f96f63660c9f8059753e86a2cf37df310e3e998e8d7bd3c4d1e588e298daf136fde722
79107910
languageName: node
79117911
linkType: hard
79127912

@@ -7919,13 +7919,13 @@ __metadata:
79197919
languageName: node
79207920
linkType: hard
79217921

7922-
"@sentry/utils@npm:8.40.0":
7923-
version: 8.40.0
7924-
resolution: "@sentry/utils@npm:8.40.0"
7922+
"@sentry/utils@npm:8.41.0":
7923+
version: 8.41.0
7924+
resolution: "@sentry/utils@npm:8.41.0"
79257925
dependencies:
7926-
"@sentry/core": 8.40.0
7927-
"@sentry/types": 8.40.0
7928-
checksum: 18d1c5a1b259dbe6ceee9ae7ef22fa0cb0cc5650ecfe51dc2d9367992981d4ce9d5d8267e27ab2e32ca56525c11b0f3a1f41e34492d14d0059e3983d18042fd0
7926+
"@sentry/core": 8.41.0
7927+
"@sentry/types": 8.41.0
7928+
checksum: 09a820928f54a87d385c628a5c8ba0fdf5b3e93befcbaf05237e6db26323d10b17900924f68384fdecece95908cd6462f9870b34000caa80ed34c599db065156
79297929
languageName: node
79307930
linkType: hard
79317931

@@ -24295,7 +24295,7 @@ __metadata:
2429524295
"@babel/preset-env": ^7.25.3
2429624296
"@babel/preset-typescript": ^7.18.6
2429724297
"@sentry/react-native": 6.4.0-beta.1
24298-
"@sentry/utils": 8.40.0
24298+
"@sentry/utils": 8.41.0
2429924299
"@types/node": ^20.9.3
2430024300
"@types/react": ^18.2.64
2430124301
appium: 2.4.1
@@ -24358,10 +24358,10 @@ __metadata:
2435824358
"@react-navigation/bottom-tabs": ^6.5.12
2435924359
"@react-navigation/native": ^6.1.9
2436024360
"@react-navigation/stack": ^6.3.20
24361-
"@sentry/react": 8.40.0
24361+
"@sentry/react": 8.41.0
2436224362
"@sentry/react-native": 6.4.0-beta.1
24363-
"@sentry/types": 8.40.0
24364-
"@sentry/utils": 8.40.0
24363+
"@sentry/types": 8.41.0
24364+
"@sentry/utils": 8.41.0
2436524365
"@types/react": ^18.2.65
2436624366
"@types/react-native-vector-icons": ^6.4.18
2436724367
"@types/react-test-renderer": ^18.0.0

0 commit comments

Comments
 (0)