WIP: drop dart:js_util, require Dart 3.3

Author: kevmoo

packages/shared_preferences/shared_preferences_web/example/integration_test/shared_preferences_web_test.dart

@@ -9,8 +9,7 @@ import 'package:shared_preferences_platform_interface/shared_preferences_platfor
 import 'package:shared_preferences_platform_interface/types.dart';
 import 'package:shared_preferences_web/shared_preferences_web.dart';
 import 'package:shared_preferences_web/src/keys_extension.dart';
-
-import 'package:web/helpers.dart' as html;
+import 'package:web/web.dart' as html;
 
 void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();

packages/url_launcher/url_launcher_web/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.2.4
+
+* Updates minimum supported SDK version to Flutter 3.19.0/Dart 3.3.0.
+* Require `package:web` `^0.5.0`.
+* Remove use of Wasm-incompatible `dart:js_util`.
+
 ## 2.2.3
 
 * Fixes new lint warnings.

packages/url_launcher/url_launcher_web/example/integration_test/link_widget_test.dart

@@ -2,15 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:js_util';
+import 'dart:js_interop';
+import 'dart:js_interop_unsafe';
 import 'dart:ui_web' as ui_web;
 
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:url_launcher_platform_interface/link.dart';
 import 'package:url_launcher_web/src/link.dart';
-import 'package:web/helpers.dart' as html;
+import 'package:web/web.dart' as html;
 
 void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
