Merge branch 'main' into feedback-ui-2

# Conflicts:
#	CHANGELOG.md

Author: antonis

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -51,16 +51,14 @@ body:
       label: 'How does your development environment look like?'
       description:
         'Output of the command `npx react-native@latest info` or manully describe your development environment?'
-      placeholder: |-
-        info Fetching system and libraries information...
-        OS: OS version
-        Node: Your version
-        Yarn: Yarn version
-        Expo SDK: Expo SDK version
-        react: React version
-        react-native: React Native version
-        hermesEnabled: bool
-        newArchEnabled: bool
+      value: |-
+        ````
+        ⬇  Place the `npx react-native@latest info` output here. ⬇ 
+        
+        
+        
+        
+        ````
 
   - type: textarea
     id: init
@@ -69,11 +67,13 @@ body:
     attributes:
       label: 'Sentry.init()'
       description: 'Code snipped of Sentry initialization from your application.'
-      placeholder: |-
+      value: |-
+        ````js
         Sentry.init({
           dsn: 'https://[email protected]/...'
           // other options
         });
+        ````
 
   - type: textarea
     id: repro

.github/workflows/codeql-analysis.yml

@@ -44,7 +44,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@5f8171a638ada777af81d42b55959a643bb29017 # [email protected].12
+        uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # [email protected].13
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@5f8171a638ada777af81d42b55959a643bb29017 # [email protected].12
+        uses: github/codeql-action/autobuild@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # [email protected].13
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
@@ -66,4 +66,4 @@ jobs:
       #   make bootstrap
       #   make release
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@5f8171a638ada777af81d42b55959a643bb29017 # [email protected].12
+        uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # [email protected].13

.github/workflows/e2e.yml

@@ -151,8 +151,8 @@ jobs:
   react-native-build:
     name: Build RN ${{ matrix.rn-version }} ${{ matrix.rn-architecture }} ${{ matrix.engine }} ${{ matrix.platform }} ${{ matrix.build-type }} ${{ matrix.ios-use-frameworks }}
     runs-on: ${{ matrix.runs-on }}
-    needs: [diff_check]
-    if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
+    needs: [diff_check, auth_token_check]
+    if: ${{ needs.diff_check.outputs.skip_ci != 'true' && needs.auth_token_check.outputs.skip_ci != 'true' && !startsWith(github.ref, 'refs/heads/release/') }}
     env:
       RN_VERSION: ${{ matrix.rn-version }}
       RN_ENGINE: ${{ matrix.engine }}
@@ -387,7 +387,7 @@ jobs:
 
       - name: Run tests on Android
         if: ${{ matrix.platform == 'android' }}
-        uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d # pin@v2.33.0
+        uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed # pin@v2.34.0
         with:
           api-level: 30
           force-avd-creation: false

.github/workflows/native-tests.yml

@@ -88,7 +88,7 @@ jobs:
           sudo udevadm trigger --name-match=kvm
 
       - name: Run connected tests
-        uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d #pin@v2.33.0
+        uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed #pin@v2.34.0
         with:
           working-directory: packages/core/RNSentryAndroidTester
           api-level: 30

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@af35edadc00be37caa72ed9f3e6d5f7801bfdf09 # v1.11.7
+        uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

.github/workflows/sample-application.yml

@@ -301,7 +301,7 @@ jobs:
 
       - name: Run Android Tests on API ${{ env.ANDROID_API_LEVEL }}
         if: ${{ matrix.platform == 'android' }}
-        uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d # pin@v2.33.0
+        uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed # pin@v2.34.0
         with:
           api-level: ${{ env.ANDROID_API_LEVEL }}
           force-avd-creation: false

CHANGELOG.md

