Unverified Commit d68278e3 authored by Jonah Williams's avatar Jonah Williams Committed by GitHub

[flutter_tools] rollback to dwds 0.8.5, fix versioning (#49301)

parent 14fc0e5c
...@@ -525,8 +525,11 @@ class _ExperimentalResidentWebRunner extends ResidentWebRunner { ...@@ -525,8 +525,11 @@ class _ExperimentalResidentWebRunner extends ResidentWebRunner {
if (device.device is ChromeDevice) { if (device.device is ChromeDevice) {
final Chrome chrome = await ChromeLauncher.connectedInstance; final Chrome chrome = await ChromeLauncher.connectedInstance;
final ChromeTab chromeTab = await chrome.chromeConnection.getTab((ChromeTab chromeTab) { final ChromeTab chromeTab = await chrome.chromeConnection.getTab((ChromeTab chromeTab) {
return chromeTab.url.contains(debuggingOptions.hostname); return !chromeTab.url.startsWith('chrome-extension');
}); });
if (chromeTab == null) {
throwToolExit('Failed to connect to Chrome instance.');
}
_wipConnection = await chromeTab.connect(); _wipConnection = await chromeTab.connect();
} }
appStartedCompleter?.complete(); appStartedCompleter?.complete();
......
...@@ -342,8 +342,8 @@ class WebFs { ...@@ -342,8 +342,8 @@ class WebFs {
dwds, dwds,
// Format ipv6 hosts according to RFC 5952. // Format ipv6 hosts according to RFC 5952.
internetAddress.type == InternetAddressType.IPv4 internetAddress.type == InternetAddressType.IPv4
? '${internetAddress.address}:$hostPort' ? 'http://${internetAddress.address}:$hostPort'
: '[${internetAddress.address}]:$hostPort', : 'http://[${internetAddress.address}]:$hostPort',
assetServer, assetServer,
buildInfo.isDebug, buildInfo.isDebug,
flutterProject, flutterProject,
......
...@@ -23,6 +23,7 @@ const Map<String, String> _kManuallyPinnedDependencies = <String, String>{ ...@@ -23,6 +23,7 @@ const Map<String, String> _kManuallyPinnedDependencies = <String, String>{
'flutter_gallery_assets': '0.1.9+2', // See //examples/flutter_gallery/pubspec.yaml 'flutter_gallery_assets': '0.1.9+2', // See //examples/flutter_gallery/pubspec.yaml
'mockito': '^4.1.0', // Prevent mockito from downgrading to 4.0.0 'mockito': '^4.1.0', // Prevent mockito from downgrading to 4.0.0
'vm_service_client': '0.2.6+2', // Final version before being marked deprecated. 'vm_service_client': '0.2.6+2', // Final version before being marked deprecated.
'dwds': '0.8.5', // Requires updates to web_fs due to breaking changes.
}; };
class UpdatePackagesCommand extends FlutterCommand { class UpdatePackagesCommand extends FlutterCommand {
......
...@@ -280,8 +280,8 @@ class WebDevFS implements DevFS { ...@@ -280,8 +280,8 @@ class WebDevFS implements DevFS {
// Format ipv6 hosts according to RFC 5952. // Format ipv6 hosts according to RFC 5952.
return Uri.parse( return Uri.parse(
internetAddress.type == InternetAddressType.IPv4 internetAddress.type == InternetAddressType.IPv4
? '${internetAddress.address}:$port' ? 'http://${internetAddress.address}:$port'
: '[${internetAddress.address}]:$port' : 'http://[${internetAddress.address}]:$port'
); );
} }
......
...@@ -11,7 +11,7 @@ dependencies: ...@@ -11,7 +11,7 @@ dependencies:
# To update these, use "flutter update-packages --force-upgrade". # To update these, use "flutter update-packages --force-upgrade".
archive: 2.0.11 archive: 2.0.11
args: 1.5.2 args: 1.5.2
dwds: 0.9.0 dwds: 0.8.5
completion: 0.2.1+1 completion: 0.2.1+1
coverage: 0.13.3+3 coverage: 0.13.3+3
crypto: 2.1.3 crypto: 2.1.3
...@@ -19,7 +19,6 @@ dependencies: ...@@ -19,7 +19,6 @@ dependencies:
http: 0.12.0+4 http: 0.12.0+4
intl: 0.16.1 intl: 0.16.1
json_rpc_2: 2.1.0 json_rpc_2: 2.1.0
linter: 0.1.109
meta: 1.1.8 meta: 1.1.8
multicast_dns: 0.2.2 multicast_dns: 0.2.2
mustache: 1.1.1 mustache: 1.1.1
...@@ -129,4 +128,4 @@ dartdoc: ...@@ -129,4 +128,4 @@ dartdoc:
# Exclude this package from the hosted API docs. # Exclude this package from the hosted API docs.
nodoc: true nodoc: true
# PUBSPEC CHECKSUM: 8f2f # PUBSPEC CHECKSUM: 7cef
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment