Merge pull request #810 from svenopdehipt/master

Update flutter code to use js_interop

Author: lohanidamodar

templates/flutter/lib/src/client.dart.twig

@@ -1,6 +1,6 @@
 import 'enums.dart';
 import 'client_stub.dart'
-    if (dart.library.html) 'client_browser.dart'
+    if (dart.library.js_interop) 'client_browser.dart'
     if (dart.library.io) 'client_io.dart';
 import 'response.dart';
 import 'upload_progress.dart';

templates/flutter/lib/src/client_browser.dart.twig

@@ -3,7 +3,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter_web_auth_2/flutter_web_auth_2.dart';
 import 'package:http/http.dart' as http;
 import 'package:http/browser_client.dart';
-import 'package:universal_html/html.dart' as html;
+import 'package:web/web.dart' as web;
 import 'client_mixin.dart';
 import 'enums.dart';
 import 'exception.dart';
@@ -99,9 +99,9 @@ class ClientBrowser extends ClientBase with ClientMixin {
   }
 
   Future init() async {
-    if (html.window.localStorage.keys.contains('cookieFallback')) {
-      addHeader('x-fallback-cookies',
-          html.window.localStorage['cookieFallback'] ?? '');
+    final cookieFallback = web.window.localStorage['cookieFallback'];
+    if (cookieFallback != null) {
+      addHeader('x-fallback-cookies', cookieFallback);
     }
     _httpClient.withCredentials = true;
   }
@@ -199,7 +199,7 @@ class ClientBrowser extends ClientBase with ClientMixin {
         debugPrint(
             '{{spec.title | caseUcfirst}} is using localStorage for session management. Increase your security by adding a custom domain as your API endpoint.');
         addHeader('X-Fallback-Cookies', cookieFallback);
-        html.window.localStorage['cookieFallback'] = cookieFallback;
+        web.window.localStorage['cookieFallback'] = cookieFallback;
       }
       return prepareResponse(res, responseType: responseType);
     } catch (e) {

templates/flutter/lib/src/realtime.dart.twig

@@ -1,5 +1,5 @@
 import 'realtime_stub.dart'
-    if (dart.library.html) 'realtime_browser.dart'
+    if (dart.library.js_interop) 'realtime_browser.dart'
     if (dart.library.io) 'realtime_io.dart';
 import 'realtime_subscription.dart';
 import 'service.dart';

templates/flutter/lib/src/realtime_browser.dart.twig

@@ -1,6 +1,6 @@
 import 'dart:convert';
 import 'dart:async';
-import 'package:universal_html/html.dart' as html;
+import 'package:web/web.dart' as web;
 import 'package:web_socket_channel/html.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';
 import 'realtime_subscription.dart';
@@ -26,7 +26,7 @@ class RealtimeBrowser extends RealtimeBase with RealtimeMixin {
   }
 
   String? _getFallbackCookie() {
-    final fallbackCookie = html.window.localStorage['cookieFallback'];
+    final fallbackCookie = web.window.localStorage['cookieFallback'];
     if (fallbackCookie != null) {
       final cookie = Map<String, dynamic>.from(jsonDecode(fallbackCookie));
       return cookie.values.first;

templates/flutter/pubspec.yaml.twig

@@ -25,7 +25,7 @@ dependencies:
   package_info_plus: ^8.0.0
   path_provider: ^2.1.3
   web_socket_channel: ^2.4.5
-  universal_html: ^2.2.4
+  web: ^0.5.1
 
 dev_dependencies:
   path_provider_platform_interface: ^2.1.2