Skip to content

fix: resolve sentry-cli relative to react-native package #6242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shawnthye-guru wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: resolve sentry-cli relative to react-native package #6242

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0cdfb2e
fix: resolve sentry cli from react native package
shawnthye-guru Jun 1, 2026
92d3ec5
fix: resolve sentry-cli for expo sourcemap uploader
shawnthye-guru Jun 1, 2026
dceaac2
chore: address sentry cli review comments
shawnthye-guru Jun 3, 2026
7faa992
fix: handle expo uploader cli resolution failures
shawnthye-guru Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/core/scripts/sentry-xcode-debug-files.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@ RN_PROJECT_ROOT="${SENTRY_PROJECT_ROOT:-${PROJECT_DIR}/..}"
[ -z "$SOURCEMAP_FILE" ] && export SOURCEMAP_FILE="$DERIVED_FILE_DIR/main.jsbundle.map"

if [ -z "$SENTRY_CLI_EXECUTABLE" ]; then
# Try standard resolution safely
# Resolve from @sentry/react-native so package managers with isolated dependencies
# can find the transitive @sentry/cli dependency.
RESOLVED_PATH=$(
"$LOCAL_NODE_BINARY" --print "require('path').dirname(require.resolve('@sentry/cli/package.json'))" 2>/dev/null
"$LOCAL_NODE_BINARY" --print "require('path').dirname(require.resolve('@sentry/cli/package.json', { paths: [require.resolve('@sentry/react-native/package.json')] }))" 2>/dev/null
) || true
if [ -n "$RESOLVED_PATH" ]; then
SENTRY_CLI_PACKAGE_PATH="$RESOLVED_PATH/bin/sentry-cli"
Expand Down
5 changes: 3 additions & 2 deletions packages/core/scripts/sentry-xcode.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ if [[ "$SOURCEMAP_FILE" != /* ]]; then
fi

if [ -z "$SENTRY_CLI_EXECUTABLE" ]; then
# Try standard resolution safely
# Resolve from @sentry/react-native so package managers with isolated dependencies
# can find the transitive @sentry/cli dependency.
RESOLVED_PATH=$(
"$LOCAL_NODE_BINARY" --print "require('path').dirname(require.resolve('@sentry/cli/package.json'))" 2>/dev/null
"$LOCAL_NODE_BINARY" --print "require('path').dirname(require.resolve('@sentry/cli/package.json', { paths: [require.resolve('@sentry/react-native/package.json')] }))" 2>/dev/null
) || true
if [ -n "$RESOLVED_PATH" ]; then
SENTRY_CLI_PACKAGE_PATH="$RESOLVED_PATH/bin/sentry-cli"
Expand Down
8 changes: 7 additions & 1 deletion packages/core/sentry.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,13 @@ fun resolveSentryCliPackagePath(reactRoot: File): String {
var resolvedCliPath: File? = null
try {
val process =
ProcessBuilder(listOf("node", "--print", "require.resolve('@sentry/cli/package.json')"))
ProcessBuilder(
listOf(
"node",
"--print",
"require.resolve('@sentry/cli/package.json', { paths: [require.resolve('@sentry/react-native/package.json')] })",
),
)
.directory(rootDir)
Comment on lines +176 to 177
Copy link
Copy Markdown
Contributor

@antonis antonis Jun 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for iterating on this @shawnthye-guru 🙇
This should fix the last lint issue 🤞

Suggested change
)
.directory(rootDir)
).directory(rootDir)

Other than that everything LGTM 🚀

.start()
val output =
Expand Down
35 changes: 35 additions & 0 deletions packages/core/test/scripts/sentry-cli-resolution.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import * as fs from 'fs';
import * as path from 'path';

const CORE_DIR = path.resolve(__dirname, '../..');
const EXPO_UPLOAD_SOURCEMAPS_DIR = path.resolve(CORE_DIR, '../expo-upload-sourcemaps');
const RELATIVE_SENTRY_CLI_RESOLVER =
"require.resolve('@sentry/cli/package.json', { paths: [require.resolve('@sentry/react-native/package.json')] })";
const RELATIVE_EXPO_UPLOAD_SOURCEMAPS_CLI_RESOLVER_PATH =
"paths: [require.resolve('@sentry/expo-upload-sourcemaps/package.json')]";

describe('sentry-cli resolution', () => {
it('resolves @sentry/cli relative to @sentry/react-native on Android', () => {
const gradleScript = fs.readFileSync(path.join(CORE_DIR, 'sentry.gradle.kts'), 'utf8');

expect(gradleScript).toContain(RELATIVE_SENTRY_CLI_RESOLVER);
});

it('resolves @sentry/cli relative to @sentry/react-native on iOS', () => {
const xcodeScript = fs.readFileSync(path.join(CORE_DIR, 'scripts', 'sentry-xcode.sh'), 'utf8');
const xcodeDebugFilesScript = fs.readFileSync(
path.join(CORE_DIR, 'scripts', 'sentry-xcode-debug-files.sh'),
'utf8',
);

expect(xcodeScript).toContain(RELATIVE_SENTRY_CLI_RESOLVER);
expect(xcodeDebugFilesScript).toContain(RELATIVE_SENTRY_CLI_RESOLVER);
});

it('resolves @sentry/cli relative to @sentry/expo-upload-sourcemaps in the Expo uploader', () => {
const expoUploadSourcemapsScript = fs.readFileSync(path.join(EXPO_UPLOAD_SOURCEMAPS_DIR, 'cli.js'), 'utf8');

expect(expoUploadSourcemapsScript).toContain("require.resolve('@sentry/cli/bin/sentry-cli'");
expect(expoUploadSourcemapsScript).toContain(RELATIVE_EXPO_UPLOAD_SOURCEMAPS_CLI_RESOLVER_PATH);
});
});
6 changes: 5 additions & 1 deletion packages/expo-upload-sourcemaps/cli.js
View file
Open in desktop
Comment thread
shawnthye-guru marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,11 @@ let sentryOrg = getEnvVar(SENTRY_ORG);
let sentryUrl = getEnvVar(SENTRY_URL);
let sentryProject = getEnvVar(SENTRY_PROJECT);
let authToken = getEnvVar(SENTRY_AUTH_TOKEN);
const sentryCliBin = getEnvVar(SENTRY_CLI_EXECUTABLE) || require.resolve('@sentry/cli/bin/sentry-cli');
const sentryCliBin =
getEnvVar(SENTRY_CLI_EXECUTABLE) ||
require.resolve('@sentry/cli/bin/sentry-cli', {
paths: [require.resolve('@sentry/expo-upload-sourcemaps/package.json')],
});
Comment thread
shawnthye-guru marked this conversation as resolved.
Outdated

if (!sentryOrg || !sentryProject || !sentryUrl) {
console.log('🐕 Fetching from expo config...');
Expand Down