xcode patches for pnpm

Author: lucas-zimerman

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

@@ -27,7 +27,29 @@ 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 "$SENTRY_CLI_EXECUTABLE" ] && SENTRY_CLI_EXECUTABLE="${SENTRY_CLI_PACKAGE_PATH}/bin/sentry-cli"
+[ -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
 
 [[ $SENTRY_INCLUDE_NATIVE_SOURCES == "true" ]] && INCLUDE_SOURCES_FLAG="--include-sources" || INCLUDE_SOURCES_FLAG=""
 

packages/core/scripts/sentry-xcode.sh

@@ -16,7 +16,27 @@ 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"
 
-[ -z "$SENTRY_CLI_EXECUTABLE" ] && SENTRY_CLI_PACKAGE_PATH=$("$LOCAL_NODE_BINARY" --print "require('path').dirname(require.resolve('@sentry/cli/package.json'))")
+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"
 
 REACT_NATIVE_XCODE=$1