@@ -177,7 +178,7 @@ html.Element _findSingleAnchor() {
   html.NodeList anchors = html.document.querySelectorAll('a');
   for (int i = 0; i < anchors.length; i++) {
     final html.Element anchor = anchors.item(i)! as html.Element;
-    if (hasProperty(anchor, linkViewIdProperty)) {
+    if ((anchor as JSObject).hasProperty(linkViewIdProperty.toJS).toDart) {
       foundAnchors.add(anchor);
     }
   }
@@ -189,7 +190,7 @@ html.Element _findSingleAnchor() {
     anchors = shadowRoot.querySelectorAll('a');
     for (int i = 0; i < anchors.length; i++) {
       final html.Element anchor = anchors.item(i)! as html.Element;
-      if (hasProperty(anchor, linkViewIdProperty)) {
+      if ((anchor as JSObject).hasProperty(linkViewIdProperty.toJS).toDart) {
         foundAnchors.add(anchor);
       }
     }

packages/url_launcher/url_launcher_web/example/integration_test/url_launcher_web_test.dart

@@ -3,14 +3,13 @@
 // found in the LICENSE file.
 
 import 'dart:js_interop';
-import 'dart:js_util';
 
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:mockito/mockito.dart' show Mock, any, verify, when;
 import 'package:url_launcher_platform_interface/url_launcher_platform_interface.dart';
 import 'package:url_launcher_web/url_launcher_web.dart';
-import 'package:web/helpers.dart' as html;
+import 'package:web/web.dart' as html;
 
 abstract class MyWindow {
   html.Window? open(Object? a, Object? b, Object? c);
@@ -33,17 +32,17 @@ void main() {
   group('UrlLauncherPlugin', () {
     late MockWindow mockWindow;
     late MockNavigator mockNavigator;
+    late html.Window jsMockWindow;
 
     late UrlLauncherPlugin plugin;
 
     setUp(() {
       mockWindow = MockWindow();
       mockNavigator = MockNavigator();
 
-      final html.Window jsMockWindow =
-          createDartExport(mockWindow) as html.Window;
+      jsMockWindow = createJSInteropWrapper(mockWindow) as html.Window;
       final html.Navigator jsMockNavigator =
-          createDartExport(mockNavigator) as html.Navigator;
+          createJSInteropWrapper(mockNavigator) as html.Navigator;
 
       when(mockWindow.navigator).thenReturn(jsMockNavigator);
 
@@ -53,7 +52,7 @@ void main() {
       when(mockNavigator.userAgent).thenReturn(
           'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36');
 
-      plugin = UrlLauncherPlugin(debugWindow: mockWindow as html.Window);
+      plugin = UrlLauncherPlugin(debugWindow: jsMockWindow);
     });
 
     group('canLaunch', () {
@@ -185,7 +184,7 @@ void main() {
           when(mockNavigator.userAgent).thenReturn(
               'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.5.1 Safari/605.1.15');
           // Recreate the plugin, so it grabs the overrides from this group
-          plugin = UrlLauncherPlugin(debugWindow: mockWindow as html.Window);
+          plugin = UrlLauncherPlugin(debugWindow: jsMockWindow);
         });
 
         testWidgets('http urls should be launched in a new window',

packages/url_launcher/url_launcher_web/example/pubspec.yaml

@@ -18,4 +18,4 @@ dev_dependencies:
   url_launcher_platform_interface: ^2.2.0
   url_launcher_web:
     path: ../
-  web: '>=0.3.0 <0.5.0'
+  web: ^0.5.0

packages/url_launcher/url_launcher_web/lib/src/link.dart

@@ -3,7 +3,8 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:js_util';
+import 'dart:js_interop';
+import 'dart:js_interop_unsafe';
 import 'dart:ui_web' as ui_web;
 
 import 'package:flutter/foundation.dart';
@@ -12,7 +13,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
 import 'package:url_launcher_platform_interface/link.dart';
-import 'package:web/helpers.dart' as html;
+import 'package:web/web.dart' as html;
 
 /// The unique identifier for the view type to be used for link platform views.
 const String linkViewType = '__url_launcher::link';
@@ -172,7 +173,7 @@ class LinkViewController extends PlatformViewController {
 
   Future<void> _initialize() async {
     _element = html.document.createElement('a') as html.HTMLElement;
-    setProperty(_element, linkViewIdProperty, viewId);
+    (_element as JSObject)[linkViewIdProperty] = viewId.toJS;
     _element.style
       ..opacity = '0'
       ..display = 'block'
@@ -283,11 +284,9 @@ class LinkViewController extends PlatformViewController {
 int? getViewIdFromTarget(html.Event event) {
   final html.Element? linkElement = getLinkElementFromTarget(event);
   if (linkElement != null) {
-    // TODO(stuartmorgan): Remove this ignore (and change to getProperty<int>)
-    // once the templated version is available on stable. On master (2.8) this
-    // is already not necessary.
-    // ignore: return_of_invalid_type
-    return getProperty(linkElement, linkViewIdProperty);
+    return (linkElement as JSObject)
+        .getProperty<JSNumber>(linkViewIdProperty.toJS)
+        .toDartInt;
   }
   return null;
 }
@@ -316,5 +315,5 @@ html.Element? getLinkElementFromTarget(html.Event event) {
 bool isLinkElement(html.Element? element) {
   return element != null &&
       element.tagName == 'A' &&
-      hasProperty(element, linkViewIdProperty);
+      (element as JSObject).hasProperty(linkViewIdProperty.toJS).toDart;
 }

packages/url_launcher/url_launcher_web/pubspec.yaml

@@ -2,11 +2,11 @@ name: url_launcher_web
 description: Web platform implementation of url_launcher
 repository: https://github.com/flutter/packages/tree/main/packages/url_launcher/url_launcher_web
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+url_launcher%22
-version: 2.2.3
+version: 2.2.4
 
 environment:
-  sdk: ^3.2.0
-  flutter: ">=3.16.0"
+  sdk: ^3.3.0-0
+  flutter: ">=3.19.0-0"
 
 flutter:
   plugin:
@@ -22,7 +22,7 @@ dependencies:
   flutter_web_plugins:
     sdk: flutter
   url_launcher_platform_interface: ^2.2.0
-  web: '>=0.3.0 <0.5.0'
+  web: ^0.5.0
 
 dev_dependencies:
   flutter_test: