diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c8a8a0738..eb047c56a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ### Fixes +- Warnings when .env.sentry-build-plugin is not set on Sentry/CLI ([#5029](https://github.com/getsentry/sentry-react-native/pull/5029)) - Fix for `sentry-cli` path discovery not working on Android ([#5009](https://github.com/getsentry/sentry-react-native/pull/5009)) - Export `addIntegration` from `@sentry/core` ([#5020](https://github.com/getsentry/sentry-react-native/pull/5020)) diff --git a/packages/core/scripts/expo-upload-sourcemaps.js b/packages/core/scripts/expo-upload-sourcemaps.js index c282adeb3f..8c4680d196 100755 --- a/packages/core/scripts/expo-upload-sourcemaps.js +++ b/packages/core/scripts/expo-upload-sourcemaps.js @@ -129,7 +129,10 @@ try { console.warn(error); } -loadDotenv(path.join(projectRoot, '.env.sentry-build-plugin')); +const sentryBuildPluginPath = path.join(projectRoot, '.env.sentry-build-plugin'); +if (fs.existsSync(sentryBuildPluginPath)) { + loadDotenv(); +} let sentryOrg = getEnvVar(SENTRY_ORG); let sentryUrl = getEnvVar(SENTRY_URL); diff --git a/packages/core/scripts/sentry-xcode-debug-files.sh b/packages/core/scripts/sentry-xcode-debug-files.sh index 0aa43a5763..9ebf0ae2bc 100755 --- a/packages/core/scripts/sentry-xcode-debug-files.sh +++ b/packages/core/scripts/sentry-xcode-debug-files.sh @@ -24,7 +24,7 @@ LOCAL_NODE_BINARY=${NODE_BINARY:-node} RN_PROJECT_ROOT="${PROJECT_DIR}/.." [ -z "$SENTRY_PROPERTIES" ] && export SENTRY_PROPERTIES=sentry.properties -[ -z "$SENTRY_DOTENV_PATH" ] && export SENTRY_DOTENV_PATH="$RN_PROJECT_ROOT/.env.sentry-build-plugin" +[ -z "$SENTRY_DOTENV_PATH" ] && [ -f "$RN_PROJECT_ROOT/.env.sentry-build-plugin" ] && 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" diff --git a/packages/core/scripts/sentry-xcode.sh b/packages/core/scripts/sentry-xcode.sh index 3f96ea856a..d8d4734773 100755 --- a/packages/core/scripts/sentry-xcode.sh +++ b/packages/core/scripts/sentry-xcode.sh @@ -13,7 +13,7 @@ LOCAL_NODE_BINARY=${NODE_BINARY:-node} RN_PROJECT_ROOT="${PROJECT_DIR}/.." [ -z "$SENTRY_PROPERTIES" ] && export SENTRY_PROPERTIES=sentry.properties -[ -z "$SENTRY_DOTENV_PATH" ] && export SENTRY_DOTENV_PATH="$RN_PROJECT_ROOT/.env.sentry-build-plugin" +[ -z "$SENTRY_DOTENV_PATH" ] && [ -f "$RN_PROJECT_ROOT/.env.sentry-build-plugin" ] && 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 diff --git a/packages/core/sentry.gradle b/packages/core/sentry.gradle index a11837ce84..a461813e8f 100644 --- a/packages/core/sentry.gradle +++ b/packages/core/sentry.gradle @@ -201,7 +201,7 @@ project.afterEvaluate { project.logger.lifecycle("Sentry-CLI arguments: ${args}") def osCompatibility = Os.isFamily(Os.FAMILY_WINDOWS) ? ['cmd', '/c', 'node'] : [] - if (!System.getenv('SENTRY_DOTENV_PATH')) { + if (!System.getenv('SENTRY_DOTENV_PATH') && file("$reactRoot/.env.sentry-build-plugin").exists()) { environment('SENTRY_DOTENV_PATH', "$reactRoot/.env.sentry-build-plugin") } commandLine(*osCompatibility, *args)