Skip to content

Commit c89ccf1

Browse files
krystofwoldrichkrystofwoldrich
committed
Merge branch 'main' into kw-upgrade-to-rn-79
2 parents 6006d9a + 9b5b3f4 commit c89ccf1

File tree

25 files changed

+685
-124
lines changed

25 files changed

+685
-124
lines changed

‎.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@28deaeda66b76a05916b6923827895f2b14ab387 # [email protected].16
47+
uses: github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b # [email protected].17
4848
with:
4949
languages: ${{ matrix.language }}
5050
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,7 @@ jobs:
5555
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5656
# If this step fails, then you should remove it and run the build manually (see below)
5757
- name: Autobuild
58-
uses: github/codeql-action/autobuild@28deaeda66b76a05916b6923827895f2b14ab387 # [email protected].16
58+
uses: github/codeql-action/autobuild@60168efe1c415ce0f5521ea06d5c2062adbeed1b # [email protected].17
5959

6060
# ℹ️ Command-line programs to run using the OS shell.
6161
# 📚 https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
@@ -66,4 +66,4 @@ jobs:
6666
# make bootstrap
6767
# make release
6868
- name: Perform CodeQL Analysis
69-
uses: github/codeql-action/analyze@28deaeda66b76a05916b6923827895f2b14ab387 # [email protected].16
69+
uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # [email protected].17

‎.github/workflows/e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414

1515
env:
1616
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
17-
MAESTRO_VERSION: '1.40.0'
17+
MAESTRO_VERSION: '1.40.1'
1818
IOS_DEVICE: 'iPhone 16'
1919
IOS_VERSION: '18.1'
2020

‎.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- name: Get auth token
2121
id: token
22-
uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
22+
uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
2323
with:
2424
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2525
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

‎.github/workflows/sample-application.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ concurrency:
1313

1414
env:
1515
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
16-
MAESTRO_VERSION: '1.40.0'
16+
MAESTRO_VERSION: '1.40.1'
1717
RN_SENTRY_POD_NAME: RNSentry
1818
IOS_APP_ARCHIVE_PATH: sentry-react-native-sample.app.zip
1919
ANDROID_APP_ARCHIVE_PATH: sentry-react-native-sample.apk.zip

‎CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,21 @@
88
99
## Unreleased
1010

