Switch to conditional import that works with wasm (#6526)
diff --git a/packages/devtools_app/lib/src/extensions/embedded/controller.dart b/packages/devtools_app/lib/src/extensions/embedded/controller.dart index 25f15fa..d41d43e 100644 --- a/packages/devtools_app/lib/src/extensions/embedded/controller.dart +++ b/packages/devtools_app/lib/src/extensions/embedded/controller.dart
@@ -6,7 +6,8 @@ import 'package:devtools_extensions/api.dart'; import 'package:devtools_shared/devtools_extensions.dart'; -import '_controller_desktop.dart' if (dart.library.html) '_controller_web.dart'; +import '_controller_desktop.dart' + if (dart.library.js_interop) '_controller_web.dart'; EmbeddedExtensionControllerImpl createEmbeddedExtensionController( DevToolsExtensionConfig config,
diff --git a/packages/devtools_app/lib/src/extensions/embedded/view.dart b/packages/devtools_app/lib/src/extensions/embedded/view.dart index 537c416..eb25323 100644 --- a/packages/devtools_app/lib/src/extensions/embedded/view.dart +++ b/packages/devtools_app/lib/src/extensions/embedded/view.dart
@@ -6,8 +6,7 @@ import '../../shared/analytics/analytics.dart' as ga; import '../../shared/analytics/constants.dart' as gac; - -import '_view_desktop.dart' if (dart.library.html) '_view_web.dart'; +import '_view_desktop.dart' if (dart.library.js_interop) '_view_web.dart'; import 'controller.dart'; /// A widget that displays a DevTools extension in an embedded iFrame.
diff --git a/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/perfetto.dart b/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/perfetto.dart index ec1ccaf..c4e1580 100644 --- a/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/perfetto.dart +++ b/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/perfetto.dart
@@ -6,7 +6,8 @@ import '../../../../../shared/analytics/constants.dart' as gac; import '../../../../../shared/common_widgets.dart'; -import '_perfetto_desktop.dart' if (dart.library.html) '_perfetto_web.dart'; +import '_perfetto_desktop.dart' + if (dart.library.js_interop) '_perfetto_web.dart'; import 'perfetto_controller.dart'; class EmbeddedPerfetto extends StatelessWidget {
diff --git a/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/perfetto_controller.dart b/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/perfetto_controller.dart index 87e174f..f65fb88 100644 --- a/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/perfetto_controller.dart +++ b/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/perfetto_controller.dart
@@ -9,7 +9,7 @@ import '../../../performance_controller.dart'; import '../timeline_events_controller.dart'; import '_perfetto_controller_desktop.dart' - if (dart.library.html) '_perfetto_controller_web.dart'; + if (dart.library.js_interop) '_perfetto_controller_web.dart'; import 'perfetto_event_processor.dart'; PerfettoControllerImpl createPerfettoController(
diff --git a/packages/devtools_app/lib/src/shared/analytics/analytics.dart b/packages/devtools_app/lib/src/shared/analytics/analytics.dart index 2f0615e..bf08ab4 100644 --- a/packages/devtools_app/lib/src/shared/analytics/analytics.dart +++ b/packages/devtools_app/lib/src/shared/analytics/analytics.dart
@@ -2,4 +2,5 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -export '_analytics_stub.dart' if (dart.library.html) '_analytics_web.dart'; +export '_analytics_stub.dart' + if (dart.library.js_interop) '_analytics_web.dart';
diff --git a/packages/devtools_app/lib/src/shared/analytics/analytics_controller.dart b/packages/devtools_app/lib/src/shared/analytics/analytics_controller.dart index 230b5bc..b526829 100644 --- a/packages/devtools_app/lib/src/shared/analytics/analytics_controller.dart +++ b/packages/devtools_app/lib/src/shared/analytics/analytics_controller.dart
@@ -7,7 +7,7 @@ import 'package:flutter/foundation.dart'; import '_analytics_controller_stub.dart' - if (dart.library.html) '_analytics_controller_web.dart'; + if (dart.library.js_interop) '_analytics_controller_web.dart'; Future<AnalyticsController> get analyticsController async => await devToolsAnalyticsController;
diff --git a/packages/devtools_app/lib/src/shared/config_specific/drag_and_drop/drag_and_drop.dart b/packages/devtools_app/lib/src/shared/config_specific/drag_and_drop/drag_and_drop.dart index 3548bd1..ba2b45e 100644 --- a/packages/devtools_app/lib/src/shared/config_specific/drag_and_drop/drag_and_drop.dart +++ b/packages/devtools_app/lib/src/shared/config_specific/drag_and_drop/drag_and_drop.dart
@@ -7,7 +7,7 @@ import '../../primitives/utils.dart'; import '_drag_and_drop_stub.dart' - if (dart.library.html) '_drag_and_drop_web.dart' + if (dart.library.js_interop) '_drag_and_drop_web.dart' if (dart.library.io) '_drag_and_drop_desktop.dart'; abstract class DragAndDropManager {
diff --git a/packages/devtools_app/lib/src/shared/config_specific/file/file.dart b/packages/devtools_app/lib/src/shared/config_specific/file/file.dart index 61178ad..72e153e 100644 --- a/packages/devtools_app/lib/src/shared/config_specific/file/file.dart +++ b/packages/devtools_app/lib/src/shared/config_specific/file/file.dart
@@ -3,7 +3,7 @@ // found in the LICENSE file. import '_file_stub.dart' - if (dart.library.html) '_file_web.dart' + if (dart.library.js_interop) '_file_web.dart' if (dart.library.io) '_file_desktop.dart'; abstract class FileIO {
diff --git a/packages/devtools_app/lib/src/shared/config_specific/framework_initialize/framework_initialize.dart b/packages/devtools_app/lib/src/shared/config_specific/framework_initialize/framework_initialize.dart index 9b17bcc..d8a2d33 100644 --- a/packages/devtools_app/lib/src/shared/config_specific/framework_initialize/framework_initialize.dart +++ b/packages/devtools_app/lib/src/shared/config_specific/framework_initialize/framework_initialize.dart
@@ -4,7 +4,7 @@ import '../../../framework/framework_core.dart'; import '_framework_initialize_stub.dart' - if (dart.library.html) '_framework_initialize_web.dart' + if (dart.library.js_interop) '_framework_initialize_web.dart' if (dart.library.io) '_framework_initialize_desktop.dart'; Future<void> initializeFramework() async {
diff --git a/packages/devtools_app/lib/src/shared/config_specific/host_platform/host_platform.dart b/packages/devtools_app/lib/src/shared/config_specific/host_platform/host_platform.dart index 57c6246..fedcbef 100644 --- a/packages/devtools_app/lib/src/shared/config_specific/host_platform/host_platform.dart +++ b/packages/devtools_app/lib/src/shared/config_specific/host_platform/host_platform.dart
@@ -3,5 +3,5 @@ // in the LICENSE file. export 'host_platform_stub.dart' - if (dart.library.html) 'host_platform_web.dart' + if (dart.library.js_interop) 'host_platform_web.dart' if (dart.library.io) 'host_platform_desktop.dart';
diff --git a/packages/devtools_app/lib/src/shared/config_specific/import_export/import_export.dart b/packages/devtools_app/lib/src/shared/config_specific/import_export/import_export.dart index 4addf55..d8f8f0d 100644 --- a/packages/devtools_app/lib/src/shared/config_specific/import_export/import_export.dart +++ b/packages/devtools_app/lib/src/shared/config_specific/import_export/import_export.dart
@@ -20,7 +20,7 @@ import '../../primitives/utils.dart'; import '../../screen.dart'; import '_export_stub.dart' - if (dart.library.html) '_export_web.dart' + if (dart.library.js_interop) '_export_web.dart' if (dart.library.io) '_export_desktop.dart'; const nonDevToolsFileMessage = 'The imported file is not a Dart DevTools file.'
diff --git a/packages/devtools_app/lib/src/shared/config_specific/launch_url/launch_url.dart b/packages/devtools_app/lib/src/shared/config_specific/launch_url/launch_url.dart index abe8121..2da925b 100644 --- a/packages/devtools_app/lib/src/shared/config_specific/launch_url/launch_url.dart +++ b/packages/devtools_app/lib/src/shared/config_specific/launch_url/launch_url.dart
@@ -6,7 +6,7 @@ import '../../globals.dart'; import '_launch_url_stub.dart' - if (dart.library.html) '_launch_url_web.dart' + if (dart.library.js_interop) '_launch_url_web.dart' if (dart.library.io) '_launch_url_desktop.dart'; Future<void> launchUrl(String url) async {
diff --git a/packages/devtools_app/lib/src/shared/config_specific/logger/allowed_error.dart b/packages/devtools_app/lib/src/shared/config_specific/logger/allowed_error.dart index d19e2ac..06ef995 100644 --- a/packages/devtools_app/lib/src/shared/config_specific/logger/allowed_error.dart +++ b/packages/devtools_app/lib/src/shared/config_specific/logger/allowed_error.dart
@@ -3,4 +3,4 @@ // found in the LICENSE file. export 'allowed_error_default.dart' - if (dart.library.html) 'allowed_error_html.dart'; + if (dart.library.js_interop) 'allowed_error_html.dart';
diff --git a/packages/devtools_app/lib/src/shared/config_specific/logger/logger.dart b/packages/devtools_app/lib/src/shared/config_specific/logger/logger.dart index c2b5b0e..fc26be5 100644 --- a/packages/devtools_app/lib/src/shared/config_specific/logger/logger.dart +++ b/packages/devtools_app/lib/src/shared/config_specific/logger/logger.dart
@@ -3,7 +3,7 @@ // found in the LICENSE file. export 'logger_default.dart' - if (dart.library.html) 'logger_html.dart' + if (dart.library.js_interop) 'logger_html.dart' if (dart.library.io) 'logger_io.dart'; enum LogLevel {
diff --git a/packages/devtools_app/lib/src/shared/config_specific/notifications/notifications.dart b/packages/devtools_app/lib/src/shared/config_specific/notifications/notifications.dart index c81b484..764a6db 100644 --- a/packages/devtools_app/lib/src/shared/config_specific/notifications/notifications.dart +++ b/packages/devtools_app/lib/src/shared/config_specific/notifications/notifications.dart
@@ -3,5 +3,5 @@ // in the LICENSE file. export 'notifications_stub.dart' - if (dart.library.html) 'notifications_web.dart' + if (dart.library.js_interop) 'notifications_web.dart' if (dart.library.io) 'notifications_desktop.dart';
diff --git a/packages/devtools_app/lib/src/shared/config_specific/post_message/post_message.dart b/packages/devtools_app/lib/src/shared/config_specific/post_message/post_message.dart index 09463d7..8ffd6a5 100644 --- a/packages/devtools_app/lib/src/shared/config_specific/post_message/post_message.dart +++ b/packages/devtools_app/lib/src/shared/config_specific/post_message/post_message.dart
@@ -2,7 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -export 'post_message_stub.dart' if (dart.library.html) 'post_message_web.dart'; +export 'post_message_stub.dart' + if (dart.library.js_interop) 'post_message_web.dart'; class PostMessageEvent { PostMessageEvent({
diff --git a/packages/devtools_app/lib/src/shared/config_specific/server/server.dart b/packages/devtools_app/lib/src/shared/config_specific/server/server.dart index 774dee0..03d179e 100644 --- a/packages/devtools_app/lib/src/shared/config_specific/server/server.dart +++ b/packages/devtools_app/lib/src/shared/config_specific/server/server.dart
@@ -2,4 +2,4 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -export '_server_stub.dart' if (dart.library.html) '_server_web.dart'; +export '_server_stub.dart' if (dart.library.js_interop) '_server_web.dart';
diff --git a/packages/devtools_app/test/test_infra/matchers/matchers.dart b/packages/devtools_app/test/test_infra/matchers/matchers.dart index c7b3b06..8c0b49d 100644 --- a/packages/devtools_app/test/test_infra/matchers/matchers.dart +++ b/packages/devtools_app/test/test_infra/matchers/matchers.dart
@@ -11,7 +11,7 @@ import 'package:devtools_app/src/shared/diagnostics/diagnostics_node.dart'; import 'package:flutter_test/flutter_test.dart'; import '_golden_matcher_io.dart' - if (dart.library.html) '_golden_matcher_web.dart' as golden_matcher; + if (dart.library.js_interop) '_golden_matcher_web.dart' as golden_matcher; RemoteDiagnosticsNode? findNodeMatching( RemoteDiagnosticsNode node,
diff --git a/packages/devtools_app_shared/lib/src/ui/theme/ide_theme.dart b/packages/devtools_app_shared/lib/src/ui/theme/ide_theme.dart index 04e9b37..21f205b 100644 --- a/packages/devtools_app_shared/lib/src/ui/theme/ide_theme.dart +++ b/packages/devtools_app_shared/lib/src/ui/theme/ide_theme.dart
@@ -6,7 +6,8 @@ import 'theme.dart'; -export '_ide_theme_desktop.dart' if (dart.library.html) '_ide_theme_web.dart'; +export '_ide_theme_desktop.dart' + if (dart.library.js_interop) '_ide_theme_web.dart'; /// IDE-supplied theming. final class IdeTheme {
diff --git a/packages/devtools_app_shared/lib/src/utils/url/url.dart b/packages/devtools_app_shared/lib/src/utils/url/url.dart index c54fe58..2f31163 100644 --- a/packages/devtools_app_shared/lib/src/utils/url/url.dart +++ b/packages/devtools_app_shared/lib/src/utils/url/url.dart
@@ -2,4 +2,4 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -export '_url_stub.dart' if (dart.library.html) '_url_web.dart'; +export '_url_stub.dart' if (dart.library.js_interop) '_url_web.dart';
diff --git a/packages/devtools_shared/lib/src/sse/sse_shim.dart b/packages/devtools_shared/lib/src/sse/sse_shim.dart index 8ceefb9..a433d6c 100644 --- a/packages/devtools_shared/lib/src/sse/sse_shim.dart +++ b/packages/devtools_shared/lib/src/sse/sse_shim.dart
@@ -3,4 +3,5 @@ // found in the LICENSE file. export '_fake_sse.dart' - if (dart.library.html) 'package:sse/client/sse_client.dart' show SseClient; + if (dart.library.js_interop) 'package:sse/client/sse_client.dart' + show SseClient;