Skip to content

Commit d79a975

Browse files
committed
Merge branch 'main' into v8
# Conflicts: # CHANGELOG.md # dev-packages/e2e-tests/package.json # packages/core/package.json # samples/expo/package.json # samples/react-native-macos/package.json # samples/react-native/package.json # yarn.lock
2 parents e92f7bf + 02a78e8 commit d79a975

File tree

12 files changed

+120
-92
lines changed

12 files changed

+120
-92
lines changed

.github/workflows/changelog-preview.yml

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

1515
jobs:
1616
changelog-preview:
17-
uses: getsentry/craft/.github/workflows/changelog-preview.yml@fd370d4d54bec9ff07f909d88a3c4aec6f0ba22b # V2
17+
uses: getsentry/craft/.github/workflows/changelog-preview.yml@beea4aba589c66381258cbd131c5551ae8245b82 # V2
1818
secrets: inherit

.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@19b2f06db2b6f5108140aeb04014ef02b648f789 # pin@v4.31.11
47+
uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # pin@v4.32.0
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@19b2f06db2b6f5108140aeb04014ef02b648f789 # pin@v4.31.11
58+
uses: github/codeql-action/autobuild@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # pin@v4.32.0
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@19b2f06db2b6f5108140aeb04014ef02b648f789 # pin@v4.31.11
69+
uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # pin@v4.32.0

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
cache-dependency-path: yarn.lock
4444

4545
- name: Prepare release
46-
uses: getsentry/craft@fd370d4d54bec9ff07f909d88a3c4aec6f0ba22b # v2
46+
uses: getsentry/craft@beea4aba589c66381258cbd131c5551ae8245b82 # v2
4747
env:
4848
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
4949
with:

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,9 @@ node_modules.bak
9595
# SwiftLint
9696
swiftlint/*
9797

98-
# Sample app
98+
# Environment variables
9999
samples/*/.env
100+
.env
100101

101102
# Local Claude Code settings that should not be committed
102103
.claude/settings.local.json

.vscode/tasks.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,25 @@
1313
"kind": "build",
1414
"isDefault": true
1515
}
16+
},
17+
{
18+
"label": "Claude",
19+
"type": "shell",
20+
"command": "CLAUDE_PATH=$(grep '^CLAUDE_PATH=' .env | cut -d '=' -f2 | tr -d '\"') && $CLAUDE_PATH",
21+
"icon": {
22+
"color": "terminal.ansiRed",
23+
"id": "robot"
24+
},
25+
"presentation": {
26+
"reveal": "always",
27+
"panel": "new",
28+
"focus": true
29+
},
30+
"group": {
31+
"kind": "none",
32+
"isDefault": true
33+
},
34+
"problemMatcher": []
1635
}
1736
]
1837
}

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@
66
> make sure you follow our [migration guide](https://docs.sentry.io/platforms/react-native/migration/) first.
77
<!-- prettier-ignore-end -->
88
9+
## Unreleased
10+
11+
### Dependencies
12+
13+
- Bump JavaScript SDK from v10.37.0 to v10.38.0 ([#5596](https://github.com/getsentry/sentry-react-native/pull/5596))
14+
- [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#10380)
15+
- [diff](https://github.com/getsentry/sentry-javascript/compare/10.37.0...10.38.0)
16+
917
## 8.0.0-alpha.0
1018

1119
### Upgrading from 7.x to 8.0

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.37.0",
16+
"@sentry/core": "10.38.0",
1717
"@sentry/react-native": "8.0.0-alpha.0",
1818
"@types/node": "^20.9.3",
1919
"@types/react": "^18.2.64",

packages/core/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,20 @@
6969
},
7070
"dependencies": {
7171
"@sentry/babel-plugin-component-annotate": "4.8.0",
72-
"@sentry/browser": "10.37.0",
72+
"@sentry/browser": "10.38.0",
7373
"@sentry/cli": "3.1.0",
74-
"@sentry/core": "10.37.0",
75-
"@sentry/react": "10.37.0",
76-
"@sentry/types": "10.37.0"
74+
"@sentry/core": "10.38.0",
75+
"@sentry/react": "10.38.0",
76+
"@sentry/types": "10.38.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.37.0",
84-
"@sentry-internal/eslint-plugin-sdk": "10.37.0",
85-
"@sentry-internal/typescript": "10.37.0",
83+
"@sentry-internal/eslint-config-sdk": "10.38.0",
84+
"@sentry-internal/eslint-plugin-sdk": "10.38.0",
85+
"@sentry-internal/typescript": "10.38.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: 1 addition & 1 deletion
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.37.0",
25+
"@sentry/core": "10.38.0",
2626
"@sentry/react-native": "8.0.0-alpha.0",
2727
"@types/react": "~19.0.10",
2828
"expo": "^53.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.37.0",
20-
"@sentry/react": "10.37.0",
19+
"@sentry/core": "10.38.0",
20+
"@sentry/react": "10.38.0",
2121
"@sentry/react-native": "8.0.0-alpha.0",
2222
"delay": "^6.0.0",
2323
"react": "18.2.0",

0 commit comments

Comments
 (0)