Skip to content

Commit a74737f

Browse files
author
Anna Gringauze
authored
Removed dependecies on dwds.dart inside dwds code (#1654)
1 parent 0a371d1 commit a74737f

File tree

11 files changed

+40
-12
lines changed

11 files changed

+40
-12
lines changed

dwds/lib/src/debugging/classes.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import 'package:vm_service/vm_service.dart';
88
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
99

10-
import '../../dwds.dart' show ChromeDebugException;
10+
import '../../src/services/chrome_debug_exception.dart';
1111
import '../loaders/strategy.dart';
1212
import '../utilities/domain.dart';
1313
import '../utilities/shared.dart';

dwds/lib/src/handlers/dev_handler.dart

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,23 @@ import '../../data/error_response.dart';
2121
import '../../data/isolate_events.dart';
2222
import '../../data/register_event.dart';
2323
import '../../data/serializers.dart';
24-
import '../../dwds.dart';
24+
25+
import '../connections/app_connection.dart';
26+
import '../connections/debug_connection.dart';
2527
import '../debugging/execution_context.dart';
2628
import '../debugging/remote_debugger.dart';
2729
import '../debugging/webkit_debugger.dart';
2830
import '../dwds_vm_client.dart';
2931
import '../events.dart';
32+
import '../handlers/socket_connections.dart';
33+
import '../loaders/strategy.dart';
34+
import '../readers/asset_reader.dart';
35+
import '../servers/devtools.dart';
3036
import '../servers/extension_backend.dart';
3137
import '../services/app_debug_services.dart';
3238
import '../services/debug_service.dart';
39+
import '../services/expression_compiler.dart';
40+
import '../utilities/sdk_configuration.dart';
3341
import 'injector.dart';
3442

3543
/// When enabled, this logs VM service protocol and Chrome debug protocol

dwds/lib/src/handlers/injector.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import 'package:crypto/crypto.dart';
1313
import 'package:logging/logging.dart';
1414
import 'package:shelf/shelf.dart';
1515

16-
import '../../dwds.dart';
1716
import '../loaders/strategy.dart';
1817
import '../version.dart';
1918

dwds/lib/src/loaders/build_runner_require.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ import 'dart:io';
1010
import 'package:path/path.dart' as p;
1111
import 'package:shelf/shelf.dart';
1212

13-
import '../../dwds.dart';
13+
import '../debugging/metadata/provider.dart';
14+
import '../loaders/strategy.dart';
15+
import '../readers/asset_reader.dart';
16+
import '../services/expression_compiler.dart';
1417
import 'require.dart';
1518

1619
/// Provides a [RequireStrategy] suitable for use with `package:build_runner`.

dwds/lib/src/loaders/frontend_server_require.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66

77
import 'package:path/path.dart' as p;
88

9-
import '../../dwds.dart';
9+
import '../debugging/metadata/provider.dart';
10+
import '../loaders/strategy.dart';
11+
import '../readers/asset_reader.dart';
12+
import '../services/expression_compiler.dart';
1013
import 'require.dart';
1114

1215
/// Provides a [RequireStrategy] suitable for use with Frontend Server.

dwds/lib/src/loaders/legacy.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66

77
import 'package:shelf/shelf.dart';
88

9-
import '../../dwds.dart';
9+
import '../debugging/metadata/provider.dart';
10+
import '../loaders/strategy.dart';
11+
import '../readers/asset_reader.dart';
12+
import '../services/expression_compiler.dart';
1013

1114
/// A load strategy for the legacy module system.
1215
class LegacyStrategy extends LoadStrategy {

dwds/lib/src/loaders/require.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ import 'dart:convert';
99
import 'package:path/path.dart' as p;
1010
import 'package:shelf/shelf.dart';
1111

12-
import '../../dwds.dart';
12+
import '../debugging/metadata/provider.dart';
13+
import '../loaders/strategy.dart';
14+
import '../readers/asset_reader.dart';
15+
import '../services/expression_compiler.dart';
1316

1417
/// Find the path we are serving from the url.
1518
///

dwds/lib/src/loaders/strategy.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66

77
import 'package:shelf/shelf.dart';
88

9-
import '../../dwds.dart';
9+
import '../debugging/metadata/provider.dart';
10+
import '../readers/asset_reader.dart';
11+
import '../services/expression_compiler.dart';
1012

1113
LoadStrategy _globalLoadStrategy;
1214

dwds/lib/src/readers/frontend_server_asset_reader.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ import 'dart:io';
1010
import 'package:package_config/package_config.dart';
1111
import 'package:path/path.dart' as p;
1212

13-
import '../../dwds.dart';
14-
import 'asset_reader.dart';
13+
import '../readers/asset_reader.dart';
1514

1615
/// A reader for Dart sources and related source maps provided by the Frontend
1716
/// Server.

dwds/lib/src/services/chrome_proxy_service.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
1515

1616
import '../../data/debug_event.dart';
1717
import '../../data/register_event.dart';
18-
import '../../dwds.dart';
18+
import '../connections/app_connection.dart';
1919
import '../debugging/debugger.dart';
2020
import '../debugging/execution_context.dart';
2121
import '../debugging/inspector.dart';
@@ -26,7 +26,11 @@ import '../debugging/remote_debugger.dart';
2626
import '../debugging/skip_list.dart';
2727
import '../events.dart';
2828
import '../loaders/strategy.dart';
29+
import '../readers/asset_reader.dart';
30+
import '../services/chrome_debug_exception.dart';
31+
import '../services/expression_compiler.dart';
2932
import '../utilities/dart_uri.dart';
33+
import '../utilities/sdk_configuration.dart';
3034
import '../utilities/shared.dart';
3135
import 'expression_evaluator.dart';
3236

0 commit comments

Comments
 (0)