Merge branch 'deps/scripts/update-cocoa.sh' into antonis/remove_cocoa_flags

antonis · web-flow · commit eed4e18891e1 · 2025-08-13T11:39:18.000+03:00
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-*       @antonis @lucas-zimerman
+*       @alwx @antonis @lucas-zimerman
diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
@@ -1,7 +1,6 @@
 name: '🐞 Bug Report'
 description: "Tell us about something that's not working the way we (probably) intend."
-labels: ['Platform: React-Native', 'Type: 🪲 Bug']
-type: Bug
+labels: ['React-Native', 'Bug']
 body:
   - type: dropdown
     id: environment
@@ -53,11 +52,11 @@ body:
         'Output of the command `npx react-native@latest info` or manully describe your development environment?'
       value: |-
         ````
-        ⬇  Place the `npx react-native@latest info` output here. ⬇ 
-        
-        
-        
-        
+        ⬇  Place the `npx react-native@latest info` output here. ⬇
+
+
+
+
         ````
 
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
@@ -1,7 +1,6 @@
 name: 💡 Feature Request
 description: Tell us about a problem our SDK could solve but doesn't.
-labels: ['Platform: React-Native', 'enhancement']
-type: Feature
+labels: ['React-Native', 'Feature']
 body:
   - type: textarea
     id: problem
diff --git a/.github/ISSUE_TEMPLATE/maintainer-blank.yml b/.github/ISSUE_TEMPLATE/maintainer-blank.yml
@@ -1,6 +1,6 @@
 name: Blank Issue
 description: Blank Issue. Reserved for maintainers.
-labels: ["Platform: React-Native"]
+labels: ['React-Native']
 body:
   - type: textarea
     id: description
diff --git a/.github/workflows/add-platform-label.yml b/.github/workflows/add-platform-label.yml
@@ -13,5 +13,5 @@ jobs:
     steps:
       - uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 # pin@1.0.4
         with:
-          add-labels: 'Platform: React-Native'
+          add-labels: 'React-Native'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml
@@ -134,12 +134,12 @@ jobs:
       - name: Install Dependencies
         run: yarn install
       - name: Download dist
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: dist
           path: packages/core/dist
       - name: Download ts3.8
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: ts3.8
           path: packages/core/ts3.8
@@ -164,12 +164,12 @@ jobs:
       - name: Install Dependencies
         run: yarn install
       - name: Download dist
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: dist
           path: packages/core/dist
       - name: Download Expo Plugin
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: expo-plugin
           path: packages/core/plugin/build
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -44,7 +44,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8 # pin@v3.29.4
+        uses: github/codeql-action/init@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # pin@v3.29.5
         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@4e828ff8d448a8a6e532957b1811f387a63867e8 # pin@v3.29.4
+        uses: github/codeql-action/autobuild@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # pin@v3.29.5
 
       # ℹ️ 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@4e828ff8d448a8a6e532957b1811f387a63867e8 # pin@v3.29.4
