From a83b5892019f2380cf9f0b2e355c5308055550ec Mon Sep 17 00:00:00 2001 From: Elliott Brooks <21270878+elliette@users.noreply.github.com> Date: Mon, 11 Jul 2022 15:48:51 -0700 Subject: [PATCH 1/2] Remove package:dwds/dwds.dart dependencies --- dwds/test/debugger_test.dart | 1 - dwds/test/expression_compiler_service_test.dart | 1 - dwds/test/extension_backend_test.dart | 1 - dwds/test/fixtures/context.dart | 1 - dwds/test/fixtures/fakes.dart | 1 - dwds/test/fixtures/server.dart | 1 - dwds/test/location_test.dart | 1 - dwds/test/metadata_test.dart | 1 - dwds/test/readers/frontend_server_asset_reader_test.dart | 1 - dwds/test/readers/proxy_server_asset_reader_test.dart | 1 - dwds/test/reload_test.dart | 1 - 11 files changed, 11 deletions(-) diff --git a/dwds/test/debugger_test.dart b/dwds/test/debugger_test.dart index bef2e0658..062c42e35 100644 --- a/dwds/test/debugger_test.dart +++ b/dwds/test/debugger_test.dart @@ -7,7 +7,6 @@ @TestOn('vm') import 'dart:async'; -import 'package:dwds/dwds.dart'; import 'package:dwds/src/debugging/debugger.dart'; import 'package:dwds/src/debugging/frame_computer.dart'; import 'package:dwds/src/debugging/inspector.dart'; diff --git a/dwds/test/expression_compiler_service_test.dart b/dwds/test/expression_compiler_service_test.dart index 5e7d4827a..92fad8a9b 100644 --- a/dwds/test/expression_compiler_service_test.dart +++ b/dwds/test/expression_compiler_service_test.dart @@ -9,7 +9,6 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:dwds/dwds.dart'; import 'package:dwds/src/utilities/shared.dart'; import 'package:logging/logging.dart'; import 'package:path/path.dart' as p; diff --git a/dwds/test/extension_backend_test.dart b/dwds/test/extension_backend_test.dart index 4d914df72..b99f1bd0c 100644 --- a/dwds/test/extension_backend_test.dart +++ b/dwds/test/extension_backend_test.dart @@ -8,7 +8,6 @@ import 'dart:async'; import 'package:async/src/stream_queue.dart'; import 'package:dwds/data/extension_request.dart'; -import 'package:dwds/dwds.dart'; import 'package:dwds/src/servers/extension_backend.dart'; import 'package:http/http.dart' as http; import 'package:shelf/src/request.dart'; diff --git a/dwds/test/fixtures/context.dart b/dwds/test/fixtures/context.dart index 6b0a4331f..42970d8be 100644 --- a/dwds/test/fixtures/context.dart +++ b/dwds/test/fixtures/context.dart @@ -11,7 +11,6 @@ import 'dart:io'; import 'package:build_daemon/client.dart'; import 'package:build_daemon/data/build_status.dart'; import 'package:build_daemon/data/build_target.dart'; -import 'package:dwds/dwds.dart'; import 'package:dwds/src/debugging/webkit_debugger.dart'; import 'package:dwds/src/utilities/dart_uri.dart'; import 'package:dwds/src/utilities/sdk_configuration.dart'; diff --git a/dwds/test/fixtures/fakes.dart b/dwds/test/fixtures/fakes.dart index ec139d8fb..9082e44bf 100644 --- a/dwds/test/fixtures/fakes.dart +++ b/dwds/test/fixtures/fakes.dart @@ -6,7 +6,6 @@ import 'dart:async'; -import 'package:dwds/dwds.dart'; import 'package:dwds/src/debugging/classes.dart'; import 'package:dwds/src/debugging/execution_context.dart'; import 'package:dwds/src/debugging/inspector.dart'; diff --git a/dwds/test/fixtures/server.dart b/dwds/test/fixtures/server.dart index dda4083ca..9d0888366 100644 --- a/dwds/test/fixtures/server.dart +++ b/dwds/test/fixtures/server.dart @@ -9,7 +9,6 @@ import 'dart:io'; import 'package:build_daemon/data/build_status.dart' as daemon; import 'package:dds/devtools_server.dart'; import 'package:dwds/data/build_result.dart'; -import 'package:dwds/dwds.dart'; import 'package:dwds/src/utilities/shared.dart'; import 'package:logging/logging.dart'; import 'package:shelf/shelf.dart'; diff --git a/dwds/test/location_test.dart b/dwds/test/location_test.dart index 6390b6c8e..98b24948b 100644 --- a/dwds/test/location_test.dart +++ b/dwds/test/location_test.dart @@ -4,7 +4,6 @@ // @dart = 2.9 -import 'package:dwds/dwds.dart'; import 'package:dwds/src/debugging/location.dart'; import 'package:dwds/src/debugging/modules.dart'; import 'package:dwds/src/loaders/strategy.dart'; diff --git a/dwds/test/metadata_test.dart b/dwds/test/metadata_test.dart index 2e56edbe5..c90f347ef 100644 --- a/dwds/test/metadata_test.dart +++ b/dwds/test/metadata_test.dart @@ -4,7 +4,6 @@ // @dart = 2.9 -import 'package:dwds/dwds.dart'; import 'package:dwds/src/debugging/metadata/module_metadata.dart'; import 'package:test/test.dart'; diff --git a/dwds/test/readers/frontend_server_asset_reader_test.dart b/dwds/test/readers/frontend_server_asset_reader_test.dart index dc8423031..6723a8a2e 100644 --- a/dwds/test/readers/frontend_server_asset_reader_test.dart +++ b/dwds/test/readers/frontend_server_asset_reader_test.dart @@ -7,7 +7,6 @@ import 'dart:async'; import 'dart:io'; -import 'package:dwds/dwds.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; diff --git a/dwds/test/readers/proxy_server_asset_reader_test.dart b/dwds/test/readers/proxy_server_asset_reader_test.dart index f4f75e4a5..4d1c17e5e 100644 --- a/dwds/test/readers/proxy_server_asset_reader_test.dart +++ b/dwds/test/readers/proxy_server_asset_reader_test.dart @@ -4,7 +4,6 @@ // @dart = 2.9 -import 'package:dwds/dwds.dart'; import 'package:test/test.dart'; import '../fixtures/context.dart'; diff --git a/dwds/test/reload_test.dart b/dwds/test/reload_test.dart index 4f01bea7e..11d44dbb1 100644 --- a/dwds/test/reload_test.dart +++ b/dwds/test/reload_test.dart @@ -6,7 +6,6 @@ @TestOn('vm') @Timeout(Duration(minutes: 5)) -import 'package:dwds/dwds.dart'; import 'package:test/test.dart'; import 'package:vm_service/vm_service.dart'; From 63a63988ffd47a2fb39361ba201b4770c1a18c9d Mon Sep 17 00:00:00 2001 From: Elliott Brooks <21270878+elliette@users.noreply.github.com> Date: Mon, 11 Jul 2022 16:10:33 -0700 Subject: [PATCH 2/2] Added new imports --- dwds/test/debugger_test.dart | 1 + dwds/test/expression_compiler_service_test.dart | 2 ++ dwds/test/extension_backend_test.dart | 1 + dwds/test/fixtures/context.dart | 10 ++++++++++ dwds/test/fixtures/fakes.dart | 4 ++++ dwds/test/fixtures/server.dart | 1 + dwds/test/location_test.dart | 2 ++ dwds/test/metadata_test.dart | 2 ++ .../readers/frontend_server_asset_reader_test.dart | 1 + dwds/test/readers/proxy_server_asset_reader_test.dart | 1 + dwds/test/reload_test.dart | 1 + 11 files changed, 26 insertions(+) diff --git a/dwds/test/debugger_test.dart b/dwds/test/debugger_test.dart index 062c42e35..d2e45ccb6 100644 --- a/dwds/test/debugger_test.dart +++ b/dwds/test/debugger_test.dart @@ -7,6 +7,7 @@ @TestOn('vm') import 'dart:async'; +import 'package:dwds/asset_reader.dart'; import 'package:dwds/src/debugging/debugger.dart'; import 'package:dwds/src/debugging/frame_computer.dart'; import 'package:dwds/src/debugging/inspector.dart'; diff --git a/dwds/test/expression_compiler_service_test.dart b/dwds/test/expression_compiler_service_test.dart index 92fad8a9b..18a8fa9e9 100644 --- a/dwds/test/expression_compiler_service_test.dart +++ b/dwds/test/expression_compiler_service_test.dart @@ -9,6 +9,8 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; +import 'package:dwds/expression_compiler.dart'; +import 'package:dwds/src/services/expression_compiler_service.dart'; import 'package:dwds/src/utilities/shared.dart'; import 'package:logging/logging.dart'; import 'package:path/path.dart' as p; diff --git a/dwds/test/extension_backend_test.dart b/dwds/test/extension_backend_test.dart index b99f1bd0c..d4fc893ba 100644 --- a/dwds/test/extension_backend_test.dart +++ b/dwds/test/extension_backend_test.dart @@ -8,6 +8,7 @@ import 'dart:async'; import 'package:async/src/stream_queue.dart'; import 'package:dwds/data/extension_request.dart'; +import 'package:dwds/src/handlers/socket_connections.dart'; import 'package:dwds/src/servers/extension_backend.dart'; import 'package:http/http.dart' as http; import 'package:shelf/src/request.dart'; diff --git a/dwds/test/fixtures/context.dart b/dwds/test/fixtures/context.dart index 42970d8be..d6a138cc2 100644 --- a/dwds/test/fixtures/context.dart +++ b/dwds/test/fixtures/context.dart @@ -11,7 +11,17 @@ import 'dart:io'; import 'package:build_daemon/client.dart'; import 'package:build_daemon/data/build_status.dart'; import 'package:build_daemon/data/build_target.dart'; +import 'package:dwds/asset_reader.dart'; +import 'package:dwds/expression_compiler.dart'; +import 'package:dwds/src/connections/app_connection.dart'; +import 'package:dwds/src/connections/debug_connection.dart'; import 'package:dwds/src/debugging/webkit_debugger.dart'; +import 'package:dwds/src/loaders/build_runner_require.dart'; +import 'package:dwds/src/loaders/frontend_server_require.dart'; +import 'package:dwds/src/loaders/require.dart'; +import 'package:dwds/src/loaders/strategy.dart'; +import 'package:dwds/src/readers/proxy_server_asset_reader.dart'; +import 'package:dwds/src/services/expression_compiler_service.dart'; import 'package:dwds/src/utilities/dart_uri.dart'; import 'package:dwds/src/utilities/sdk_configuration.dart'; import 'package:dwds/src/utilities/shared.dart'; diff --git a/dwds/test/fixtures/fakes.dart b/dwds/test/fixtures/fakes.dart index 9082e44bf..4e3904caf 100644 --- a/dwds/test/fixtures/fakes.dart +++ b/dwds/test/fixtures/fakes.dart @@ -6,14 +6,18 @@ import 'dart:async'; +import 'package:dwds/expression_compiler.dart'; import 'package:dwds/src/debugging/classes.dart'; import 'package:dwds/src/debugging/execution_context.dart'; import 'package:dwds/src/debugging/inspector.dart'; import 'package:dwds/src/debugging/instance.dart'; import 'package:dwds/src/debugging/libraries.dart'; +import 'package:dwds/src/debugging/metadata/provider.dart'; import 'package:dwds/src/debugging/modules.dart'; import 'package:dwds/src/debugging/remote_debugger.dart'; import 'package:dwds/src/debugging/webkit_debugger.dart'; +import 'package:dwds/src/handlers/socket_connections.dart'; +import 'package:dwds/src/loaders/require.dart'; import 'package:dwds/src/loaders/strategy.dart'; import 'package:shelf/shelf.dart' as shelf; import 'package:vm_service/vm_service.dart'; diff --git a/dwds/test/fixtures/server.dart b/dwds/test/fixtures/server.dart index 9d0888366..dda4083ca 100644 --- a/dwds/test/fixtures/server.dart +++ b/dwds/test/fixtures/server.dart @@ -9,6 +9,7 @@ import 'dart:io'; import 'package:build_daemon/data/build_status.dart' as daemon; import 'package:dds/devtools_server.dart'; import 'package:dwds/data/build_result.dart'; +import 'package:dwds/dwds.dart'; import 'package:dwds/src/utilities/shared.dart'; import 'package:logging/logging.dart'; import 'package:shelf/shelf.dart'; diff --git a/dwds/test/location_test.dart b/dwds/test/location_test.dart index 98b24948b..894fd557d 100644 --- a/dwds/test/location_test.dart +++ b/dwds/test/location_test.dart @@ -4,7 +4,9 @@ // @dart = 2.9 +import 'package:dwds/expression_compiler.dart'; import 'package:dwds/src/debugging/location.dart'; +import 'package:dwds/src/debugging/metadata/provider.dart'; import 'package:dwds/src/debugging/modules.dart'; import 'package:dwds/src/loaders/strategy.dart'; import 'package:dwds/src/utilities/dart_uri.dart'; diff --git a/dwds/test/metadata_test.dart b/dwds/test/metadata_test.dart index c90f347ef..d2b750674 100644 --- a/dwds/test/metadata_test.dart +++ b/dwds/test/metadata_test.dart @@ -4,7 +4,9 @@ // @dart = 2.9 +import 'package:dwds/asset_reader.dart'; import 'package:dwds/src/debugging/metadata/module_metadata.dart'; +import 'package:dwds/src/debugging/metadata/provider.dart'; import 'package:test/test.dart'; const _emptySourceMetadata = diff --git a/dwds/test/readers/frontend_server_asset_reader_test.dart b/dwds/test/readers/frontend_server_asset_reader_test.dart index 6723a8a2e..ddd05c929 100644 --- a/dwds/test/readers/frontend_server_asset_reader_test.dart +++ b/dwds/test/readers/frontend_server_asset_reader_test.dart @@ -7,6 +7,7 @@ import 'dart:async'; import 'dart:io'; +import 'package:dwds/src/readers/frontend_server_asset_reader.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; diff --git a/dwds/test/readers/proxy_server_asset_reader_test.dart b/dwds/test/readers/proxy_server_asset_reader_test.dart index 4d1c17e5e..8f8853b95 100644 --- a/dwds/test/readers/proxy_server_asset_reader_test.dart +++ b/dwds/test/readers/proxy_server_asset_reader_test.dart @@ -4,6 +4,7 @@ // @dart = 2.9 +import 'package:dwds/src/readers/proxy_server_asset_reader.dart'; import 'package:test/test.dart'; import '../fixtures/context.dart'; diff --git a/dwds/test/reload_test.dart b/dwds/test/reload_test.dart index 11d44dbb1..1a4bb6161 100644 --- a/dwds/test/reload_test.dart +++ b/dwds/test/reload_test.dart @@ -6,6 +6,7 @@ @TestOn('vm') @Timeout(Duration(minutes: 5)) +import 'package:dwds/src/loaders/strategy.dart'; import 'package:test/test.dart'; import 'package:vm_service/vm_service.dart';