Skip to content

Commit c2dfb45

Browse files
committed
Merge branch 'main' into fix/e2e-stable-checks
2 parents fcd6a8f + 99d85ec commit c2dfb45

11 files changed

Lines changed: 151 additions & 153 deletions

File tree

CHANGELOG.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,12 @@
1919
- Bump Cocoa SDK from v9.7.0 to v9.8.0 ([#5847](https://github.com/getsentry/sentry-react-native/pull/5847))
2020
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#980)
2121
- [diff](https://github.com/getsentry/sentry-cocoa/compare/9.7.0...9.8.0)
22-
- Bump JavaScript SDK from v10.44.0 to v10.45.0 ([#5848](https://github.com/getsentry/sentry-react-native/pull/5848))
23-
- [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#10450)
24-
- [diff](https://github.com/getsentry/sentry-javascript/compare/10.44.0...10.45.0)
22+
- Bump JavaScript SDK from v10.44.0 to v10.46.0 ([#5848](https://github.com/getsentry/sentry-react-native/pull/5848), [#5890](https://github.com/getsentry/sentry-react-native/pull/5890))
23+
- [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#10460)
24+
- [diff](https://github.com/getsentry/sentry-javascript/compare/10.44.0...10.46.0)
25+
- Bump CLI from v3.3.3 to v3.3.4 ([#5891](https://github.com/getsentry/sentry-react-native/pull/5891))
26+
- [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#334)
27+
- [diff](https://github.com/getsentry/sentry-cli/compare/3.3.3...3.3.4)
2528

2629
## 8.5.0
2730

dev-packages/e2e-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"devDependencies": {
1414
"@babel/preset-env": "^7.25.3",
1515
"@babel/preset-typescript": "^7.18.6",
16-
"@sentry/core": "10.45.0",
16+
"@sentry/core": "10.46.0",
1717
"@sentry/react-native": "8.5.0",
1818
"@types/node": "^20.9.3",
1919
"@types/react": "^18.2.64",

package.json

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
},
3030
"devDependencies": {
3131
"@naturalcycles/ktlint": "^1.13.0",
32-
"@sentry/cli": "3.3.3",
32+
"@sentry/cli": "3.3.4",
3333
"downlevel-dts": "^0.11.0",
3434
"google-java-format": "^1.4.0",
3535
"lerna": "^8.1.8",
@@ -66,16 +66,11 @@
6666
"front-matter@npm:4.0.2/js-yaml": "^3.14.2",
6767
"js-yaml": "^4.1.1",
6868
"detox@npm:20.46.0/ajv": "^8.18.0",
69-
"@eslint/eslintrc@npm:2.1.4/ajv": "^6.14.0",
7069
"@eslint/eslintrc@npm:3.3.3/ajv": "^6.14.0",
7170
"eslint@npm:9.39.4/ajv": "^6.14.0",
72-
"express@npm:4.19.2/path-to-regexp": "0.1.12",
7371
"@eslint/config-array@npm:0.21.1/minimatch": "^3.1.3",
74-
"@eslint/eslintrc@npm:2.1.4/minimatch": "^3.1.3",
7572
"@eslint/eslintrc@npm:3.3.3/minimatch": "^3.1.3",
7673
"@expo/fingerprint@npm:0.6.1/minimatch": "^3.1.3",
77-
"@humanwhocodes/config-array@npm:0.11.14/minimatch": "^3.1.3",
78-
"@humanwhocodes/config-array@npm:0.13.0/minimatch": "^3.1.3",
7974
"@lerna/create@npm:8.1.8/minimatch": "^3.1.3",
8075
"eslint-plugin-import@npm:2.31.0/minimatch": "^3.1.3",
8176
"eslint-plugin-import@npm:2.32.0/minimatch": "^3.1.3",
@@ -109,15 +104,14 @@
109104
"@typescript-eslint/typescript-estree@npm:8.56.1/minimatch": "^9.0.7",
110105
"@typescript-eslint/typescript-estree@npm:8.57.0/minimatch": "^9.0.7",
111106
"editorconfig@npm:1.0.4/minimatch": "^9.0.7",
112-
"glob@npm:10.4.1/minimatch": "^9.0.7",
113107
"glob@npm:10.4.5/minimatch": "^9.0.7",
114108
"ignore-walk@npm:6.0.5/minimatch": "^9.0.7",
115109
"npm-run-all2@npm:6.2.2/minimatch": "^9.0.7",
116110
"nx@npm:19.6.4/minimatch": "^9.0.7",
117111
"webdriverio@npm:8.40.5/minimatch": "^9.0.7",
118112
"glob@npm:13.0.0/minimatch": "^10.2.3",
119-
"@sentry-internal/eslint-config-sdk@npm:10.45.0/@typescript-eslint/eslint-plugin": "^8.0.0",
120-
"@sentry-internal/eslint-config-sdk@npm:10.45.0/@typescript-eslint/parser": "^8.0.0",
113+
"@sentry-internal/eslint-config-sdk@npm:10.46.0/@typescript-eslint/eslint-plugin": "^8.0.0",
114+
"@sentry-internal/eslint-config-sdk@npm:10.46.0/@typescript-eslint/parser": "^8.0.0",
121115
"eslint-plugin-ft-flow": "^3.0.0",
122116
"axios": "^1.13.5",
123117
"fast-xml-parser": "^5.5.7",
@@ -128,8 +122,7 @@
128122
"on-headers": "^1.1.0",
129123
"diff": "^5.2.2",
130124
"tar": "^7.5.11",
131-
"tmp": "^0.2.4",
132-
"@appium/support@npm:6.1.1/yauzl": "^3.2.1"
125+
"tmp": "^0.2.4"
133126
},
134127
"version": "0.0.0",
135128
"name": "sentry-react-native",

packages/core/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,20 +72,20 @@
7272
},
7373
"dependencies": {
7474
"@sentry/babel-plugin-component-annotate": "5.1.1",
75-
"@sentry/browser": "10.45.0",
76-
"@sentry/cli": "3.3.3",
77-
"@sentry/core": "10.45.0",
78-
"@sentry/react": "10.45.0",
79-
"@sentry/types": "10.45.0"
75+
"@sentry/browser": "10.46.0",
76+
"@sentry/cli": "3.3.4",
77+
"@sentry/core": "10.46.0",
78+
"@sentry/react": "10.46.0",
79+
"@sentry/types": "10.46.0"
8080
},
8181
"devDependencies": {
8282
"@babel/core": "^7.26.7",
8383
"@expo/metro-config": "~0.20.0",
8484
"@mswjs/interceptors": "^0.25.15",
8585
"@react-native/babel-preset": "0.80.0",
86-
"@sentry-internal/eslint-config-sdk": "10.45.0",
87-
"@sentry-internal/eslint-plugin-sdk": "10.45.0",
88-
"@sentry-internal/typescript": "10.45.0",
86+
"@sentry-internal/eslint-config-sdk": "10.46.0",
87+
"@sentry-internal/eslint-plugin-sdk": "10.46.0",
88+
"@sentry-internal/typescript": "10.46.0",
8989
"@sentry/wizard": "6.12.0",
9090
"@testing-library/react-native": "^13.2.2",
9191
"@types/jest": "^29.5.13",
@@ -117,7 +117,7 @@
117117
"react-test-renderer": "19.1.0",
118118
"rimraf": "^4.1.1",
119119
"ts-jest": "^29.3.1",
120-
"typescript": "4.9.5",
120+
"typescript": "~5.9.3",
121121
"uglify-js": "^3.17.4",
122122
"uuid": "^9.0.1",
123123
"xmlhttprequest": "^1.8.0"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ function walkErrorTree(
101101
} else if (isInstanceOf(linkedError, Error)) {
102102
exception = exceptionFromError(parser, error[key]);
103103
} else if (isPlainObject(linkedError)) {
104+
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
104105
const plainError = linkedError as Record<string, unknown>;
105106
exception = {
106107
type: typeof plainError.name === 'string' ? plainError.name : undefined,

packages/core/src/js/touchevents.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,10 @@ function getLabelValue(props: Record<string, unknown>, labelKey: string | undefi
316316
? props[SENTRY_LABEL_PROP_KEY]
317317
// For some reason type narrowing doesn't work as expected with indexing when checking it all in one go in
318318
// the "check-label" if sentence, so we have to assign it to a variable here first
319+
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
319320
: typeof labelKey === 'string' && typeof props[labelKey] == 'string' && (props[labelKey] as string).length > 0
320-
? props[labelKey] as string
321+
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
322+
? (props[labelKey] as string)
321323
: undefined;
322324
}
323325

packages/core/src/js/wrapper.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import { base64StringFromByteArray } from './vendor';
3838
*/
3939
export function getRNSentryModule(): Spec | undefined {
4040
return isTurboModuleEnabled()
41-
? ReactNativeLibraries.TurboModuleRegistry?.get<Spec>('RNSentry')
41+
? ReactNativeLibraries.TurboModuleRegistry?.get<Spec>('RNSentry') ?? undefined
4242
: NativeModules.RNSentry;
4343
}
4444

@@ -268,11 +268,10 @@ export const NATIVE: SentryNativeWrapper = {
268268
if (!this._isModuleLoaded(RNSentry)) {
269269
throw this._NativeClientError;
270270
}
271-
const ignoreErrorsStr = options.ignoreErrors?.filter(item => typeof item === 'string') as string[] | undefined;
272-
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
271+
const ignoreErrorsStr = options.ignoreErrors?.filter((item): item is string => typeof item === 'string');
273272
const ignoreErrorsRegex = options.ignoreErrors
274-
?.filter(item => item instanceof RegExp)
275-
.map(item => (item as RegExp).source) as string[] | undefined;
273+
?.filter((item): item is RegExp => item instanceof RegExp)
274+
.map(item => item.source);
276275

277276
if (ignoreErrorsStr && ignoreErrorsStr.length > 0) {
278277
options.ignoreErrorsStr = ignoreErrorsStr;

samples/expo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"eas-build-development-android": "eas build --profile development --platform android"
2424
},
2525
"dependencies": {
26-
"@sentry/core": "10.45.0",
26+
"@sentry/core": "10.46.0",
2727
"@sentry/react-native": "8.5.0",
2828
"@types/react": "~19.2.10",
2929
"expo": "^55.0.0",

samples/react-native-macos/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"@react-navigation/bottom-tabs": "^6.5.12",
1717
"@react-navigation/native": "^6.1.9",
1818
"@react-navigation/stack": "^6.3.20",
19-
"@sentry/core": "10.45.0",
20-
"@sentry/react": "10.45.0",
19+
"@sentry/core": "10.46.0",
20+
"@sentry/react": "10.46.0",
2121
"@sentry/react-native": "8.5.0",
2222
"delay": "^6.0.0",
2323
"react": "18.2.0",

samples/react-native/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
"@react-navigation/native-stack": "^7.3.24",
4848
"@react-navigation/stack": "^7.4.5",
4949
"@reduxjs/toolkit": "^2.8.2",
50-
"@sentry/core": "10.45.0",
51-
"@sentry/react": "10.45.0",
50+
"@sentry/core": "10.46.0",
51+
"@sentry/react": "10.46.0",
5252
"@sentry/react-native": "8.5.0",
5353
"@shopify/flash-list": "^2.0.2",
5454
"delay": "^6.0.0",

0 commit comments

Comments
 (0)