Support latest pkg:shelf_web_socket (#3837)

builder_runner and build_daemon

Author: kevmoo

build_daemon/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.0.4
+
+- Support the latest `package:shelf_web_socket`.
+
 ## 4.0.3
 
 - Bump the min sdk to 3.6.0.

build_daemon/pubspec.yaml

@@ -1,5 +1,5 @@
 name: build_daemon
-version:  4.0.3
+version:  4.0.4
 description: A daemon for running Dart builds.
 repository: https://github.com/dart-lang/build/tree/master/build_daemon
 resolution: workspace
@@ -16,10 +16,10 @@ dependencies:
   path: ^1.8.0
   pool: ^1.5.0
   shelf: ^1.0.0
-  shelf_web_socket: ">=1.0.0 <3.0.0"
+  shelf_web_socket: ">=1.0.0 <4.0.0"
   stream_transform: ^2.0.0
   watcher: ^1.0.0
-  web_socket_channel: ">=2.0.0 <4.0.0"
+  web_socket_channel: ">=2.3.0 <4.0.0"
 
 dev_dependencies:
   analyzer: '>=3.4.0 <8.0.0'

build_runner/CHANGELOG.md

@@ -1,6 +1,7 @@
-## 2.4.15-wip
+## 2.4.15
 
 - Update to package:web and dart:js_interop.
+- Support the latest `package:shelf_web_socket`.
 
 ## 2.4.14
 

build_runner/lib/src/server/server.dart

@@ -198,8 +198,10 @@ class ServeHandler implements BuildState {
 /// build updates
 class BuildUpdatesWebSocketHandler {
   final connectionsByRootDir = <String, List<WebSocketChannel>>{};
-  final shelf.Handler Function(Function, {Iterable<String> protocols})
-      _handlerFactory;
+  final shelf.Handler Function(
+    void Function(WebSocketChannel webSocket, String? subprotocol), {
+    Iterable<String> protocols,
+  }) _handlerFactory;
   final _internalHandlers = <String, shelf.Handler>{};
   final WatchImpl _state;
 
@@ -208,7 +210,7 @@ class BuildUpdatesWebSocketHandler {
 
   shelf.Handler createHandlerByRootDir(String rootDir) {
     if (!_internalHandlers.containsKey(rootDir)) {
-      void closureForRootDir(WebSocketChannel webSocket, String protocol) =>
+      void closureForRootDir(WebSocketChannel webSocket, String? protocol) =>
           _handleConnection(webSocket, protocol, rootDir);
       _internalHandlers[rootDir] = _handlerFactory(closureForRootDir,
           protocols: [_buildUpdatesProtocol]);
@@ -239,7 +241,7 @@ class BuildUpdatesWebSocketHandler {
   }
 
   void _handleConnection(
-      WebSocketChannel webSocket, String protocol, String rootDir) async {
+      WebSocketChannel webSocket, String? protocol, String rootDir) async {
     var connections = connectionsByRootDir.putIfAbsent(rootDir, () => [])
       ..add(webSocket);
     await webSocket.stream.drain<void>();

build_runner/pubspec.yaml

@@ -1,5 +1,5 @@
 name: build_runner
-version: 2.4.15-wip
+version: 2.4.15
 description: A build system for Dart code generation and modular compilation.
 repository: https://github.com/dart-lang/build/tree/master/build_runner
 resolution: workspace
@@ -41,13 +41,13 @@ dependencies:
   pub_semver: ^2.0.0
   pubspec_parse: ^1.0.0
   shelf: ^1.0.0
-  shelf_web_socket: ">=1.0.0 <3.0.0"
+  shelf_web_socket: ">=1.0.0 <4.0.0"
   stack_trace: ^1.10.0
   stream_transform: ^2.0.0
   timing: ^1.0.0
   watcher: ^1.0.0
   web: ^1.1.0
-  web_socket_channel: ">=2.0.0 <4.0.0"
+  web_socket_channel: ">=2.3.0 <4.0.0"
   yaml: ^3.0.0
 
 dev_dependencies: