Skip to content

Commit 3b69a13

Browse files
alwxalwx
authored
Merge branch 'main' into alwx/imporvement/android-ui-profiling
2 parents d559e11 + c155be5 commit 3b69a13

10 files changed

Lines changed: 222 additions & 103 deletions

File tree

‎.claude/settings.json‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
{
2+
"permissions": {
3+
"allow": [
4+
"Bash(ls:*)",
5+
"Bash(pwd:*)",
6+
"Bash(file:*)",
7+
"Bash(stat:*)",
8+
"Bash(wc:*)",
9+
"Bash(head:*)",
10+
"Bash(tail:*)",
11+
"Bash(cat:*)",
12+
"Bash(tree:*)",
13+
"Bash(find:*)",
14+
"Bash(git status:*)",
15+
"Bash(git log:*)",
16+
"Bash(git diff:*)",
17+
"Bash(git show:*)",
18+
"Bash(git branch:*)",
19+
"Bash(git remote:*)",
20+
"Bash(git tag:*)",
21+
"Bash(git stash list:*)",
22+
"Bash(git rev-parse:*)",
23+
"Bash(git fetch:*)",
24+
"Bash(git ls-files:*)",
25+
"Bash(git blame:*)",
26+
"Bash(gh pr view:*)",
27+
"Bash(gh pr list:*)",
28+
"Bash(gh pr checks:*)",
29+
"Bash(gh pr diff:*)",
30+
"Bash(gh issue view:*)",
31+
"Bash(gh issue list:*)",
32+
"Bash(gh run view:*)",
33+
"Bash(gh run list:*)",
34+
"Bash(gh run logs:*)",
35+
"Bash(gh repo view:*)",
36+
"Bash(gh api:*)",
37+
"Bash(yarn --version:*)",
38+
"Bash(yarn install:*)",
39+
"Bash(yarn build:*)",
40+
"Bash(yarn test:*)",
41+
"Bash(yarn lint:*)",
42+
"Bash(yarn fix:*)",
43+
"Bash(npm --version:*)",
44+
"Bash(node --version:*)",
45+
"Bash(npx --version:*)",
46+
"Bash(npx expo prebuild)",
47+
"Bash(react-native --version:*)",
48+
"Bash(metro --version:*)",
49+
"Bash(jest --version:*)",
50+
"Bash(tsc --version:*)",
51+
"Bash(typescript --version:*)",
52+
"Bash(make --version:*)",
53+
"Bash(make -n:*)",
54+
"Bash(make help:*)",
55+
"Bash(xcodebuild -version:*)",
56+
"Bash(xcodebuild -showsdks:*)",
57+
"Bash(xcodebuild -list:*)",
58+
"Bash(xcrun --version:*)",
59+
"Bash(xcrun --find:*)",
60+
"Bash(xcrun --show-sdk-path:*)",
61+
"Bash(swift --version:*)",
62+
"Bash(swiftc --version:*)",
63+
"Bash(pod --version:*)",
64+
"Bash(pod list:*)",
65+
"Bash(pod search:*)",
66+
"Bash(ruby --version:*)",
67+
"Bash(bundle --version:*)",
68+
"Bash(bundle list:*)",
69+
"Bash(bundle info:*)",
70+
"Bash(bundle show:*)",
71+
"Bash(swiftlint version:*)",
72+
"Bash(python --version:*)",
73+
"Bash(python3 --version:*)",
74+
"Bash(clang-format --version:*)",
75+
"Bash(rbenv --version:*)",
76+
"Bash(rbenv versions:*)",
77+
"Bash(brew --version:*)",
78+
"Bash(brew list:*)",
79+
"Bash(brew info:*)",
80+
"Bash(fastlane --version:*)",
81+
"Bash(slather version:*)",
82+
"Bash(carthage version:*)",
83+
"Bash(./gradlew --version:*)",
84+
"Bash(./gradlew tasks:*)",
85+
"Bash(./gradlew assembleRelease)",
86+
"Bash(gradle --version:*)",
87+
"Bash(java -version:*)",
88+
"Bash(javac -version:*)",
89+
"Bash(kotlinc -version:*)",
90+
"Bash(ktlint --version:*)",
91+
"Bash(lerna --version:*)",
92+
"Bash(lerna list:*)",
93+
"Bash(lerna changed:*)",
94+
"Skill(sentry-skills:code-review)",
95+
"Skill(sentry-skills:find-bugs)",
96+
"Skill(sentry-skills:deslop)",
97+
"Skill(sentry-skills:iterate-pr)",
98+
"Skill(sentry-skills:claude-settings-audit)",
99+
"Skill(sentry-skills:agents-md)",
100+
"WebFetch(domain:docs.sentry.io)",
101+
"WebFetch(domain:develop.sentry.dev)",
102+
"WebFetch(domain:docs.github.com)",
103+
"WebFetch(domain:cli.github.com)",
104+
"WebFetch(domain:developer.apple.com)",
105+
"WebFetch(domain:swift.org)",
106+
"WebFetch(domain:cocoapods.org)",
107+
"WebFetch(domain:guides.cocoapods.org)",
108+
"WebFetch(domain:reactnative.dev)",
109+
"WebFetch(domain:expo.dev)",
110+
"WebFetch(domain:nodejs.org)",
111+
"WebFetch(domain:typescriptlang.org)"
112+
],
113+
"deny": []
114+
}
115+
}

