Revert "Fix SDK Build when using PnPM (#4977)"

This reverts commit 4f13db0.

Author: antonis

CHANGELOG.md

@@ -26,7 +26,6 @@
 
 ### Fixes
 
-- SDK now Builds when using PnPM ([#4977](https://github.com/getsentry/sentry-react-native/pull/4977))
 - Skip idle span creation when app is in background ([#4995](https://github.com/getsentry/sentry-react-native/pull/4995))
 
 ### Dependencies

packages/core/scripts/sentry-xcode-debug-files.sh

@@ -27,29 +27,7 @@ RN_PROJECT_ROOT="${PROJECT_DIR}/.."
 [ -z "$SENTRY_DOTENV_PATH" ] && export SENTRY_DOTENV_PATH="$RN_PROJECT_ROOT/.env.sentry-build-plugin"
 
 [ -z "$SENTRY_CLI_EXECUTABLE" ] && SENTRY_CLI_PACKAGE_PATH=$("$LOCAL_NODE_BINARY" --print "require('path').dirname(require.resolve('@sentry/cli/package.json'))")
-[ -z "$SOURCEMAP_FILE" ] && export SOURCEMAP_FILE="$DERIVED_FILE_DIR/main.jsbundle.map"
-
-if [ -z "$SENTRY_CLI_EXECUTABLE" ]; then
-  # Try standard resolution safely
-  RESOLVED_PATH=$(
-    "$LOCAL_NODE_BINARY" --print "require('path').dirname(require.resolve('@sentry/cli/package.json'))" 2>/dev/null
-  ) || true
-  if [ -n "$RESOLVED_PATH" ]; then
-    SENTRY_CLI_PACKAGE_PATH="$RESOLVED_PATH"
-  else
-    # Fallback: parse NODE_PATH from the .bin/sentry-cli shim (file generated by PNPM)
-    PNPM_BIN_PATH="$PWD/../node_modules/@sentry/react-native/node_modules/.bin/sentry-cli"
-
-    if [ -f "$PNPM_BIN_PATH" ]; then
-      CLI_FILE_TEXT=$(cat "$PNPM_BIN_PATH")
-
-      # Filter where PNPM stored Sentry CLI
-      NODE_PATH_LINE=$(echo "$CLI_FILE_TEXT" | grep -oE 'NODE_PATH="[^"]+"' | head -n1)
-      NODE_PATH_VALUE=$(echo "$NODE_PATH_LINE" | sed -E 's/^NODE_PATH="([^"]+)".*/\1/')
-      SENTRY_CLI_PACKAGE_PATH=${NODE_PATH_VALUE%%/bin*}
-    fi
-  fi
-fi
+[ -z "$SENTRY_CLI_EXECUTABLE" ] && SENTRY_CLI_EXECUTABLE="${SENTRY_CLI_PACKAGE_PATH}/bin/sentry-cli"
 
 [[ $SENTRY_INCLUDE_NATIVE_SOURCES == "true" ]] && INCLUDE_SOURCES_FLAG="--include-sources" || INCLUDE_SOURCES_FLAG=""
 

packages/core/scripts/sentry-xcode.sh

@@ -16,27 +16,7 @@ RN_PROJECT_ROOT="${PROJECT_DIR}/.."
 [ -z "$SENTRY_DOTENV_PATH" ] && export SENTRY_DOTENV_PATH="$RN_PROJECT_ROOT/.env.sentry-build-plugin"
 [ -z "$SOURCEMAP_FILE" ] && export SOURCEMAP_FILE="$DERIVED_FILE_DIR/main.jsbundle.map"
 
-if [ -z "$SENTRY_CLI_EXECUTABLE" ]; then
-  # Try standard resolution safely
-  RESOLVED_PATH=$(
-    "$LOCAL_NODE_BINARY" --print "require('path').dirname(require.resolve('@sentry/cli/package.json'))" 2>/dev/null
-  ) || true
-  if [ -n "$RESOLVED_PATH" ]; then
-    SENTRY_CLI_PACKAGE_PATH="$RESOLVED_PATH"
-  else
-    # Fallback: parse NODE_PATH from the .bin/sentry-cli shim (file generated by PNPM)
-    PNPM_BIN_PATH="$PWD/../node_modules/@sentry/react-native/node_modules/.bin/sentry-cli"
-
-    if [ -f "$PNPM_BIN_PATH" ]; then
-      CLI_FILE_TEXT=$(cat "$PNPM_BIN_PATH")
-
-      # Filter where PNPM stored Sentry CLI
-      NODE_PATH_LINE=$(echo "$CLI_FILE_TEXT" | grep -oE 'NODE_PATH="[^"]+"' | head -n1)
-      NODE_PATH_VALUE=$(echo "$NODE_PATH_LINE" | sed -E 's/^NODE_PATH="([^"]+)".*/\1/')
-      SENTRY_CLI_PACKAGE_PATH=${NODE_PATH_VALUE%%/bin*}
-    fi
-  fi
-fi
+[ -z "$SENTRY_CLI_EXECUTABLE" ] && SENTRY_CLI_PACKAGE_PATH=$("$LOCAL_NODE_BINARY" --print "require('path').dirname(require.resolve('@sentry/cli/package.json'))")
 [ -z "$SENTRY_CLI_EXECUTABLE" ] && SENTRY_CLI_EXECUTABLE="${SENTRY_CLI_PACKAGE_PATH}/bin/sentry-cli"
 
 REACT_NATIVE_XCODE=$1

packages/core/sentry.gradle

@@ -167,7 +167,11 @@ project.afterEvaluate {
                           project.logger.info("file not found '$propertiesFile' for '$variant'")
                       }
 
-                      def cliPackage = resolveSentryCliPackagePath(reactRoot)
+                      def resolvedCliPackage = null
+                      try {
+                          resolvedCliPackage = new File(["node", "--print", "require.resolve('@sentry/cli/package.json')"].execute(null, rootDir).text.trim()).getParentFile();
+                      } catch (Throwable ignored) {}
+                      def cliPackage = resolvedCliPackage != null && resolvedCliPackage.exists() ? resolvedCliPackage.getAbsolutePath() : "$reactRoot/node_modules/@sentry/cli"
                       def cliExecutable = sentryProps.get("cli.executable", "$cliPackage/bin/sentry-cli")
 
                       // fix path separator for Windows
@@ -302,32 +306,6 @@ def resolveSentryReactNativeSDKPath(reactRoot) {
     return sentryPackage
 }
 
-def resolveSentryCliPackagePath(reactRoot) {
-    def resolvedCliPath = null
-    try {
-        def file = new File(["node", "--print", "require.resolve('@sentry/cli/package.json')"].execute(null, rootDir))
-        resolvedCliPath = file.text.trim().getParentFile();
-    } catch (Throwable ignored) { // Check if it's located in .pnpm
-        try {
-            def pnpmRefPath = reactRoot.toString() + "/node_modules/@sentry/react-native/node_modules/.bin/sentry-cli"
-            def sentryCliFile = new File(pnpmRefPath)
-
-            if (sentryCliFile.exists()) {
-                def cliFileText = sentryCliFile.text
-                def matcher = cliFileText =~ /NODE_PATH="([^"]*?)@sentry\/cli\//
-
-                if (matcher.find()) {
-                    def match = matcher.group(1)
-                    resolvedCliPath = new File(match + "@sentry/cli")
-                }
-            }
-        } catch (Throwable ignored2) {} // if the resolve fails we fallback to the default path
-    }
-
-    def cliPackage = resolvedCliPath != null && resolvedCliPath.exists() ? resolvedCliPath.getAbsolutePath() : "$reactRoot/node_modules/@sentry/cli"
-    return cliPackage
-}
-
 /** Compose lookup map of build variants - to - outputs. */
 def extractReleasesInfo() {
     def releases = [:]