From 3abd6f325eb93d8b5c0b580fa5c71d7e96ae6a96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20Andra=C5=A1ec?= <denrase@gmail.com>
Date: Mon, 8 Jul 2024 12:55:23 +0000
Subject: [PATCH] Only upload `.dart` files with `upload-sourcemaps` when
 `upload_sources` is enabled (#247)

---
 CHANGELOG.md                |  7 +++++++
 lib/sentry_dart_plugin.dart | 19 +++++++++++--------
 test/plugin_test.dart       |  8 --------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d5b964..a1eebe6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- Only upload `.dart` files with `upload-sourcemaps` when `upload_sources` is enabled ([#247](https://github.com/getsentry/sentry-dart-plugin/pull/247))
+  - Enable `upload_sources` to opt in to Flutter web source context
+
 ## 2.1.0
 
 ### Features
diff --git a/lib/sentry_dart_plugin.dart b/lib/sentry_dart_plugin.dart
index b8da288..5b13a83 100644
--- a/lib/sentry_dart_plugin.dart
+++ b/lib/sentry_dart_plugin.dart
@@ -140,17 +140,20 @@ class SentryDartPlugin {
 
     await _executeAndLog('Failed to upload source maps', releaseJsFilesParams);
 
-    // upload source maps (dart)
-    List<String> releaseDartFilesParams = [];
-    releaseDartFilesParams.addAll(params);
 
-    _addExtensionToParams(['dart'], releaseDartFilesParams, release,
-        _configuration.buildFilesFolder);
+    if (_configuration.uploadSources) {
+      // upload source files (dart)
+      List<String> releaseDartFilesParams = [];
+      releaseDartFilesParams.addAll(params);
+
+      _addExtensionToParams(['dart'], releaseDartFilesParams, release,
+          _configuration.buildFilesFolder);
 
-    _addWait(releaseDartFilesParams);
+      _addWait(releaseDartFilesParams);
 
-    await _executeAndLog(
-        'Failed to upload source maps', releaseDartFilesParams);
+      await _executeAndLog(
+          'Failed to upload source files', releaseDartFilesParams);
+    }
 
     Log.taskCompleted(taskName);
   }
diff --git a/test/plugin_test.dart b/test/plugin_test.dart
index 8e485a0..81f56c3 100644
--- a/test/plugin_test.dart
+++ b/test/plugin_test.dart
@@ -194,7 +194,6 @@ void main() {
             expect(commandLog, [
               '$cli $args releases $orgAndProject new $release',
               '$cli $args releases $orgAndProject files $release upload-sourcemaps $buildDir/build/web --ext map --ext js',
-              '$cli $args releases $orgAndProject files $release upload-sourcemaps $buildDir --ext dart',
               '$cli $args releases $orgAndProject set-commits $release --auto',
               '$cli $args releases $orgAndProject finalize $release'
             ]);
@@ -215,7 +214,6 @@ void main() {
             expect(commandLog, [
               '$cli $args releases $orgAndProject new $configRelease',
               '$cli $args releases $orgAndProject files $configRelease upload-sourcemaps $buildDir/build/web --ext map --ext js',
-              '$cli $args releases $orgAndProject files $configRelease upload-sourcemaps $buildDir --ext dart',
               '$cli $args releases $orgAndProject set-commits $configRelease --auto',
               '$cli $args releases $orgAndProject finalize $configRelease'
             ]);
@@ -238,7 +236,6 @@ void main() {
             expect(commandLog, [
               '$cli $args releases $orgAndProject new $release',
               '$cli $args releases $orgAndProject files $release upload-sourcemaps $buildDir/build/web --ext map --ext js --dist $build',
-              '$cli $args releases $orgAndProject files $release upload-sourcemaps $buildDir --ext dart --dist $build',
               '$cli $args releases $orgAndProject set-commits $release --auto',
               '$cli $args releases $orgAndProject finalize $release'
             ]);
@@ -260,7 +257,6 @@ void main() {
             expect(commandLog, [
               '$cli $args releases $orgAndProject new $configRelease',
               '$cli $args releases $orgAndProject files $configRelease upload-sourcemaps $buildDir/build/web --ext map --ext js --dist $build',
-              '$cli $args releases $orgAndProject files $configRelease upload-sourcemaps $buildDir --ext dart --dist $build',
               '$cli $args releases $orgAndProject set-commits $configRelease --auto',
               '$cli $args releases $orgAndProject finalize $configRelease'
             ]);
@@ -282,7 +278,6 @@ void main() {
             expect(commandLog, [
               '$cli $args releases $orgAndProject new $release',
               '$cli $args releases $orgAndProject files $release upload-sourcemaps $buildDir/build/web --ext map --ext js --dist $configDist',
-              '$cli $args releases $orgAndProject files $release upload-sourcemaps $buildDir --ext dart --dist $configDist',
               '$cli $args releases $orgAndProject set-commits $release --auto',
               '$cli $args releases $orgAndProject finalize $release'
             ]);
@@ -307,7 +302,6 @@ void main() {
             expect(commandLog, [
               '$cli $args releases $orgAndProject new $release',
               '$cli $args releases $orgAndProject files $release upload-sourcemaps $buildDir/build/web --ext map --ext js --dist $configDist',
-              '$cli $args releases $orgAndProject files $release upload-sourcemaps $buildDir --ext dart --dist $configDist',
               '$cli $args releases $orgAndProject set-commits $release --auto',
               '$cli $args releases $orgAndProject finalize $release'
             ]);
@@ -330,7 +324,6 @@ void main() {
             expect(commandLog, [
               '$cli $args releases $orgAndProject new $configRelease',
               '$cli $args releases $orgAndProject files $configRelease upload-sourcemaps $buildDir/build/web --ext map --ext js --dist $configDist',
-              '$cli $args releases $orgAndProject files $configRelease upload-sourcemaps $buildDir --ext dart --dist $configDist',
               '$cli $args releases $orgAndProject set-commits $configRelease --auto',
               '$cli $args releases $orgAndProject finalize $configRelease'
             ]);
@@ -355,7 +348,6 @@ void main() {
             expect(commandLog, [
               '$cli $args releases $orgAndProject new $configRelease',
               '$cli $args releases $orgAndProject files $configRelease upload-sourcemaps $buildDir/build/web --ext map --ext js --dist $configDist',
-              '$cli $args releases $orgAndProject files $configRelease upload-sourcemaps $buildDir --ext dart --dist $configDist',
               '$cli $args releases $orgAndProject set-commits $configRelease --auto',
               '$cli $args releases $orgAndProject finalize $configRelease'
             ]);