From 2bc40b39dcf9301d336cfa60548c59b563cdbb8c Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Thu, 27 Feb 2025 13:21:18 -0600 Subject: [PATCH] [web_ui] dependency cleanup (#164256) Update dependencies across 3 web engine packages Remove unneeded dependencies One set of associated code fixes --- .../lib/web_ui/dev/webdriver_browser.dart | 13 ++++++----- engine/src/flutter/lib/web_ui/pubspec.yaml | 22 +++++++++---------- .../web_sdk/web_engine_tester/pubspec.yaml | 9 ++++---- .../web_sdk/web_test_utils/pubspec.yaml | 11 ++-------- 4 files changed, 25 insertions(+), 30 deletions(-) diff --git a/engine/src/flutter/lib/web_ui/dev/webdriver_browser.dart b/engine/src/flutter/lib/web_ui/dev/webdriver_browser.dart index ab4d32e331..ad0b9d1d7a 100644 --- a/engine/src/flutter/lib/web_ui/dev/webdriver_browser.dart +++ b/engine/src/flutter/lib/web_ui/dev/webdriver_browser.dart @@ -5,6 +5,7 @@ import 'dart:async'; import 'dart:io'; import 'dart:math'; +import 'dart:typed_data'; import 'package:image/image.dart'; import 'package:webdriver/async_io.dart' show WebDriver; @@ -63,13 +64,15 @@ class WebDriverBrowser extends Browser { @override Future captureScreenshot(Rectangle region) async { - final Image image = decodePng(await _driver.captureScreenshotAsList())!; + // The underlying return type is Uint8Lint – goto definitions to see + // Fixing in https://github.com/google/webdriver.dart/pull/323 + final Image image = decodePng(await _driver.captureScreenshotAsList() as Uint8List)!; return copyCrop( image, - region.left.round(), - region.top.round(), - region.width.round(), - region.height.round(), + x: region.left.round(), + y: region.top.round(), + width: region.width.round(), + height: region.height.round(), ); } } diff --git a/engine/src/flutter/lib/web_ui/pubspec.yaml b/engine/src/flutter/lib/web_ui/pubspec.yaml index 06f585c97d..6c5699c888 100644 --- a/engine/src/flutter/lib/web_ui/pubspec.yaml +++ b/engine/src/flutter/lib/web_ui/pubspec.yaml @@ -18,34 +18,34 @@ dependencies: path: ../../third_party/web_test_fonts dev_dependencies: - archive: 3.6.1 + archive: 4.0.3 args: any async: any convert: any crypto: any - html: 0.15.4 - http: 1.1.0 + html: 0.15.5 + http: 1.3.0 http_multi_server: any - image: 3.0.1 + image: 4.5.3 package_config: any - path: 1.8.0 + path: 1.9.1 pool: any - quiver: 3.2.1 + quiver: 3.2.2 shelf: any shelf_packages_handler: any shelf_static: any shelf_web_socket: any stack_trace: any - stream_channel: 2.1.1 - test: 1.25.8 + stream_channel: 2.1.4 + test: 1.25.15 test_api: any test_core: any typed_data: any - watcher: 1.1.0 + watcher: 1.1.1 web_socket_channel: any - webdriver: 3.0.3 + webdriver: 3.1.0 webkit_inspection_protocol: any - yaml: 3.0.0 + yaml: 3.1.3 web_test_utils: path: ../../web_sdk/web_test_utils web_engine_tester: diff --git a/engine/src/flutter/web_sdk/web_engine_tester/pubspec.yaml b/engine/src/flutter/web_sdk/web_engine_tester/pubspec.yaml index 7b86604a1f..3acfa6b78d 100644 --- a/engine/src/flutter/web_sdk/web_engine_tester/pubspec.yaml +++ b/engine/src/flutter/web_sdk/web_engine_tester/pubspec.yaml @@ -5,10 +5,9 @@ environment: sdk: ^3.7.0-0 dependencies: - js: ^0.7.0 - stream_channel: 2.1.1 - test: 1.25.8 - webkit_inspection_protocol: 1.0.0 - stack_trace: 1.10.0 + stream_channel: 2.1.4 + test: 1.25.15 + webkit_inspection_protocol: 1.2.1 + stack_trace: 1.12.1 ui: path: ../../lib/web_ui diff --git a/engine/src/flutter/web_sdk/web_test_utils/pubspec.yaml b/engine/src/flutter/web_sdk/web_test_utils/pubspec.yaml index 245582bc9d..1a82e281d8 100644 --- a/engine/src/flutter/web_sdk/web_test_utils/pubspec.yaml +++ b/engine/src/flutter/web_sdk/web_test_utils/pubspec.yaml @@ -5,17 +5,10 @@ environment: sdk: ^3.7.0-0 dependencies: - collection: 1.17.0 - crypto: 3.0.3 - image: 3.0.1 - js: ^0.7.0 - meta: ^1.7.0 - path: 1.8.0 - process: 4.2.3 + image: 4.5.3 + path: 1.9.1 skia_gold_client: path: ../../testing/skia_gold_client - typed_data: 1.3.0 - yaml: 3.0.0 dependency_overrides: engine_repo_tools: