Merge branch 'main' into null-safety-cleanup

Author: nshahan

.github/workflows/dart.yml

@@ -436,11 +436,11 @@ class WebSocketDebugService implements DebugService {
   }
 
   /// Creates the WebSocket handler for incoming connections.
-  static dynamic _createWebSocketHandler(
+  static Handler _createWebSocketHandler(
     ServiceExtensionRegistry serviceExtensionRegistry,
     WebSocketProxyService webSocketProxyService,
   ) {
-    return webSocketHandler((WebSocketChannel webSocket) {
+    return webSocketHandler((WebSocketChannel webSocket, String? subprotocol) {
       final responseController = StreamController<Map<String, Object?>>();
       webSocket.sink.addStream(responseController.stream.map(jsonEncode));
 

dwds/CHANGELOG.md

@@ -1,6 +1,6 @@
 name: dwds
 # Every time this changes you need to run `dart run build_runner build`.
-version: 24.4.1
+version: 24.4.2-wip
 
 description: >-
   A service that proxies between the Chrome debug protocol and the Dart VM
@@ -29,7 +29,7 @@ dependencies:
   shelf_packages_handler: ^3.0.0
   shelf_proxy: ^1.0.4
   shelf_static: ^1.1.0
-  shelf_web_socket: '>=1.0.0 <3.0.0'
+  shelf_web_socket: '>=2.0.0 <4.0.0'
   source_maps: ^0.10.10
   stack_trace: ^1.10.0
   sse: ^4.1.2

dwds/lib/src/services/debug_service.dart

@@ -2067,7 +2067,7 @@ void runTests({
         expect(
           resolvedUris.uris,
           containsAll([
-            contains('/_testSound/example/hello_world/main.dart'),
+            contains('/_test/example/hello_world/main.dart'),
             contains('/lib/path.dart'),
             contains('/lib/src/path_set.dart'),
           ]),

dwds/lib/src/version.dart

@@ -22,7 +22,7 @@ class TestProject {
   late Directory _fixturesCopy;
 
   /// The top level directory in which we run the test server, e.g.
-  /// "/tmp/_testSound".
+  /// "/tmp/_test".
   String get absolutePackageDirectory =>
       p.join(_fixturesCopy.absolute.path, packageDirectory);
 
@@ -39,7 +39,7 @@ class TestProject {
   }
 
   /// The path to the Dart entry file, e.g,
-  /// "/tmp/_testSound/example/hello_world/main.dart":
+  /// "/tmp/_test/example/hello_world/main.dart":
   String get dartEntryFilePath => p.joinAll([
     _fixturesCopy.absolute.path,
     packageDirectory,
@@ -61,67 +61,67 @@ class TestProject {
 
   TestProject.testPackage({IndexBaseMode baseMode = IndexBaseMode.noBase})
     : this._(
-        packageName: '_test_package_sound',
-        packageDirectory: '_testPackageSound',
+        packageName: '_test_package',
+        packageDirectory: '_test_package',
         webAssetsPath: 'web',
         dartEntryFileName: 'main.dart',
         htmlEntryFileName:
             baseMode == IndexBaseMode.base ? 'base_index.html' : 'index.html',
       );
 
   static final testCircular1 = TestProject._(
-    packageName: '_test_circular1_sound',
-    packageDirectory: '_testCircular1Sound',
+    packageName: '_test_circular1',
+    packageDirectory: '_test_circular1',
     webAssetsPath: 'web',
     dartEntryFileName: 'main.dart',
     htmlEntryFileName: 'index.html',
   );
 
   TestProject.testCircular2({IndexBaseMode baseMode = IndexBaseMode.noBase})
     : this._(
-        packageName: '_test_circular2_sound',
-        packageDirectory: '_testCircular2Sound',
+        packageName: '_test_circular2',
+        packageDirectory: '_test_circular2',
         webAssetsPath: 'web',
         dartEntryFileName: 'main.dart',
         htmlEntryFileName:
             baseMode == IndexBaseMode.base ? 'base_index.html' : 'index.html',
       );
 
   static final test = TestProject._(
-    packageName: '_test_sound',
-    packageDirectory: '_testSound',
+    packageName: '_test',
+    packageDirectory: '_test',
     webAssetsPath: 'example/hello_world',
     dartEntryFileName: 'main.dart',
     htmlEntryFileName: 'index.html',
   );
 
   static final testScopes = TestProject._(
-    packageName: '_test_sound',
-    packageDirectory: '_testSound',
+    packageName: '_test',
+    packageDirectory: '_test',
     webAssetsPath: webCompatiblePath(['example', 'scopes']),
     dartEntryFileName: 'main.dart',
     htmlEntryFileName: 'scopes.html',
   );
 
   static final testAppendBody = TestProject._(
-    packageName: '_test_sound',
-    packageDirectory: '_testSound',
+    packageName: '_test',
+    packageDirectory: '_test',
     webAssetsPath: webCompatiblePath(['example', 'append_body']),
     dartEntryFileName: 'main.dart',
     htmlEntryFileName: 'index.html',
   );
 
   static final testExperiment = TestProject._(
-    packageName: '_experiment_sound',
-    packageDirectory: '_experimentSound',
+    packageName: '_experiment',
+    packageDirectory: '_experiment',
     webAssetsPath: 'web',
     dartEntryFileName: 'main.dart',
     htmlEntryFileName: 'index.html',
   );
 
   static final testHotRestart1 = TestProject._(
     packageName: '_test_hot_restart1',
-    packageDirectory: '_testHotRestart1Sound',
+    packageDirectory: '_test_hot_restart1',
     webAssetsPath: 'web',
     dartEntryFileName: 'main.dart',
     htmlEntryFileName: 'index.html',
@@ -131,31 +131,31 @@ class TestProject {
   /// order to test correctness when only a subset of libraries are updated.
   static final testHotRestart2 = TestProject._(
     packageName: '_test_hot_restart2',
-    packageDirectory: '_testHotRestart2Sound',
+    packageDirectory: '_test_hot_restart2',
     webAssetsPath: 'web',
     dartEntryFileName: 'main.dart',
     htmlEntryFileName: 'index.html',
   );
 
   static final testHotRestartBreakpoints = TestProject._(
     packageName: '_test_hot_restart_breakpoints',
-    packageDirectory: '_testHotRestartBreakpoints',
+    packageDirectory: '_test_hot_restart_breakpoints',
     webAssetsPath: 'web',
     dartEntryFileName: 'main.dart',
     htmlEntryFileName: 'index.html',
   );
 
   static final testHotReload = TestProject._(
     packageName: '_test_hot_reload',
-    packageDirectory: '_testHotReload',
+    packageDirectory: '_test_hot_reload',
     webAssetsPath: 'web',
     dartEntryFileName: 'main.dart',
     htmlEntryFileName: 'index.html',
   );
 
   static final testHotReloadBreakpoints = TestProject._(
     packageName: '_test_hot_reload_breakpoints',
-    packageDirectory: '_testHotReloadBreakpoints',
+    packageDirectory: '_test_hot_reload_breakpoints',
     webAssetsPath: 'web',
     dartEntryFileName: 'main.dart',
     htmlEntryFileName: 'index.html',
@@ -257,7 +257,7 @@ class TestProject {
   }
 
   /// The path to the Dart specified file in the 'lib' directory, e.g,
-  /// "/tmp/_testSound/lib/library.dart":
+  /// "/tmp/_test/lib/library.dart":
   String dartLibFilePath(String dartLibFileName) => p.joinAll([
     _fixturesCopy.absolute.path,
     packageDirectory,

dwds/pubspec.yaml

@@ -36,7 +36,7 @@ void main() {
         test('defaults to "./dart_tool/package_config.json"', () {
           expect(
             p.split(strategy.packageConfigPath).join('/'),
-            endsWith('_testSound/.dart_tool/package_config.json'),
+            endsWith('_test/.dart_tool/package_config.json'),
           );
         });
       },

dwds/test/common/chrome_proxy_service_common.dart

@@ -1,4 +1,4 @@
-name: _experiment_sound
+name: _experiment
 version: 1.0.0
 description: >-
   A fake package used for testing experimental language features.