Skip to content

Commit 987dc4d

Browse files
lucas-zimermanlucas-zimerman
authored
Merge dc2e123 into 380b389 
2 parents 380b389 + dc2e123 commit 987dc4d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+264
-228
lines changed

‎CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434

3535
### Dependencies
3636

37+
- Bump JavaScript SDK from v8.54.0 to v9.1.0 ([#4568](https://github.com/getsentry/sentry-react-native/pull/4568))
38+
- [changelog](https://github.com/getsentry/sentry-javascript/blob/9.1.0/CHANGELOG.md)
39+
- [diff](https://github.com/getsentry/sentry-javascript/compare/8.54.0...9.1.0)
3740
- Bump Android SDK from v7.20.1 to v7.22.0 ([#4529](https://github.com/getsentry/sentry-react-native/pull/4529))
3841
- [changelog](https://github.com/getsentry/sentry-java/blob/7.x.x/CHANGELOG.md#7220)
3942
- [diff](https://github.com/getsentry/sentry-java/compare/7.20.1...7.22.0)
@@ -44,6 +47,18 @@
4447
- [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2421)
4548
- [diff](https://github.com/getsentry/sentry-cli/compare/2.41.1...2.42.1)
4649

50+
51+
### Major Changes
52+
53+
- Remove autoSessionTracking option
54+
- Remove `enableTracing` Instead, set tracesSampleRate: 0 to disable, or a higher value to enable it.
55+
- Remove `getCurrentHub()`, `Hub`, and `getCurrentHubShim()`
56+
- Remove `spanId` from propagation `context`
57+
- Remove metrics API
58+
- Remove `transactionContext` from `samplingContext`
59+
- Remove deprecated `Request` type
60+
- Remove `@sentry/utils` package, the exports were moved to `@sentry/core`
61+
4762
## 6.7.0
4863

4964
### Features

‎dev-packages/type-check/ts3.8-test/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ declare global {
33
interface IDBObjectStore {}
44
interface Window {
55
fetch: any;
6+
setTimeout: any;
7+
document: any;
68
}
79
interface ShadowRoot {}
810
interface BufferSource {}
@@ -19,6 +21,7 @@ declare global {
1921
redirectCount: number;
2022
}
2123
interface PerformanceEntry {}
24+
interface Performance {}
2225
}
2326
import 'react-native';
2427

‎packages/core/package.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,22 +66,21 @@
6666
},
6767
"dependencies": {
6868
"@sentry/babel-plugin-component-annotate": "3.1.2",
69-
"@sentry/browser": "8.54.0",
69+
"@sentry/browser": "9.1.0",
7070
"@sentry/cli": "2.42.1",
71-
"@sentry/core": "8.54.0",
72-
"@sentry/react": "8.54.0",
73-
"@sentry/types": "8.54.0",
74-
"@sentry/utils": "8.54.0"
71+
"@sentry/core": "9.1.0",
72+
"@sentry/react": "9.1.0",
73+
"@sentry/types": "9.1.0"
7574
},
7675
"devDependencies": {
7776
"@babel/core": "^7.25.2",
7877
"@expo/metro-config": "0.19.5",
7978
"@mswjs/interceptors": "^0.25.15",
8079
"@react-native/babel-preset": "0.77.1",
81-
"@sentry-internal/eslint-config-sdk": "8.54.0",
82-
"@sentry-internal/eslint-plugin-sdk": "8.54.0",
83-
"@sentry-internal/typescript": "8.54.0",
84-
"@sentry/wizard": "3.42.0",
80+
"@sentry-internal/eslint-config-sdk": "9.1.0",
81+
"@sentry-internal/eslint-plugin-sdk": "9.1.0",
82+
"@sentry-internal/typescript": "9.1.0",
83+
"@sentry/wizard": "3.40.0",
8584
"@testing-library/react-native": "^12.7.2",
8685
"@types/jest": "^29.5.13",
8786
"@types/node": "^20.9.3",
@@ -100,7 +99,7 @@
10099
"eslint-plugin-react-native": "^3.8.1",
101100
"expo": "^52.0.0",
102101
"expo-module-scripts": "3.1.0",
103-
"jest": "^29.6.2",
102+
"jest": "^29.7.0",
104103
"jest-environment-jsdom": "^29.6.2",
105104
"jest-extended": "^4.0.2",
106105
"madge": "^6.1.0",
@@ -110,7 +109,7 @@
110109
"react-native": "0.77.1",
111110
"react-test-renderer": "^18.3.1",
112111
"rimraf": "^4.1.1",
113-
"ts-jest": "^29.1.1",
112+
"ts-jest": "^29.2.5",
114113
"typescript": "4.9.5",
115114
"uglify-js": "^3.17.4",
116115
"uuid": "^9.0.1",

‎packages/core/plugin/src/withSentry.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ interface PluginProps {
1818
const withSentryPlugin: ConfigPlugin<PluginProps | void> = (config, props) => {
1919
const sentryProperties = getSentryProperties(props);
2020

21-
if (props && props.authToken) {
21+
if (props?.authToken) {
2222
// If not removed, the plugin config with the authToken will be written to the application package
2323
delete props.authToken;
2424
}

‎packages/core/plugin/src/withSentryAndroidGradlePlugin.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export function withSentryAndroidGradlePlugin(
3535
const withSentryProjectBuildGradle = (config: any): any => {
3636
return withProjectBuildGradle(config, (projectBuildGradle: any) => {
3737
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
38-
if (!projectBuildGradle.modResults || !projectBuildGradle.modResults.contents) {
38+
if (!projectBuildGradle.modResults?.contents) {
3939
warnOnce('android/build.gradle content is missing or undefined.');
4040
return config;
4141
}

‎packages/core/src/js/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
export type {
22
Breadcrumb,
3-
Request,
43
SdkInfo,
54
Event,
65
Exception,
@@ -43,7 +42,6 @@ export {
4342
getClient,
4443
setCurrentClient,
4544
addEventProcessor,
46-
metricsDefault as metrics,
4745
lastEventId,
4846
} from '@sentry/core';
4947

‎packages/core/src/js/integrations/debugsymbolicator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ function replaceExceptionFramesInException(exception: Exception, frames: SentryS
143143
* @param frames StackFrame[]
144144
*/
145145
function replaceThreadFramesInEvent(event: Event, frames: SentryStackFrame[]): void {
146-
if (event.threads && event.threads.values && event.threads.values[0] && event.threads.values[0].stacktrace) {
146+
if (event.threads?.values?.[0]?.stacktrace) {
147147
event.threads.values[0].stacktrace.frames = frames.reverse();
148148
}
149149
}

‎packages/core/src/js/integrations/default.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,7 @@ export function getDefaultIntegrations(options: ReactNativeClientOptions): Integ
9191
// hasTracingEnabled from `@sentry/core` only check if tracesSampler or tracesSampleRate keys are present
9292
// that's different from prev imp here and might lead misconfiguration
9393
// `tracesSampleRate: undefined` should not enable tracing
94-
const hasTracingEnabled =
95-
options.enableTracing ||
96-
typeof options.tracesSampleRate === 'number' ||
97-
typeof options.tracesSampler === 'function';
94+
const hasTracingEnabled = typeof options.tracesSampleRate === 'number' || typeof options.tracesSampler === 'function';
9895
if (hasTracingEnabled && options.enableAppStartTracking) {
9996
integrations.push(appStartIntegration());
10097
}

‎packages/core/src/js/integrations/nativelinkederrors.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export const nativeLinkedErrorsIntegration = (options: Partial<LinkedErrorsOptio
4343
};
4444

4545
function preprocessEvent(event: Event, hint: EventHint | undefined, client: Client, limit: number, key: string): void {
46-
if (!event.exception || !event.exception.values || !hint || !isInstanceOf(hint.originalException, Error)) {
46+
if (!event.exception?.values || !hint || !isInstanceOf(hint.originalException, Error)) {
4747
return;
4848
}
4949

@@ -176,10 +176,10 @@ function exceptionFromAppleStackReturnAddresses(objCException: {
176176
type: objCException.name,
177177
value: objCException.message,
178178
stacktrace: {
179-
frames: (nativeStackFrames && nativeStackFrames.frames.reverse()) || [],
179+
frames: nativeStackFrames?.frames.reverse() || [],
180180
},
181181
},
182-
appleDebugImages: (nativeStackFrames && (nativeStackFrames.debugMetaImages as DebugImage[])) || [],
182+
appleDebugImages: (nativeStackFrames?.debugMetaImages as DebugImage[]) || [],
183183
};
184184
}
185185

‎packages/core/src/js/integrations/reactnativeerrorhandlers.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ function setupErrorUtilsGlobalHandler(): void {
9999
return;
100100
}
101101

102-
const defaultHandler = errorUtils.getGlobalHandler && errorUtils.getGlobalHandler();
102+
const defaultHandler = errorUtils.getGlobalHandler?.();
103103

104104
// eslint-disable-next-line @typescript-eslint/no-explicit-any
105105
errorUtils.setGlobalHandler(async (error: any, isFatal?: boolean) => {
@@ -155,7 +155,8 @@ function setupErrorUtilsGlobalHandler(): void {
155155
return;
156156
}
157157

158-
void client.flush(client.getOptions().shutdownTimeout || 2000).then(
158+
// shutdownTimeout was removed: https://github.com/getsentry/sentry-javascript/pull/15217
159+
void client.flush(2000).then(
159160
() => {
160161
defaultHandler(error, isFatal);
161162
},

0 commit comments

Comments
 (0)