Skip to content

Commit f00de04

Browse files
authored
update repo to be forward compatible with shelf_web_socket v3.0 (#161101)
- update the engine and flutter_tools to be forward compatible with the upcoming shelf_web_socket v3.0 *List which issues are fixed by this PR. You must list at least one issue. An issue is not required if the PR fixes something trivial like a typo.* - dart-lang/shelf#457 - dart-lang/shelf#463 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [ ] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
1 parent dff62dc commit f00de04

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

engine/src/flutter/lib/web_ui/dev/test_platform.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,11 @@ class BrowserPlatform extends PlatformPlugin {
619619
}
620620

621621
final Completer<WebSocketChannel> completer = Completer<WebSocketChannel>.sync();
622-
final String path = _webSocketHandler.create(webSocketHandler(completer.complete));
622+
final String path = _webSocketHandler.create(
623+
webSocketHandler((WebSocketChannel webSocket, _) {
624+
completer.complete(webSocket);
625+
}),
626+
);
623627
final Uri webSocketUrl = url.replace(scheme: 'ws').resolve(path);
624628
final Uri hostUrl = url
625629
.resolve('host/index.html')

packages/flutter_tools/lib/src/test/flutter_web_platform.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,11 @@ class FlutterWebPlatform extends PlatformPlugin {
674674
}
675675

676676
final Completer<WebSocketChannel> completer = Completer<WebSocketChannel>.sync();
677-
final String path = _webSocketHandler.create(webSocketHandler(completer.complete));
677+
final String path = _webSocketHandler.create(
678+
webSocketHandler((WebSocketChannel webSocket, _) {
679+
completer.complete(webSocket);
680+
}),
681+
);
678682
final Uri webSocketUrl = url.replace(scheme: 'ws').resolve(path);
679683
final Uri hostUrl = url
680684
.resolve('static/index.html')

0 commit comments

Comments
 (0)