Skip to content

Commit 284a1ed

Browse files
antonisantonis
authored
Merge branch 'deps/scripts/update-android.sh' into antonis/android-sdk-8
2 parents ea58c24 + 6d63629 commit 284a1ed

File tree

31 files changed

+1086
-458
lines changed

31 files changed

+1086
-458
lines changed

‎.github/workflows/update-deps.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,15 @@ jobs:
5656
secrets:
5757
api-token: ${{ secrets.CI_DEPLOY_KEY }}
5858

59+
bundler-plugins:
60+
uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
61+
with:
62+
path: scripts/update-bundler-plugins.sh
63+
name: Bundler Plugins
64+
pr-strategy: update
65+
secrets:
66+
api-token: ${{ secrets.CI_DEPLOY_KEY }}
67+
5968
sample-rn:
6069
uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
6170
with:

‎CHANGELOG.md‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,42 @@
1010

1111
### Dependencies
1212

13-
- Bump JavaScript SDK from v8.53.0 to v8.54.0 ([#4503](https://github.com/getsentry/sentry-react-native/pull/4503))
14-
- [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#8540)
15-
- [diff](https://github.com/getsentry/sentry-javascript/compare/8.53.0...8.54.0)
1613
- Bump Android SDK from v7.20.1 to v8.1.0 ([#4471](https://github.com/getsentry/sentry-react-native/pull/4471))
1714
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#810)
1815
- [diff](https://github.com/getsentry/sentry-java/compare/7.20.1...8.1.0)
1916

17+
## 6.7.0
18+
19+
### Features
20+
21+
- Add `ignoredComponents` option to `annotateReactComponents` to exclude specific components from React component annotations ([#4517](https://github.com/getsentry/sentry-react-native/pull/4517))
22+
23+
```js
24+
// metro.config.js
25+
// for React Native
26+
const config = withSentryConfig(mergedConfig, {
27+
annotateReactComponents: {
28+
ignoredComponents: ['MyCustomComponent']
29+
}
30+
});
31+
32+
// for Expo
33+
const config = getSentryExpoConfig(__dirname, {
34+
annotateReactComponents: {
35+
ignoredComponents: ['MyCustomComponent'],
36+
},
37+
});
38+
```
39+
40+
### Dependencies
41+
42+
- Bump JavaScript SDK from v8.53.0 to v8.54.0 ([#4503](https://github.com/getsentry/sentry-react-native/pull/4503))
43+
- [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#8540)
44+
- [diff](https://github.com/getsentry/sentry-javascript/compare/8.53.0...8.54.0)
45+
- Bump `@sentry/babel-plugin-component-annotate` from v2.20.1 to v3.1.2 ([#4516](https://github.com/getsentry/sentry-react-native/pull/4516))
46+
- [changelog](https://github.com/getsentry/sentry-javascript-bundler-plugins/blob/main/CHANGELOG.md#312)
47+
- [diff](https://github.com/getsentry/sentry-javascript-bundler-plugins/compare/2.20.1...3.1.2)
48+
2049
## 6.6.0
2150

2251
### Features

‎dev-packages/e2e-tests/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-e2e-tests",
3-
"version": "6.6.0",
3+
"version": "6.7.0",
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.6.0",
17+
"@sentry/react-native": "6.7.0",
1818
"@types/node": "^20.9.3",
1919
"@types/react": "^18.2.64",
2020
"appium": "2.4.1",
@@ -23,7 +23,7 @@
2323
"babel-jest": "^29.7.0",
2424
"jest": "^29.7.0",
2525
"react": "18.3.1",
26-
"react-native": "0.76.3",
26+
"react-native": "0.77.0",
2727
"react-native-launch-arguments": "^4.0.2",
2828
"typescript": "4.9.5",
2929
"webdriverio": "^8.27.0"

‎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.6.0",
4+
"version": "6.7.0",
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.6.0",
3+
"version": "6.7.0",
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.6.0",
3+
"version": "6.7.0",
44
"packages": [
55
"packages/*",
66
"dev-packages/*",

‎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.6.0";
5+
static final String REACT_NATIVE_SDK_PACKAGE_VERSION = "6.7.0";
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.6.0";
6+
NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"6.7.0";

‎packages/core/package.json‎

Lines changed: 6 additions & 6 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.6.0",
5+
"version": "6.7.0",
66
"description": "Official Sentry SDK for react-native",
77
"typings": "dist/js/index.d.ts",
88
"types": "dist/js/index.d.ts",
@@ -65,7 +65,7 @@
6565
"react-native": ">=0.65.0"
6666
},
6767
"dependencies": {
68-
"@sentry/babel-plugin-component-annotate": "2.20.1",
68+
"@sentry/babel-plugin-component-annotate": "3.1.2",
6969
"@sentry/browser": "8.54.0",
7070
"@sentry/cli": "2.41.1",
7171
"@sentry/core": "8.54.0",
@@ -77,21 +77,21 @@
7777
"@babel/core": "^7.25.2",
7878
"@expo/metro-config": "0.19.5",
7979
"@mswjs/interceptors": "^0.25.15",
80-
"@react-native/babel-preset": "0.76.3",
80+
"@react-native/babel-preset": "0.77.0",
8181
"@sentry-internal/eslint-config-sdk": "8.54.0",
8282
"@sentry-internal/eslint-plugin-sdk": "8.54.0",
8383
"@sentry-internal/typescript": "8.54.0",
8484
"@sentry/wizard": "3.40.0",
8585
"@testing-library/react-native": "^12.7.2",
86-
"@types/jest": "^29.5.3",
86+
"@types/jest": "^29.5.13",
8787
"@types/node": "^20.9.3",
8888
"@types/react": "^18.2.64",
8989
"@types/uglify-js": "^3.17.2",
9090
"@types/uuid": "^9.0.4",
9191
"@types/xmlhttprequest": "^1.8.2",
9292
"@typescript-eslint/eslint-plugin": "^5.48.0",
9393
"@typescript-eslint/parser": "^5.48.0",
94-
"babel-jest": "^29.6.2",
94+
"babel-jest": "^29.6.3",
9595
"babel-plugin-module-resolver": "^5.0.0",
9696
"babel-preset-fbjs": "^3.4.0",
9797
"downlevel-dts": "^0.11.0",
@@ -107,7 +107,7 @@
107107
"metro": "0.81.0",
108108
"prettier": "^2.0.5",
109109
"react": "18.3.1",
110-
"react-native": "0.76.3",
110+
"react-native": "0.77.0",
111111
"react-test-renderer": "^18.3.1",
112112
"rimraf": "^4.1.1",
113113
"ts-jest": "^29.1.1",

‎packages/core/src/js/tools/metroconfig.ts‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ import * as process from 'process';
55
import { env } from 'process';
66

77
import { enableLogger } from './enableLogger';
8-
import { setSentryDefaultBabelTransformerPathEnv } from './sentryBabelTransformerUtils';
8+
import {
9+
setSentryBabelTransformerOptions,
10+
setSentryDefaultBabelTransformerPathEnv,
11+
} from './sentryBabelTransformerUtils';
912
import { createSentryMetroSerializer, unstable_beforeAssetSerializationPlugin } from './sentryMetroSerializer';
1013
import type { DefaultConfigOptions } from './vendor/expo/expoconfig';
1114
export * from './sentryMetroSerializer';
@@ -18,7 +21,11 @@ export interface SentryMetroConfigOptions {
1821
* Annotates React components with Sentry data.
1922
* @default false
2023
*/
21-
annotateReactComponents?: boolean;
24+
annotateReactComponents?:
25+
| boolean
26+
| {
27+
ignoredComponents?: string[];
28+
};
2229
/**
2330
* Adds the Sentry replay package for web.
2431
* @default true
@@ -60,7 +67,7 @@ export function withSentryConfig(
6067
newConfig = withSentryDebugId(newConfig);
6168
newConfig = withSentryFramesCollapsed(newConfig);
6269
if (annotateReactComponents) {
63-
newConfig = withSentryBabelTransformer(newConfig);
70+
newConfig = withSentryBabelTransformer(newConfig, annotateReactComponents);
6471
}
6572
if (includeWebReplay === false) {
6673
newConfig = withSentryResolver(newConfig, includeWebReplay);
@@ -92,7 +99,7 @@ export function getSentryExpoConfig(
9299

93100
let newConfig = withSentryFramesCollapsed(config);
94101
if (options.annotateReactComponents) {
95-
newConfig = withSentryBabelTransformer(newConfig);
102+
newConfig = withSentryBabelTransformer(newConfig, options.annotateReactComponents);
96103
}
97104

98105
if (options.includeWebReplay === false) {
@@ -129,7 +136,10 @@ function loadExpoMetroConfigModule(): {
129136
/**
130137
* Adds Sentry Babel transformer to the Metro config.
131138
*/
132-
export function withSentryBabelTransformer(config: MetroConfig): MetroConfig {
139+
export function withSentryBabelTransformer(
140+
config: MetroConfig,
141+
annotateReactComponents: true | { ignoredComponents?: string[] },
142+
): MetroConfig {
133143
const defaultBabelTransformerPath = config.transformer && config.transformer.babelTransformerPath;
134144
logger.debug('Default Babel transformer path from `config.transformer`:', defaultBabelTransformerPath);
135145

@@ -146,6 +156,12 @@ export function withSentryBabelTransformer(config: MetroConfig): MetroConfig {
146156
setSentryDefaultBabelTransformerPathEnv(defaultBabelTransformerPath);
147157
}
148158

159+
if (typeof annotateReactComponents === 'object') {
160+
setSentryBabelTransformerOptions({
161+
annotateReactComponents,
162+
});
163+
}
164+
149165
return {
150166
...config,
151167
transformer: {

0 commit comments

Comments
 (0)