Skip to content

Commit d68278e

Browse files
author
Jonah Williams
authored
[flutter_tools] rollback to dwds 0.8.5, fix versioning (flutter#49301)
1 parent 14fc0e5 commit d68278e

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed

packages/flutter_tools/lib/src/build_runner/resident_web_runner.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,8 +525,11 @@ class _ExperimentalResidentWebRunner extends ResidentWebRunner {
525525
if (device.device is ChromeDevice) {
526526
final Chrome chrome = await ChromeLauncher.connectedInstance;
527527
final ChromeTab chromeTab = await chrome.chromeConnection.getTab((ChromeTab chromeTab) {
528-
return chromeTab.url.contains(debuggingOptions.hostname);
528+
return !chromeTab.url.startsWith('chrome-extension');
529529
});
530+
if (chromeTab == null) {
531+
throwToolExit('Failed to connect to Chrome instance.');
532+
}
530533
_wipConnection = await chromeTab.connect();
531534
}
532535
appStartedCompleter?.complete();

packages/flutter_tools/lib/src/build_runner/web_fs.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,8 @@ class WebFs {
342342
dwds,
343343
// Format ipv6 hosts according to RFC 5952.
344344
internetAddress.type == InternetAddressType.IPv4
345-
? '${internetAddress.address}:$hostPort'
346-
: '[${internetAddress.address}]:$hostPort',
345+
? 'http://${internetAddress.address}:$hostPort'
346+
: 'http://[${internetAddress.address}]:$hostPort',
347347
assetServer,
348348
buildInfo.isDebug,
349349
flutterProject,

packages/flutter_tools/lib/src/commands/update_packages.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ const Map<String, String> _kManuallyPinnedDependencies = <String, String>{
2323
'flutter_gallery_assets': '0.1.9+2', // See //examples/flutter_gallery/pubspec.yaml
2424
'mockito': '^4.1.0', // Prevent mockito from downgrading to 4.0.0
2525
'vm_service_client': '0.2.6+2', // Final version before being marked deprecated.
26+
'dwds': '0.8.5', // Requires updates to web_fs due to breaking changes.
2627
};
2728

2829
class UpdatePackagesCommand extends FlutterCommand {

packages/flutter_tools/lib/src/web/devfs_web.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,8 @@ class WebDevFS implements DevFS {
280280
// Format ipv6 hosts according to RFC 5952.
281281
return Uri.parse(
282282
internetAddress.type == InternetAddressType.IPv4
283-
? '${internetAddress.address}:$port'
284-
: '[${internetAddress.address}]:$port'
283+
? 'http://${internetAddress.address}:$port'
284+
: 'http://[${internetAddress.address}]:$port'
285285
);
286286
}
287287

packages/flutter_tools/pubspec.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@ dependencies:
1111
# To update these, use "flutter update-packages --force-upgrade".
1212
archive: 2.0.11
1313
args: 1.5.2
14-
dwds: 0.9.0
14+
dwds: 0.8.5
1515
completion: 0.2.1+1
1616
coverage: 0.13.3+3
1717
crypto: 2.1.3
1818
file: 5.1.0
1919
http: 0.12.0+4
2020
intl: 0.16.1
2121
json_rpc_2: 2.1.0
22-
linter: 0.1.109
2322
meta: 1.1.8
2423
multicast_dns: 0.2.2
2524
mustache: 1.1.1
@@ -129,4 +128,4 @@ dartdoc:
129128
# Exclude this package from the hosted API docs.
130129
nodoc: true
131130

132-
# PUBSPEC CHECKSUM: 8f2f
131+
# PUBSPEC CHECKSUM: 7cef

0 commit comments

Comments
 (0)