11+
### Dependencies
12+
13+
- Bump CLI from v2.43.1 to v2.44.0 ([#4804](https://github.com/getsentry/sentry-react-native/pull/4804))
14+
- [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2440)
15+
- [diff](https://github.com/getsentry/sentry-cli/compare/2.43.1...2.44.0)
16+
- Bump Bundler Plugins from v3.3.1 to v3.4.0 ([#4805](https://github.com/getsentry/sentry-react-native/pull/4805))
17+
- [changelog](https://github.com/getsentry/sentry-javascript-bundler-plugins/blob/main/CHANGELOG.md#340)
18+
- [diff](https://github.com/getsentry/sentry-javascript-bundler-plugins/compare/3.3.1...3.4.0)
19+
20+
## 6.13.1
21+
1122
### Fixes
1223

1324
- Disable native driver for Feedback Widget `backgroundColor` animation in unsupported React Native versions ([#4794](https://github.com/getsentry/sentry-react-native/pull/4794))
25+
- Fix Debug Symbolicator for local development builds (use RN 0.79 default exports) ([#4801](https://github.com/getsentry/sentry-react-native/pull/4801))
1426

1527
## 6.13.0
1628

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sentry-react-native-e2e-tests",
3-
"version": "6.13.0",
3+
"version": "6.13.1",
44
"private": true,
55
"description": "Sentry React Native End to End Tests Library",
66
"main": "dist/index.js",
@@ -14,7 +14,7 @@
1414
"@babel/preset-env": "^7.25.3",
1515
"@babel/preset-typescript": "^7.18.6",
1616
"@sentry/core": "8.54.0",
17-
"@sentry/react-native": "6.13.0",
17+
"@sentry/react-native": "6.13.1",
1818
"@types/node": "^20.9.3",
1919
"@types/react": "^18.2.64",
2020
"appium": "2.4.1",

‎dev-packages/type-check/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "sentry-react-native-type-check",
33
"private": true,
4-
"version": "6.13.0",
4+
"version": "6.13.1",
55
"scripts": {
66
"type-check": "./run-type-check.sh"
77
}

‎dev-packages/utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sentry-react-native-samples-utils",
3-
"version": "6.13.0",
3+
"version": "6.13.1",
44
"description": "Internal Samples Utils",
55
"main": "index.js",
66
"license": "MIT",

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
3-
"version": "6.13.0",
3+
"version": "6.13.1",
44
"packages": [
55
"packages/*",
66
"dev-packages/*",

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"devDependencies": {
3131
"@expo/swiftlint": "^0.57.1",
3232
"@naturalcycles/ktlint": "^1.13.0",
33-
"@sentry/cli": "2.43.1",
33+
"@sentry/cli": "2.44.0",
3434
"clang-format": "^1.8.0",
3535
"downlevel-dts": "^0.11.0",
3636
"google-java-format": "^1.4.0",

‎packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
class RNSentryVersion {
44
static final String REACT_NATIVE_SDK_PACKAGE_NAME = "npm:@sentry/react-native";
5-
static final String REACT_NATIVE_SDK_PACKAGE_VERSION = "6.13.0";
5+
static final String REACT_NATIVE_SDK_PACKAGE_VERSION = "6.13.1";
66
static final String NATIVE_SDK_NAME = "sentry.native.android.react-native";
77
static final String ANDROID_SDK_NAME = "sentry.java.android.react-native";
88
static final String REACT_NATIVE_SDK_NAME = "sentry.javascript.react-native";

‎packages/core/ios/RNSentryVersion.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
NSString *const NATIVE_SDK_NAME = @"sentry.cocoa.react-native";
44
NSString *const REACT_NATIVE_SDK_NAME = @"sentry.javascript.react-native";
55
NSString *const REACT_NATIVE_SDK_PACKAGE_NAME = @"npm:@sentry/react-native";
6-
NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"6.13.0";
6+
NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"6.13.1";

‎packages/core/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@sentry/react-native",
33
"homepage": "https://github.com/getsentry/sentry-react-native",
44
"repository": "https://github.com/getsentry/sentry-react-native",
5-
"version": "6.13.0",
5+
"version": "6.13.1",
66
"description": "Official Sentry SDK for react-native",
77
"typings": "dist/js/index.d.ts",
88
"types": "dist/js/index.d.ts",
@@ -65,9 +65,9 @@
6565
"react-native": ">=0.65.0"
6666
},
6767
"dependencies": {
68-
"@sentry/babel-plugin-component-annotate": "3.3.1",
68+
"@sentry/babel-plugin-component-annotate": "3.4.0",
6969
"@sentry/browser": "8.54.0",
70-
"@sentry/cli": "2.43.1",
70+
"@sentry/cli": "2.44.0",
7171
"@sentry/core": "8.54.0",
7272
"@sentry/react": "8.54.0",
7373
"@sentry/types": "8.54.0",

‎packages/core/src/js/utils/rnlibraries.ts

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,47 @@ const InternalReactNativeLibrariesInterface: Required<ReactNativeLibrariesInterf
88
Devtools: {
99
parseErrorStack: (errorStack: string): Array<ReactNative.StackFrame> => {
1010
const parseErrorStack = require('react-native/Libraries/Core/Devtools/parseErrorStack');
11+
12+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
13+
if (parseErrorStack.default && typeof parseErrorStack.default === 'function') {
14+
// Starting with react-native 0.79, the parseErrorStack is a default export
15+
// https://github.com/facebook/react-native/commit/e5818d92a867dbfa5f60d176b847b1f2131cb6da
16+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
17+
return parseErrorStack.default(errorStack);
18+
}
19+
20+
// react-native 0.78 and below
1121
return parseErrorStack(errorStack);
1222
},
1323
symbolicateStackTrace: (
1424
stack: Array<ReactNative.StackFrame>,
1525
extraData?: Record<string, unknown>,
1626
): Promise<ReactNative.SymbolicatedStackTrace> => {
1727
const symbolicateStackTrace = require('react-native/Libraries/Core/Devtools/symbolicateStackTrace');
28+
29+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
30+
if (symbolicateStackTrace.default && typeof symbolicateStackTrace.default === 'function') {
31+
// Starting with react-native 0.79, the symbolicateStackTrace is a default export
32+
// https://github.com/facebook/react-native/commit/e5818d92a867dbfa5f60d176b847b1f2131cb6da
33+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
34+
return symbolicateStackTrace.default(stack, extraData);
35+
}
36+
37+
// react-native 0.78 and below
1838
return symbolicateStackTrace(stack, extraData);
1939
},
2040
getDevServer: (): ReactNative.DevServerInfo => {
2141
const getDevServer = require('react-native/Libraries/Core/Devtools/getDevServer');
42+
43+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
44+
if (getDevServer.default && typeof getDevServer.default === 'function') {
45+
// Starting with react-native 0.79, the getDevServer is a default export
46+
// https://github.com/facebook/react-native/commit/e5818d92a867dbfa5f60d176b847b1f2131cb6da
47+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
48+
return getDevServer.default();
49+
}
50+
51+
// react-native 0.78 and below
2252
return getDevServer();
2353
},
2454
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export const SDK_PACKAGE_NAME = 'npm:@sentry/react-native';
22
export const SDK_NAME = 'sentry.javascript.react-native';
3-
export const SDK_VERSION = '6.13.0';
3+
export const SDK_VERSION = '6.13.1';

‎performance-tests/TestAppPlain/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "TestAppPlain",
3-
"version": "6.13.0",
3+
"version": "6.13.1",
44
"private": true,
55
"scripts": {
66
"android": "react-native run-android",

‎performance-tests/TestAppSentry/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "TestAppSentry",
3-
"version": "6.13.0",
3+
"version": "6.13.1",
44
"private": true,
55
"scripts": {
66
"android": "react-native run-android",
77
"ios": "react-native run-ios",
88
"start": "react-native start"
99
},
1010
"dependencies": {
11-
"@sentry/react-native": "6.13.0",
11+
"@sentry/react-native": "6.13.1",
1212
"react": "18.1.0",
1313
"react-native": "0.70.15"
1414
},

‎samples/expo/app.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"jsEngine": "hermes",
66
"newArchEnabled": true,
77
"scheme": "sentry-expo-sample",
8-
"version": "6.13.0",
8+
"version": "6.13.1",
99
"orientation": "portrait",
1010
"icon": "./assets/icon.png",
1111
"userInterfaceStyle": "light",
@@ -20,15 +20,15 @@
2020
"ios": {
2121
"supportsTablet": true,
2222
"bundleIdentifier": "io.sentry.expo.sample",
23-
"buildNumber": "45"
23+
"buildNumber": "46"
2424
},
2525
"android": {
2626
"adaptiveIcon": {
2727
"foregroundImage": "./assets/adaptive-icon.png",
2828
"backgroundColor": "#ffffff"
2929
},
3030
"package": "io.sentry.expo.sample",
31-
"versionCode": 45
31+
"versionCode": 46
3232
},
3333
"web": {
3434
"bundler": "metro",

‎samples/expo/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sentry-react-native-expo-sample",
3-
"version": "6.13.0",
3+
"version": "6.13.1",
44
"main": "expo-router/entry",
55
"scripts": {
66
"start": "expo start",
@@ -17,7 +17,7 @@
1717
"eas-build-pre-install": "npm i -g corepack && yarn install --no-immutable --inline-builds && yarn workspace @sentry/react-native build"
1818
},
1919
"dependencies": {
20-
"@sentry/react-native": "6.13.0",
20+
"@sentry/react-native": "6.13.1",
2121
"@types/react": "~19.0.10",
2222
"expo": "^53.0.0",
2323
"expo-constants": "~17.1.5",
@@ -39,7 +39,7 @@
3939
"devDependencies": {
4040
"@babel/core": "^7.26.0",
4141
"@babel/preset-env": "^7.26.0",
42-
"@sentry/babel-plugin-component-annotate": "3.3.1",
42+
"@sentry/babel-plugin-component-annotate": "3.4.0",
4343
"@types/node": "20.10.4",
4444
"sentry-react-native-samples-utils": "workspace:^"
4545
},

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sentry-react-native-macos-sample",
3-
"version": "6.13.0",
3+
"version": "6.13.1",
44
"private": true,
55
"scripts": {
66
"start": "react-native start --experimental-debugger",
@@ -18,7 +18,7 @@
1818
"@react-navigation/stack": "^6.3.20",
1919
"@sentry/core": "8.54.0",
2020
"@sentry/react": "8.54.0",
21-
"@sentry/react-native": "6.13.0",
21+
"@sentry/react-native": "6.13.1",
2222
"delay": "^6.0.0",
2323
"react": "18.2.0",
2424
"react-native": "0.73.9",

‎samples/react-native/android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ android {
136136
applicationId "io.sentry.reactnative.sample"
137137
minSdkVersion rootProject.ext.minSdkVersion
138138
targetSdkVersion rootProject.ext.targetSdkVersion
139-
versionCode 47
140-
versionName "6.13.0"
139+
versionCode 48
140+
versionName "6.13.1"
141141
}
142142

143143
signingConfigs {

‎samples/react-native/ios/sentryreactnativesample/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
<key>CFBundlePackageType</key>
2020
<string>APPL</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>6.13.0</string>
22+
<string>6.13.1</string>
2323
<key>CFBundleSignature</key>
2424
<string>????</string>
2525
<key>CFBundleVersion</key>
26-
<string>52</string>
26+
<string>53</string>
2727
<key>LSRequiresIPhoneOS</key>
2828
<true />
2929
<key>NSAppTransportSecurity</key>

‎samples/react-native/ios/sentryreactnativesampleTests/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>6.13.0</string>
18+
<string>6.13.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>52</string>
22+
<string>53</string>
2323
</dict>
2424
</plist>

‎samples/react-native/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sentry-react-native-sample",
3-
"version": "6.13.0",
3+
"version": "6.13.1",
44
"private": true,
55
"scripts": {
66
"postinstall": "patch-package",
@@ -28,7 +28,7 @@
2828
"@react-navigation/native-stack": "7.3.12",
2929
"@react-navigation/stack": "7.3.1",
3030
"@sentry/core": "8.54.0",
31-
"@sentry/react-native": "6.13.0",
31+
"@sentry/react-native": "6.13.1",
3232
"@shopify/flash-list": "1.8.0",
3333
"axios": "^1.8.3",
3434
"delay": "^6.0.0",
@@ -58,7 +58,7 @@
5858
"@react-native/eslint-config": "0.79.2",
5959
"@react-native/metro-config": "0.79.2",
6060
"@react-native/typescript-config": "0.79.2",
61-
"@sentry/babel-plugin-component-annotate": "3.3.1",
61+
"@sentry/babel-plugin-component-annotate": "3.4.0",
6262
"@types/jest": "^29.5.14",
6363
"@types/node": "^22.13.1",
6464
"@types/react": "^19.0.0",

0 commit comments

Comments
 (0)