@@ -12,6 +12,19 @@
 
 - Adds the `FeedbackButton` component that shows the Feedback Widget ([#4378](https://github.com/getsentry/sentry-react-native/pull/4378))
 
+### Fixes
+
+- Avoid silent failure when JS bundle was not created due to Sentry Xcode scripts failure ([#4690](https://github.com/getsentry/sentry-react-native/pull/4690))
+
+### Dependencies
+
+- Bump Bundler Plugins from v3.2.2 to v3.3.1 ([#4693](https://github.com/getsentry/sentry-react-native/pull/4693), [#4707](https://github.com/getsentry/sentry-react-native/pull/4707), [#4720](https://github.com/getsentry/sentry-react-native/pull/4720), [#4721](https://github.com/getsentry/sentry-react-native/pull/4721))
+  - [changelog](https://github.com/getsentry/sentry-javascript-bundler-plugins/blob/main/CHANGELOG.md#331)
+  - [diff](https://github.com/getsentry/sentry-javascript-bundler-plugins/compare/3.2.2...3.3.1)
+- Bump CLI from v2.42.4 to v2.43.0 ([#4692](https://github.com/getsentry/sentry-react-native/pull/4692))
+  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2430)
+  - [diff](https://github.com/getsentry/sentry-cli/compare/2.42.4...2.43.0)
+
 ## 6.11.0-beta.0
 
 ### Features

package.json

@@ -30,7 +30,7 @@
   "devDependencies": {
     "@expo/swiftlint": "^0.57.1",
     "@naturalcycles/ktlint": "^1.13.0",
-    "@sentry/cli": "2.42.4",
+    "@sentry/cli": "2.43.0",
     "clang-format": "^1.8.0",
     "downlevel-dts": "^0.11.0",
     "google-java-format": "^1.4.0",

packages/core/package.json

@@ -65,9 +65,9 @@
     "react-native": ">=0.65.0"
   },
   "dependencies": {
-    "@sentry/babel-plugin-component-annotate": "3.2.2",
+    "@sentry/babel-plugin-component-annotate": "3.3.1",
     "@sentry/browser": "8.54.0",
-    "@sentry/cli": "2.42.4",
+    "@sentry/cli": "2.43.0",
     "@sentry/core": "8.54.0",
     "@sentry/react": "8.54.0",
     "@sentry/types": "8.54.0",
@@ -81,7 +81,7 @@
     "@sentry-internal/eslint-config-sdk": "8.54.0",
     "@sentry-internal/eslint-plugin-sdk": "8.54.0",
     "@sentry-internal/typescript": "8.54.0",
-    "@sentry/wizard": "4.5.0",
+    "@sentry/wizard": "4.6.0",
     "@testing-library/react-native": "^12.7.2",
     "@types/jest": "^29.5.13",
     "@types/node": "^20.9.3",

packages/core/scripts/sentry-xcode.sh

@@ -26,6 +26,8 @@ ARGS="$NO_AUTO_RELEASE $SENTRY_CLI_EXTRA_ARGS $SENTRY_CLI_RN_XCODE_EXTRA_ARGS"
 
 REACT_NATIVE_XCODE_WITH_SENTRY="\"$SENTRY_CLI_EXECUTABLE\" react-native xcode $ARGS \"$REACT_NATIVE_XCODE\""
 
+exitCode=0
+
 if [ "$SENTRY_DISABLE_AUTO_UPLOAD" != true ]; then
   # 'warning:' triggers a warning in Xcode, 'error:' triggers an error
   set +x +e # disable printing commands otherwise we might print `error:` by accident and allow continuing on error
@@ -35,6 +37,7 @@ if [ "$SENTRY_DISABLE_AUTO_UPLOAD" != true ]; then
   else
     echo "error: sentry-cli - To disable source maps auto upload, set SENTRY_DISABLE_AUTO_UPLOAD=true in your environment variables. Or to allow failing upload, set SENTRY_ALLOW_FAILURE=true"
     echo "error: sentry-cli - $SENTRY_XCODE_COMMAND_OUTPUT"
+    exitCode=1
   fi
   set -x -e # re-enable
 else
@@ -48,3 +51,5 @@ fi
 if [ -f "$SENTRY_COLLECT_MODULES" ]; then
   /bin/sh "$SENTRY_COLLECT_MODULES"
 fi
+
+exit $exitCode