+        uses: github/codeql-action/analyze@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # pin@v3.29.5
diff --git a/.github/workflows/e2e-v2.yml b/.github/workflows/e2e-v2.yml
@@ -347,7 +347,7 @@ jobs:
 
       - name: Download App Package
         if: matrix.build-type == 'production'
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: ${{ matrix.rn-version }}-${{ matrix.rn-architecture }}-${{ matrix.engine }}-${{ matrix.platform }}-${{ matrix.build-type }}-${{ matrix.ios-use-frameworks }}-app-package
           path: dev-packages/e2e-tests
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+        uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
diff --git a/.github/workflows/sample-application.yml b/.github/workflows/sample-application.yml
@@ -238,14 +238,14 @@ jobs:
 
       - name: Download iOS App Archive
         if: ${{ matrix.platform == 'ios' }}
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: sample-rn-${{ matrix.rn-architecture }}-${{ matrix.build-type }}-${{ matrix.ios-use-frameworks}}-${{ matrix.platform }}
           path: ${{ env.REACT_NATIVE_SAMPLE_PATH }}
 
       - name: Download Android APK
         if: ${{ matrix.platform == 'android' }}
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: sample-rn-${{ matrix.rn-architecture }}-${{ matrix.build-type }}-${{ matrix.platform }}
           path: ${{ env.REACT_NATIVE_SAMPLE_PATH }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,10 +10,22 @@
 
 ### Features
 
+- Support for React Native 0.81 ([#5051](https://github.com/getsentry/sentry-react-native/pull/5051))
+- Support New Hermes Runtime Access Pattern ([#5051](https://github.com/getsentry/sentry-react-native/pull/5051))
 - Support Metro 0.83 ([#5035](https://github.com/getsentry/sentry-react-native/pull/5035))
 
+### Fixes
+
+- Correct detection of whether turbo modules are available ([#5064](https://github.com/getsentry/sentry-react-native/pull/5064))
+
 ### Dependencies
 
+- Bump CLI from v2.50.2 to v2.51.1 ([#5053](https://github.com/getsentry/sentry-react-native/pull/5053), [#5058](https://github.com/getsentry/sentry-react-native/pull/5058))
+  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2511)
+  - [diff](https://github.com/getsentry/sentry-cli/compare/2.50.2...2.51.1)
+- Bump Bundler Plugins from v4.0.2 to v4.1.0 ([#5062](https://github.com/getsentry/sentry-react-native/pull/5062))
+  - [changelog](https://github.com/getsentry/sentry-javascript-bundler-plugins/blob/main/CHANGELOG.md#410)
+  - [diff](https://github.com/getsentry/sentry-javascript-bundler-plugins/compare/4.0.2...4.1.0)
 - Bump Cocoa SDK from v8.53.2 to v8.54.0 ([#5036](https://github.com/getsentry/sentry-react-native/pull/5036))
   - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8540)
   - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.53.2...8.54.0)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -10,25 +10,21 @@ This repository contains mono repository structure with multiple React Native an
 - /dev-packages -> dev packages, ts-3.8 test runner, e2e tests components and runner
 - /performance-tests -> applications used for measuring performance in CI
 
-# Requirements
+# Setting up an Environment
 
-- nodejs 18 (with corepack globally installed)
-- yarn version specified in `package.json` (at the moment version 3.6)
+We use [Volta](https://volta.sh/) to ensure we use consistent versions of node and yarn.
 
-## Building
+`sentry-react-native` is a monorepo containing several packages, and we use `lerna` to manage them. To get started,
+install all dependencies, and then perform an initial build, so TypeScript can read all of the linked type definitions.
 
-Install dependencies using:
-
-```sh
-yarn
+```
+$ yarn
+$ yarn build
 ```
 
-Once deps are installed, you can build the project:
-
-```sh
-yarn build
+With that, the repo is fully set up and you are ready to run all commands.
 
-# Or in watch mode, for development of the SDK core
+# Watch mode, for development of the SDK core
 
 cd packages/core
 yarn build:sdk:watch
@@ -46,6 +42,14 @@ yarn test:watch
 
 ## Running the sample
 
+First, set up the Sentry CLI token.
+A recommended approach is to create a file named `.env.sentry-build-plugin` in the root folder of each sample and add:
+```sh
+SENTRY_AUTH_TOKEN=...
+```
+
+To obtain the correct token, log in to Sentry.io, then visit: `https://docs.sentry.io/cli/configuration/#to-authenticate-manually` From there, generate a token following the documentation.
+
 Now we can go into the sample project, install and build it:
 
 ```sh
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
   "devDependencies": {
     "@expo/swiftlint": "^0.57.1",
     "@naturalcycles/ktlint": "^1.13.0",
-    "@sentry/cli": "2.50.2",
+    "@sentry/cli": "2.51.1",
     "clang-format": "^1.8.0",
     "downlevel-dts": "^0.11.0",
     "google-java-format": "^1.4.0",
@@ -56,6 +56,10 @@
     "Appium has a dependency on @xmldom/xmldom@^0.x, which causes chromedrive build to fail yarn install",
     "See: https://github.com/appium/appium-chromedriver/pull/424"
   ],
+  "volta": {
+    "node": "18.20.8",
+    "yarn": "3.6.4"
+  },
   "resolutions": {
     "appium-chromedriver@npm:5.6.73/@xmldom/xmldom": "0.8.10",
     "form-data": "4.0.4"
diff --git a/packages/core/RNSentry.podspec b/packages/core/RNSentry.podspec
@@ -6,6 +6,7 @@ rn_package = parse_rn_package_json()
 rn_version = get_rn_version(rn_package)
 is_hermes_default = is_hermes_default(rn_version)
 is_profiling_supported = is_profiling_supported(rn_version)
+is_new_hermes_runtime = is_new_hermes_runtime(rn_version)
 
 # Use different Folly configuration for RN 0.80.0+
 if should_use_folly_flags(rn_version)
@@ -21,7 +22,8 @@ is_new_arch_enabled = ENV["RCT_NEW_ARCH_ENABLED"] == "1"
 is_using_hermes = (ENV['USE_HERMES'] == nil && is_hermes_default) || ENV['USE_HERMES'] == '1'
 new_arch_enabled_flag = (is_new_arch_enabled ? folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED" : "")
 sentry_profiling_supported_flag = (is_profiling_supported ? " -DSENTRY_PROFILING_SUPPORTED=1" : "")
-other_cflags = "$(inherited)" + new_arch_enabled_flag + sentry_profiling_supported_flag
+new_hermes_runtime_flag = (is_new_hermes_runtime ? " -DNEW_HERMES_RUNTIME" : "")
+other_cflags = "$(inherited)" + new_arch_enabled_flag + sentry_profiling_supported_flag + new_hermes_runtime_flag
 
 Pod::Spec.new do |s|
   s.name           = 'RNSentry'
diff --git a/packages/core/ios/RNSentry.mm b/packages/core/ios/RNSentry.mm
@@ -817,7 +817,15 @@ + (SentryUser *_Nullable)userFrom:(NSDictionary *)userKeys
 {
 #if SENTRY_PROFILING_ENABLED
     try {
+#    ifdef NEW_HERMES_RUNTIME
+        auto *hermesAPI = facebook::jsi::castInterface<facebook::hermes::IHermesRootAPI>(
+            facebook::hermes::makeHermesRootAPI());
+        if (hermesAPI) {
+            hermesAPI->enableSamplingProfiler();
+        }
+#    else
         facebook::hermes::HermesRuntime::enableSamplingProfiler();
+#    endif
         if (nativeProfileTraceId == nil && nativeProfileStartTime == 0 && platformProfilers) {
 #    if SENTRY_TARGET_PROFILING_SUPPORTED
             nativeProfileTraceId = [RNSentryId newId];
@@ -877,10 +885,19 @@ + (SentryUser *_Nullable)userFrom:(NSDictionary *)userKeys
         nativeProfileTraceId = nil;
         nativeProfileStartTime = 0;
 
-        facebook::hermes::HermesRuntime::disableSamplingProfiler();
         std::stringstream ss;
+#    ifdef NEW_HERMES_RUNTIME
+        auto *hermesAPI = facebook::jsi::castInterface<facebook::hermes::IHermesRootAPI>(
+            facebook::hermes::makeHermesRootAPI());
+        if (hermesAPI) {
+            hermesAPI->disableSamplingProfiler();
+            hermesAPI->dumpSampledTraceToStream(ss);
+        }
+#    else
+        facebook::hermes::HermesRuntime::disableSamplingProfiler();
         // Before RN 0.69 Hermes used llvh::raw_ostream (profiling is supported for 0.69 and newer)
         facebook::hermes::HermesRuntime::dumpSampledTraceToStream(ss);
+#    endif
 
         std::string s = ss.str();
         NSString *data = [NSString stringWithCString:s.c_str()
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -30,7 +30,9 @@
     "clean:plugin": "expo-module clean plugin",
     "circularDepCheck": "madge --circular dist/js/index.js && madge --circular metro.js && madge --circular expo.js",
     "test": "yarn test:sdk && yarn test:tools",
-    "test:sdk": "npx jest",
+    "test:sdk": "sh -c 'if [ \"$CI\" = \"true\" ]; then yarn test:sdk-ci; else yarn test:sdk-local; fi'",
+    "test:sdk-ci": "npx jest",
+    "test:sdk-local": "jest --maxWorkers=8",
     "test:tools": "npx jest --config jest.config.tools.js",
     "test:watch": "npx jest --watch",
     "yalc:add:sentry-javascript": "yalc add @sentry/browser @sentry/core @sentry/react @sentry/types",
@@ -65,9 +67,9 @@
     "react-native": ">=0.65.0"
   },
   "dependencies": {
-    "@sentry/babel-plugin-component-annotate": "4.0.2",
+    "@sentry/babel-plugin-component-annotate": "4.1.0",
     "@sentry/browser": "8.55.0",
-    "@sentry/cli": "2.50.2",
+    "@sentry/cli": "2.51.1",
     "@sentry/core": "8.55.0",
     "@sentry/react": "8.55.0",
     "@sentry/types": "8.55.0",
@@ -81,7 +83,7 @@
     "@sentry-internal/eslint-config-sdk": "8.55.0",
     "@sentry-internal/eslint-plugin-sdk": "8.55.0",
     "@sentry-internal/typescript": "8.55.0",
-    "@sentry/wizard": "6.1.0",
+    "@sentry/wizard": "6.1.2",
     "@testing-library/react-native": "^12.7.2",
     "@types/jest": "^29.5.13",
     "@types/node": "^20.9.3",
diff --git a/packages/core/plugin/src/withSentryAndroidGradlePlugin.ts b/packages/core/plugin/src/withSentryAndroidGradlePlugin.ts
@@ -13,7 +13,7 @@ export interface SentryAndroidGradlePluginOptions {
   includeSourceContext?: boolean;
 }
 
-export const sentryAndroidGradlePluginVersion = '5.8.0';
+export const sentryAndroidGradlePluginVersion = '5.8.1';
 
 /**
  * Adds the Sentry Android Gradle Plugin to the project.
diff --git a/packages/core/scripts/expo-upload-sourcemaps.js b/packages/core/scripts/expo-upload-sourcemaps.js
@@ -234,7 +234,7 @@ if (numAssetsUploaded === totalAssets) {
   console.log('✅ Uploaded bundles and sourcemaps to Sentry successfully.');
 } else {
   console.warn(
-    `⚠️  Uploaded ${numAssetsUploaded} of ${totalAssets} bundles and sourcemaps. ${numAssetsUploaded === 0 ? 'Ensure you are running `expo export` with the `--dump-sourcemap` flag.' : ''
+    `⚠️  Uploaded ${numAssetsUploaded} of ${totalAssets} bundles and sourcemaps. ${numAssetsUploaded === 0 ? 'Ensure you are running `expo export` with the `--source-maps` flag.' : ''
     }`,
   );
 }
diff --git a/packages/core/scripts/sentry_utils.rb b/packages/core/scripts/sentry_utils.rb
@@ -36,3 +36,7 @@ def is_profiling_supported(rn_version)
 def should_use_folly_flags(rn_version)
   return (rn_version[:major] == 0 && rn_version[:minor] < 80)
 end
+
+def is_new_hermes_runtime(rn_version)
+  return (rn_version[:major] >= 1 || (rn_version[:major] == 0 && rn_version[:minor] >= 81))
+end
diff --git a/packages/core/src/js/utils/environment.ts b/packages/core/src/js/utils/environment.ts
@@ -11,7 +11,8 @@ export function isHermesEnabled(): boolean {
 
 /** Checks if the React Native TurboModules are enabled */
 export function isTurboModuleEnabled(): boolean {
-  return RN_GLOBAL_OBJ.__turboModuleProxy != null;
+  // Reference: https://github.com/facebook/react-native/blob/641a79dc5137b69a3c0813413b9fb82d0b9df783/packages/react-native/src/private/featureflags/ReactNativeFeatureFlagsBase.js#L110
+  return RN_GLOBAL_OBJ.RN$Bridgeless === true || RN_GLOBAL_OBJ.__turboModuleProxy != null;
 }
 
 /** Checks if the React Native Fabric renderer is running */
diff --git a/packages/core/src/js/utils/worldwide.ts b/packages/core/src/js/utils/worldwide.ts
@@ -20,6 +20,7 @@ export interface ReactNativeInternalGlobal extends InternalGlobal {
   };
   Promise: unknown;
   __turboModuleProxy: unknown;
+  RN$Bridgeless: unknown;
   nativeFabricUIManager: unknown;
   ErrorUtils?: ErrorUtils;
   expo?: ExpoGlobalObject;
diff --git a/samples/expo/package.json b/samples/expo/package.json
@@ -43,7 +43,7 @@
   "devDependencies": {
     "@babel/core": "^7.26.0",
     "@babel/preset-env": "^7.26.0",
-    "@sentry/babel-plugin-component-annotate": "4.0.2",
+    "@sentry/babel-plugin-component-annotate": "4.1.0",
     "@types/node": "20.10.4",
     "sentry-react-native-samples-utils": "workspace:^"
   },
diff --git a/samples/react-native/android/build.gradle b/samples/react-native/android/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         classpath("com.android.tools.build:gradle")
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
-        classpath("io.sentry:sentry-android-gradle-plugin:5.8.0")
+        classpath("io.sentry:sentry-android-gradle-plugin:5.8.1")
     }
 }
 
diff --git a/samples/react-native/package.json b/samples/react-native/package.json
@@ -55,7 +55,7 @@
     "@react-native/eslint-config": "0.77.1",
     "@react-native/metro-config": "0.77.1",
     "@react-native/typescript-config": "0.77.1",
-    "@sentry/babel-plugin-component-annotate": "4.0.2",
+    "@sentry/babel-plugin-component-annotate": "4.1.0",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.13.1",
     "@types/react": "^19.0.0",
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-* @antonis @lucas-zimerman`
	`1`	`+* @alwx @antonis @lucas-zimerman`