Merge branch 'v9' into v9-task/remove-old-user-feedback

getsentry · Feb 13, 2025 · 50d9b58 · 50d9b58
2 parents 44a1093 + 9766800
commit 50d9b58
Show file tree

Hide file tree

Showing 44 changed files with 71 additions and 604 deletions.
diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml
@@ -51,11 +51,6 @@ jobs:
 
       - run: dart doc --dry-run
 
-      - name: Run publish validation
-        run: |
-          dart pub get --directory ../scripts/publish_validation
-          dart run ../scripts/publish_validation/bin/publish_validation.dart --executable ${{ inputs.sdk }}
-
   package-analysis:
     # `axel-op/dart-package-analyzer` is using `flutter pub upgrade` instead of `get`,
     # which ignores pubspec.yaml `dependency_overrides`. Because of that, all `release/*` branches are failing,

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - Remove `options.autoAppStart` and `setAppStartEnd` ([#2680](https://github.com/getsentry/sentry-dart/pull/2680))
 - Add hint for transactions ([#2675](https://github.com/getsentry/sentry-dart/pull/2675))
   - `BeforeSendTransactionCallback` now has a `Hint` parameter
+- Remove `dart:html` usage in favour of `package:web` ([#2710](https://github.com/getsentry/sentry-dart/pull/2710))
 
 ### Enhancements
 

diff --git a/dart/example_web/pubspec.yaml b/dart/example_web/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
 dependencies:
   sentry:
     path: ../../dart/
-  web: ^0.5.1
+  web: ^1.1.0
 
 dev_dependencies:
   build_runner: ^2.4.2

diff --git a/dart/lib/src/dart_exception_type_identifier.dart b/dart/lib/src/dart_exception_type_identifier.dart
@@ -4,7 +4,6 @@ import 'package:http/http.dart' show ClientException;
 
 import '../sentry.dart';
 import 'dart_exception_type_identifier_io.dart'
-    if (dart.library.html) 'dart_exception_type_identifier_web.dart'
     if (dart.library.js_interop) 'dart_exception_type_identifier_web.dart';
 
 class DartExceptionTypeIdentifier implements ExceptionTypeIdentifier {

diff --git a/dart/lib/src/environment/environment_variables.dart b/dart/lib/src/environment/environment_variables.dart
@@ -1,6 +1,5 @@
 import '../platform_checker.dart';
 import '_io_environment_variables.dart'
-    if (dart.library.html) '_web_environment_variables.dart'
     if (dart.library.js_interop) '_web_environment_variables.dart' as env;
 
 /// Reads environment variables from the system.

diff --git a/dart/lib/src/event_processor/enricher/enricher_event_processor.dart b/dart/lib/src/event_processor/enricher/enricher_event_processor.dart
@@ -1,7 +1,6 @@
 import '../../event_processor.dart';
 import '../../sentry_options.dart';
 import 'io_enricher_event_processor.dart'
-    if (dart.library.html) 'html_enricher_event_processor.dart'
     if (dart.library.js_interop) 'web_enricher_event_processor.dart';
 
 abstract class EnricherEventProcessor implements EventProcessor {

diff --git a/dart/lib/src/event_processor/enricher/html_enricher_event_processor.dart b/dart/lib/src/event_processor/enricher/html_enricher_event_processor.dart
diff --git a/dart/lib/src/event_processor/enricher/web_enricher_event_processor.dart b/dart/lib/src/event_processor/enricher/web_enricher_event_processor.dart
@@ -1,5 +1,3 @@
-// We would lose compatibility with old dart versions by adding web to pubspec.
-// ignore: depend_on_referenced_packages
 import 'package:web/web.dart' as web show window, Window, Navigator;
 
 import '../../../sentry.dart';

diff --git a/dart/lib/src/event_processor/exception/exception_event_processor.dart b/dart/lib/src/event_processor/exception/exception_event_processor.dart
@@ -1,7 +1,6 @@
 import '../../event_processor.dart';
 import '../../sentry_options.dart';
 import 'io_exception_event_processor.dart'
-    if (dart.library.html) 'web_exception_event_processor.dart'
     if (dart.library.js_interop) 'web_exception_event_processor.dart';
 
 abstract class ExceptionEventProcessor implements EventProcessor {

diff --git a/dart/lib/src/origin.dart b/dart/lib/src/origin.dart
@@ -1,3 +1 @@
-export 'origin_io.dart'
-    if (dart.library.html) 'origin_html.dart'
-    if (dart.library.js_interop) 'origin_web.dart';
+export 'origin_io.dart' if (dart.library.js_interop) 'origin_web.dart';
diff --git a/dart/lib/src/origin_html.dart b/dart/lib/src/origin_html.dart
diff --git a/dart/lib/src/origin_web.dart b/dart/lib/src/origin_web.dart
@@ -1,5 +1,3 @@
-// We would lose compatibility with old dart versions by adding web to pubspec.
-// ignore: depend_on_referenced_packages
 import 'package:web/web.dart';
 
 /// request origin, used for browser stacktrace

diff --git a/dart/lib/src/platform/_html_platform.dart b/dart/lib/src/platform/_html_platform.dart
diff --git a/dart/lib/src/platform/_web_platform.dart b/dart/lib/src/platform/_web_platform.dart
@@ -1,5 +1,3 @@
-// We would lose compatibility with old dart versions by adding web to pubspec.
-// ignore: depend_on_referenced_packages
 import 'package:web/web.dart' as web;
 
 import 'platform.dart';

diff --git a/dart/lib/src/platform/platform.dart b/dart/lib/src/platform/platform.dart
@@ -1,8 +1,7 @@
 import 'dart:typed_data';
 
-import '_io_platform.dart'
-    if (dart.library.html) '_html_platform.dart'
-    if (dart.library.js_interop) '_web_platform.dart' as platform;
+import '_io_platform.dart' if (dart.library.js_interop) '_web_platform.dart'
+    as platform;
 
 const Platform instance = platform.instance;
 

diff --git a/dart/lib/src/utils/isolate_utils.dart b/dart/lib/src/utils/isolate_utils.dart
@@ -1,7 +1,6 @@
 import 'package:meta/meta.dart';
 
 import '_io_get_isolate_name.dart'
-    if (dart.library.html) '_web_get_isolate_name.dart'
     if (dart.library.js_interop) '_web_get_isolate_name.dart' as isolate_getter;
 
 @internal

diff --git a/dart/pubspec.yaml b/dart/pubspec.yaml
@@ -25,6 +25,7 @@ dependencies:
   stack_trace: ^1.10.0
   uuid: '>=3.0.0 <5.0.0'
   collection: ^1.16.0
+  web: ^1.1.0
 
 dev_dependencies:
   build_runner: ^2.3.0

diff --git a/dart/test/event_processor/enricher/web_enricher_test.dart b/dart/test/event_processor/enricher/web_enricher_test.dart
@@ -2,9 +2,7 @@
 library;
 
 import 'package:sentry/sentry.dart';
-import 'package:sentry/src/event_processor/enricher/html_enricher_event_processor.dart'
-    if (dart.library.html) 'package:sentry/src/event_processor/enricher/html_enricher_event_processor.dart'
-    if (dart.library.js_interop) 'package:sentry/src/event_processor/enricher/web_enricher_event_processor.dart';
+import 'package:sentry/src/event_processor/enricher/web_enricher_event_processor.dart';
 import 'package:test/test.dart';
 
 import '../../mocks.dart';

diff --git a/file/lib/src/sentry_file_extension.dart b/file/lib/src/sentry_file_extension.dart
@@ -1,8 +1,6 @@
 // ignore_for_file: invalid_use_of_internal_member
 
-import 'dart:io'
-    if (dart.library.html) 'dart:html'
-    if (dart.library.js_interop) 'dart:js_interop';
+import 'dart:io' if (dart.library.js_interop) 'dart:js_interop';
 
 import 'package:meta/meta.dart';
 import 'package:sentry/sentry.dart';
@@ -29,9 +27,7 @@ extension SentryFileExtension on File {
   ///
   /// All the copy, create, delete, open, rename, read, and write operations are
   /// supported.
-  File sentryTrace({
-    @internal Hub? hub,
-  }) {
+  File sentryTrace({@internal Hub? hub}) {
     final _hub = hub ?? HubAdapter();
 
     if (_hub.options.platformChecker.isWeb ||

diff --git a/flutter/lib/src/event_processor/url_filter/html_url_filter_event_processor.dart b/flutter/lib/src/event_processor/url_filter/html_url_filter_event_processor.dart
diff --git a/flutter/lib/src/event_processor/url_filter/url_filter_event_processor.dart b/flutter/lib/src/event_processor/url_filter/url_filter_event_processor.dart
@@ -1,6 +1,5 @@
 import '../../../sentry_flutter.dart';
 import 'io_url_filter_event_processor.dart'
-    if (dart.library.html) 'html_url_filter_event_processor.dart'
     if (dart.library.js_interop) 'web_url_filter_event_processor.dart';
 
 abstract class UrlFilterEventProcessor implements EventProcessor {

diff --git a/flutter/lib/src/event_processor/url_filter/web_url_filter_event_processor.dart b/flutter/lib/src/event_processor/url_filter/web_url_filter_event_processor.dart
@@ -1,11 +1,9 @@
-// We would lose compatibility with old dart versions by adding web to pubspec.
-// ignore: depend_on_referenced_packages
+// ignore: implementation_imports
+import 'package:sentry/src/utils/regex_utils.dart';
 import 'package:web/web.dart' as web show window, Window;
 
 import '../../../sentry_flutter.dart';
 import 'url_filter_event_processor.dart';
-// ignore: implementation_imports
-import 'package:sentry/src/utils/regex_utils.dart';
 
 // ignore_for_file: invalid_use_of_internal_member
 

diff --git a/flutter/lib/src/integrations/connectivity/connectivity_provider.dart b/flutter/lib/src/integrations/connectivity/connectivity_provider.dart
@@ -1,5 +1,4 @@
 import 'noop_connectivity_provider.dart'
-    if (dart.library.html) 'html_connectivity_provider.dart'
     if (dart.library.js_interop) 'web_connectivity_provider.dart';
 
 abstract class ConnectivityProvider {