Merge pull request #2987 from devee-dev/master

switch to package:web to support wasm compilation

@@ -612,9 +612,12 @@ class GetDelegate extends RouterDelegate<RouteDecoder>
   }) async {
   }) async {
     // remove history or page entries until you meet route
     // remove history or page entries until you meet route
     var iterator = currentConfiguration;
     var iterator = currentConfiguration;
-    while (_canPop(popMode) &&
-        iterator != null &&
-        iterator.pageSettings?.name != fullRoute) {
+    while (_canPop(popMode) && iterator != null) {
+      //the next line causes wasm compile error if included in the while loop
+      //https://github.com/flutter/flutter/issues/140110
+      if (iterator.pageSettings?.name == fullRoute) {
+        break;
+      }
       await _pop(popMode, null);
       await _pop(popMode, null);
       // replace iterator
       // replace iterator
       iterator = currentConfiguration;
       iterator = currentConfiguration;

@@ -40,7 +40,7 @@ extension PageArgExt on BuildContext {
   String get location {
   String get location {
     final parser = router.routeInformationParser;
     final parser = router.routeInformationParser;
     final config = delegate.currentConfiguration;
     final config = delegate.currentConfiguration;
-    return parser?.restoreRouteInformation(config)?.location ?? '/';
+    return parser?.restoreRouteInformation(config)?.uri.toString() ?? '/';
   }
   }
 
 
   GetDelegate get delegate {
   GetDelegate get delegate {

 // ignore: avoid_web_libraries_in_flutter
 // ignore: avoid_web_libraries_in_flutter
-import 'dart:html' as html;
+import 'package:web/web.dart' as html;
 
 
 import '../../get_utils.dart';
 import '../../get_utils.dart';
 
 
@@ -25,7 +25,7 @@ class GeneralPlatform {
   static bool get isIOS {
   static bool get isIOS {
     // maxTouchPoints is needed to separate iPad iOS13 vs new MacOS
     // maxTouchPoints is needed to separate iPad iOS13 vs new MacOS
     return GetUtils.hasMatch(_navigator.platform, r'/iPad|iPhone|iPod/') ||
     return GetUtils.hasMatch(_navigator.platform, r'/iPad|iPhone|iPod/') ||
-        (_navigator.platform == 'MacIntel' && _navigator.maxTouchPoints! > 1);
+        (_navigator.platform == 'MacIntel' && _navigator.maxTouchPoints > 1);
   }
   }
 
 
   static bool get isFuchsia => false;
   static bool get isFuchsia => false;

@@ -11,6 +11,7 @@ dependencies:
     sdk: flutter
     sdk: flutter
   flutter_web_plugins:
   flutter_web_plugins:
     sdk: flutter
     sdk: flutter
+  web: any
 
 
 dev_dependencies:
 dev_dependencies:
   flutter_lints: ^2.0.3
   flutter_lints: ^2.0.3