Serve DevTools from Dart SDK via DDS instead of pub (#1489)

Removes dependencies on devtools_server and devtools.

Fixes #1474

Author: bkonyi

dwds/pubspec.yaml

@@ -15,7 +15,7 @@ dependencies:
   built_collection: ^5.0.0
   built_value: '>=6.7.0 <9.0.0'
   crypto: '>=2.0.6 <4.0.0'
-  dds: ^2.1.6
+  dds: ^2.2.0
   http: '>=0.12.0 <0.14.0'
   http_multi_server: ^3.0.0
   logging: '>=0.11.3 <2.0.0'
@@ -53,6 +53,3 @@ dev_dependencies:
   stream_channel: ^2.0.0
   test: ^1.6.0
   webdriver: '>=2.0.0 <4.0.0'
-  # devtools_server indirectly depends on devtools so keep this around.
-  devtools: ^2.9.3
-  devtools_server: ^2.9.3

dwds/test/fixtures/server.dart

@@ -7,7 +7,7 @@
 import 'dart:io';
 
 import 'package:build_daemon/data/build_status.dart' as daemon;
-import 'package:devtools_server/devtools_server.dart' as devtools_lancher;
+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';
@@ -16,6 +16,8 @@ import 'package:logging/logging.dart';
 import 'package:shelf/shelf.dart';
 import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
 
+import 'utilities.dart';
+
 Logger _logger = Logger('TestServer');
 
 Handler _interceptFavicon(Handler handler) {
@@ -112,8 +114,11 @@ class TestServer {
         expressionCompiler: expressionCompiler,
         devtoolsLauncher: serveDevTools
             ? (hostname) async {
-                var server = await devtools_lancher.serveDevTools(
-                    hostname: hostname, enableStdinCommands: false);
+                var server = await DevToolsServer().serveDevTools(
+                  hostname: hostname,
+                  enableStdinCommands: false,
+                  customDevToolsPath: devToolsPath,
+                );
                 return DevTools(server.address.host, server.port, server);
               }
             : null);

dwds/test/fixtures/utilities.dart

@@ -29,6 +29,7 @@ final String _sdkDir = (() {
 
 final String dartSdkPath = _sdkDir;
 final String dartPath = p.join(_sdkDir, 'bin', 'dart');
+final String devToolsPath = p.join(_sdkDir, 'bin', 'resources', 'devtools');
 
 /// Returns the port of the daemon asset server.
 int daemonPort(String workingDirectory) {

webdev/lib/src/serve/webdev_server.dart

@@ -8,7 +8,7 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:build_daemon/data/build_status.dart' as daemon;
-import 'package:devtools_server/devtools_server.dart';
+import 'package:dds/devtools_server.dart';
 import 'package:dwds/data/build_result.dart';
 import 'package:dwds/dwds.dart';
 import 'package:http/http.dart' as http;
@@ -150,8 +150,11 @@ class WebDevServer {
           expressionCompiler: ddcService,
           devtoolsLauncher: shouldServeDevTools
               ? (String hostname) async {
-                  var server = await serveDevTools(
-                      hostname: hostname, enableStdinCommands: false);
+                  var server = await DevToolsServer().serveDevTools(
+                    hostname: hostname,
+                    enableStdinCommands: false,
+                    customDevToolsPath: devToolsPath,
+                  );
                   return DevTools(server.address.host, server.port, server);
                 }
               : null);

webdev/lib/src/util.dart

@@ -35,3 +35,4 @@ final String _sdkDir = (() {
 })();
 
 final String dartPath = p.join(_sdkDir, 'bin', 'dart');
+final String devToolsPath = p.join(_sdkDir, 'bin', 'resources', 'devtools');

webdev/pubspec.yaml

@@ -17,7 +17,7 @@ dependencies:
   build_daemon: '>=2.0.0 <4.0.0'
   browser_launcher: ^1.0.0
   crypto: ^3.0.0
-  dds: ^2.1.6
+  dds: ^2.2.0
   dwds: ^11.5.1
   http: ^0.13.0
   http_multi_server: ^3.0.0
@@ -36,9 +36,6 @@ dependencies:
   vm_service: '>=3.0.0 <9.0.0'
   webkit_inspection_protocol: '>=0.4.0 <2.0.0'
   yaml: ^3.0.0
-  # devtools_server indirectly depends on devtools so keep this around.
-  devtools: ^2.0.0
-  devtools_server: ^2.0.0
 
 dev_dependencies:
   build: ^2.0.0