From caf8e0d8e5a25115781ead2b061ebb16baf9f4db Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 10 Jun 2025 13:24:44 -0400 Subject: [PATCH 1/3] Roll Flutter master to 7e30df2225 --- .ci/flutter_master.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index b1282ca8bd6..42614a2ea99 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -8b22f67c85114def3f090286c386627efdf59614 +7e30df2225f65141e0227e424986311b79d39505 From 05711090b8e66bbb4f507e3e90b8e4bc598e5a96 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 10 Jun 2025 15:37:02 -0400 Subject: [PATCH 2/3] Disable hot reload in web drive tests --- script/tool/lib/src/drive_examples_command.dart | 5 +++++ script/tool/test/drive_examples_command_test.dart | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/script/tool/lib/src/drive_examples_command.dart b/script/tool/lib/src/drive_examples_command.dart index 3033d389faf..cd1513afb4e 100644 --- a/script/tool/lib/src/drive_examples_command.dart +++ b/script/tool/lib/src/drive_examples_command.dart @@ -140,6 +140,11 @@ class DriveExamplesCommand extends PackageLoopingCommand { platformWeb: [ '-d', 'web-server', + // TODO(stuartmorgan): Remove once drive works without it. See + // https://github.com/dart-lang/sdk/issues/60289 and + // https://github.com/flutter/flutter/pull/169174 + if (platform.environment['CHANNEL']?.toLowerCase() == 'master') + '--no-web-experimental-hot-reload', '--web-port=7357', '--browser-name=chrome', if (useWasm) '--wasm', diff --git a/script/tool/test/drive_examples_command_test.dart b/script/tool/test/drive_examples_command_test.dart index 97c7e838d19..8320a91f745 100644 --- a/script/tool/test/drive_examples_command_test.dart +++ b/script/tool/test/drive_examples_command_test.dart @@ -840,6 +840,7 @@ void main() { 'drive', '-d', 'web-server', + '--no-web-experimental-hot-reload', '--web-port=7357', '--browser-name=chrome', '--screenshot=/path/to/logs/plugin_example-drive', @@ -891,6 +892,7 @@ void main() { 'drive', '-d', 'web-server', + '--no-web-experimental-hot-reload', '--web-port=7357', '--browser-name=chrome', '--wasm', @@ -941,6 +943,7 @@ void main() { 'drive', '-d', 'web-server', + '--no-web-experimental-hot-reload', '--web-port=7357', '--browser-name=chrome', '--screenshot=/path/to/logs/plugin_example-drive', @@ -993,6 +996,7 @@ void main() { 'drive', '-d', 'web-server', + '--no-web-experimental-hot-reload', '--web-port=7357', '--browser-name=chrome', '--chrome-binary=/path/to/chrome', @@ -1444,6 +1448,7 @@ void main() { 'drive', '-d', 'web-server', + '--no-web-experimental-hot-reload', '--web-port=7357', '--browser-name=chrome', '--screenshot=/path/to/logs/plugin_example-drive', @@ -1459,6 +1464,7 @@ void main() { 'drive', '-d', 'web-server', + '--no-web-experimental-hot-reload', '--web-port=7357', '--browser-name=chrome', '--screenshot=/path/to/logs/plugin_example-drive', @@ -1558,6 +1564,7 @@ void main() { 'drive', '-d', 'web-server', + '--no-web-experimental-hot-reload', '--web-port=7357', '--browser-name=chrome', '--screenshot=/path/to/logs/a_package_example-drive', @@ -1603,6 +1610,7 @@ void main() { 'drive', '-d', 'web-server', + '--no-web-experimental-hot-reload', '--web-port=7357', '--browser-name=chrome', '--driver', @@ -1682,6 +1690,7 @@ void main() { 'drive', '-d', 'web-server', + '--no-web-experimental-hot-reload', '--web-port=7357', '--browser-name=chrome', '--screenshot=/path/to/logs/a_package_example_with_web-drive', From 5788ce524340167a369182f28dd55f83b5970919 Mon Sep 17 00:00:00 2001 From: stuartmorgan-g Date: Tue, 10 Jun 2025 15:56:14 -0400 Subject: [PATCH 3/3] Remove the channel gate --- script/tool/lib/src/drive_examples_command.dart | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/script/tool/lib/src/drive_examples_command.dart b/script/tool/lib/src/drive_examples_command.dart index cd1513afb4e..249712db8d7 100644 --- a/script/tool/lib/src/drive_examples_command.dart +++ b/script/tool/lib/src/drive_examples_command.dart @@ -143,8 +143,7 @@ class DriveExamplesCommand extends PackageLoopingCommand { // TODO(stuartmorgan): Remove once drive works without it. See // https://github.com/dart-lang/sdk/issues/60289 and // https://github.com/flutter/flutter/pull/169174 - if (platform.environment['CHANNEL']?.toLowerCase() == 'master') - '--no-web-experimental-hot-reload', + '--no-web-experimental-hot-reload', '--web-port=7357', '--browser-name=chrome', if (useWasm) '--wasm',