‎.github/workflows/skip-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
if: steps.check-pr.outputs.is-pr == 'true'
4646
id: check_diff
4747
run: |
48-
skipList=(".github/CODEOWNERS" ".prettierignore" ".github/workflows/update-deps.yml" ".github/workflows/skip-ci.yml")
48+
skipList=(".github/CODEOWNERS" ".prettierignore" ".github/workflows/update-deps.yml" ".github/workflows/skip-ci.yml" ".claude/settings.json")
4949
skipRegList=("(.*/)?\.gitignore" "\.github/ISSUE_TEMPLATE.*")
5050
5151
for s in "${skipRegList[@]}"; do

‎CHANGELOG.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@
1818
- Bump Cocoa SDK from v8.57.3 to v8.58.0 ([#5524](https://github.com/getsentry/sentry-react-native/pull/5524))
1919
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8580)
2020
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.57.3...8.58.0)
21-
- Bump JavaScript SDK from v10.30.0 to v10.33.0 ([#5480](https://github.com/getsentry/sentry-react-native/pull/5480), [#5487](https://github.com/getsentry/sentry-react-native/pull/5487), [#5496](https://github.com/getsentry/sentry-react-native/pull/5496), [#5522](https://github.com/getsentry/sentry-react-native/pull/5522))
22-
- [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#10330)
23-
- [diff](https://github.com/getsentry/sentry-javascript/compare/10.30.0...10.33.0)
21+
- Bump JavaScript SDK from v10.30.0 to v10.34.0 ([#5480](https://github.com/getsentry/sentry-react-native/pull/5480), [#5487](https://github.com/getsentry/sentry-react-native/pull/5487), [#5496](https://github.com/getsentry/sentry-react-native/pull/5496), [#5522](https://github.com/getsentry/sentry-react-native/pull/5522), [#5535](https://github.com/getsentry/sentry-react-native/pull/5535))
22+
- [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#10340)
23+
- [diff](https://github.com/getsentry/sentry-javascript/compare/10.30.0...10.34.0)
24+
- Bump Bundler Plugins from v4.6.1 to v4.6.2 ([#5536](https://github.com/getsentry/sentry-react-native/pull/5536))
25+
- [changelog](https://github.com/getsentry/sentry-javascript-bundler-plugins/blob/main/CHANGELOG.md#462)
26+
- [diff](https://github.com/getsentry/sentry-javascript-bundler-plugins/compare/4.6.1...4.6.2)
2427

2528
## 7.8.0
2629

‎CLAUDE.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
AGENTS.md

‎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.33.0",
16+
"@sentry/core": "10.34.0",
1717
"@sentry/react-native": "7.8.0",
1818
"@types/node": "^20.9.3",
1919
"@types/react": "^18.2.64",

‎packages/core/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,21 +68,21 @@
6868
"react-native": ">=0.65.0"
6969
},
7070
"dependencies": {
71-
"@sentry/babel-plugin-component-annotate": "4.6.1",
72-
"@sentry/browser": "10.33.0",
71+
"@sentry/babel-plugin-component-annotate": "4.6.2",
72+
"@sentry/browser": "10.34.0",
7373
"@sentry/cli": "2.58.4",
74-
"@sentry/core": "10.33.0",
75-
"@sentry/react": "10.33.0",
76-
"@sentry/types": "10.33.0"
74+
"@sentry/core": "10.34.0",
75+
"@sentry/react": "10.34.0",
76+
"@sentry/types": "10.34.0"
7777
},
7878
"devDependencies": {
7979
"@babel/core": "^7.26.7",
8080
"@expo/metro-config": "~0.20.0",
8181
"@mswjs/interceptors": "^0.25.15",
8282
"@react-native/babel-preset": "0.80.0",
83-
"@sentry-internal/eslint-config-sdk": "10.33.0",
84-
"@sentry-internal/eslint-plugin-sdk": "10.33.0",
85-
"@sentry-internal/typescript": "10.33.0",
83+
"@sentry-internal/eslint-config-sdk": "10.34.0",
84+
"@sentry-internal/eslint-plugin-sdk": "10.34.0",
85+
"@sentry-internal/typescript": "10.34.0",
8686
"@sentry/wizard": "6.11.0",
8787
"@testing-library/react-native": "^13.2.2",
8888
"@types/jest": "^29.5.13",

‎samples/expo/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"eas-build-development-android": "eas build --profile development --platform android"
2323
},
2424
"dependencies": {
25-
"@sentry/core": "10.33.0",
25+
"@sentry/core": "10.34.0",
2626
"@sentry/react-native": "7.8.0",
2727
"@types/react": "~19.0.10",
2828
"expo": "^53.0.0",
@@ -47,7 +47,7 @@
4747
"@babel/core": "^7.26.0",
4848
"@babel/preset-env": "^7.26.0",
4949
"@react-native/eslint-config": "0.79.1",
50-
"@sentry/babel-plugin-component-annotate": "4.6.1",
50+
"@sentry/babel-plugin-component-annotate": "4.6.2",
5151
"@types/node": "20.10.4",
5252
"@typescript-eslint/eslint-plugin": "^8.50.0",
5353
"@typescript-eslint/parser": "^8.50.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.33.0",
20-
"@sentry/react": "10.33.0",
19+
"@sentry/core": "10.34.0",
20+
"@sentry/react": "10.34.0",
2121
"@sentry/react-native": "7.8.0",
2222
"delay": "^6.0.0",
2323
"react": "18.2.0",

‎samples/react-native/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
"@react-navigation/native-stack": "^7.3.24",
3030
"@react-navigation/stack": "^7.4.5",
3131
"@reduxjs/toolkit": "^2.8.2",
32-
"@sentry/core": "10.33.0",
33-
"@sentry/react": "10.33.0",
32+
"@sentry/core": "10.34.0",
33+
"@sentry/react": "10.34.0",
3434
"@sentry/react-native": "7.8.0",
3535
"@shopify/flash-list": "^2.0.2",
3636
"delay": "^6.0.0",
@@ -58,7 +58,7 @@
5858
"@react-native/eslint-config": "0.80.2",
5959
"@react-native/metro-config": "0.80.2",
6060
"@react-native/typescript-config": "0.80.2",
61-
"@sentry/babel-plugin-component-annotate": "4.6.1",
61+
"@sentry/babel-plugin-component-annotate": "4.6.2",
6262
"@testing-library/react-native": "^13.2.2",
6363
"@types/jest": "^29.5.14",
6464
"@types/node": "^22.13.1",

0 commit comments

Comments
 (0)