Skip to content

Commit 38d7818

Browse files
authored
[ webdev ] Use DDS to serve DevTools instead of package:dds/devtools_server.dart (#2760)
Fixes #2759
1 parent 72ecf35 commit 38d7818

2 files changed

Lines changed: 6 additions & 14 deletions

File tree

‎webdev/CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
## 3.8.1-wip
22

3+
- Serve Dart DevTools from DDS instead of launching it manually.
4+
35
## 3.8.0
46

57
- Adding initial DDC library bundler support behind the `canary` flag.

‎webdev/lib/src/serve/webdev_server.dart‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import 'dart:convert';
77
import 'dart:io';
88

99
import 'package:build_daemon/data/build_status.dart' as daemon;
10-
import 'package:dds/devtools_server.dart';
1110
import 'package:dwds/data/build_result.dart';
1211
import 'package:dwds/dwds.dart';
1312
import 'package:dwds/sdk_configuration.dart';
@@ -227,20 +226,11 @@ class WebDevServer {
227226
final debugSettings = DebugSettings(
228227
enableDebugExtension: options.configuration.debugExtension,
229228
enableDebugging: options.configuration.debug,
230-
// ignore: deprecated_member_use
231-
spawnDds: !options.configuration.disableDds,
229+
ddsConfiguration: DartDevelopmentServiceConfiguration(
230+
enable: !options.configuration.disableDds,
231+
serveDevTools: shouldServeDevTools,
232+
),
232233
expressionCompiler: ddcService,
233-
// ignore: deprecated_member_use
234-
devToolsLauncher: shouldServeDevTools
235-
? (String hostname) async {
236-
final server = await DevToolsServer().serveDevTools(
237-
hostname: hostname,
238-
enableStdinCommands: false,
239-
customDevToolsPath: devToolsPath,
240-
);
241-
return DevTools(server!.address.host, server.port, server);
242-
}
243-
: null,
244234
);
245235

246236
final appMetadata = AppMetadata(hostname: options.configuration.hostname);

0 commit comments

Comments
 (0)