feat(web): update to web: ^1.0.0 (#13200)

* feat(web): update to web 1.0.0 * update example apps * update JS Interop * update CI * Update other packages dependencies * fix typing * test: skip app check `activate()` on web * analyse issue * test: revert skip * test: move app check web to seperate test runner * test: update app check test runner * test: use macos runner * chore: remove code comment * test: update e2e tests for web * update * update * test: fix app-check test runner * chore: improve logic * revert logic * test: update test running implementation * test: use debug token for app check --------- Co-authored-by: russellwheatley <russellwheatley85@gmail.com>
firebase · Sep 10, 2024 · 8fab04a · 8fab04a
1 parent 6969e48
commit 8fab04a
Show file tree

Hide file tree

Showing 28 changed files with 60 additions and 62 deletions.
diff --git a/.github/workflows/e2e_tests.yaml b/.github/workflows/e2e_tests.yaml
@@ -359,8 +359,7 @@ jobs:
           java-version: '17'
       - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
         with:
-          # TODO: Remove this once WASM is on stable.
-          channel: 'master'
+          channel: 'stable'
           cache: true
       - uses: bluefireteam/melos-action@7e70fbe34bbd91a75eb505eeb4174b0ac9a1df52
         with:

diff --git a/packages/cloud_firestore/cloud_firestore_web/pubspec.yaml b/packages/cloud_firestore/cloud_firestore_web/pubspec.yaml
@@ -6,8 +6,8 @@ repository: https://github.com/firebase/flutterfire/tree/main/packages/cloud_fir
 version: 4.2.0
 
 environment:
-  sdk: '>=3.2.0 <4.0.0'
-  flutter: '>=3.3.0'
+  sdk: '>=3.4.0 <4.0.0'
+  flutter: '>=3.22.0'
 
 dependencies:
   _flutterfire_internals: ^1.3.41

diff --git a/packages/cloud_functions/cloud_functions_web/pubspec.yaml b/packages/cloud_functions/cloud_functions_web/pubspec.yaml
@@ -6,8 +6,8 @@ repository: https://github.com/firebase/flutterfire/tree/main/packages/cloud_fun
 version: 4.9.12
 
 environment:
-  sdk: '>=3.2.0 <4.0.0'
-  flutter: '>=3.3.0'
+  sdk: '>=3.4.0 <4.0.0'
+  flutter: '>=3.22.0'
 
 dependencies:
   cloud_functions_platform_interface: ^5.5.34

diff --git a/packages/firebase_analytics/firebase_analytics_web/lib/interop/analytics.dart b/packages/firebase_analytics/firebase_analytics_web/lib/interop/analytics.dart
@@ -40,7 +40,7 @@ class Analytics extends JsObjectWrapper<analytics_interop.AnalyticsJsImpl> {
 
   static Future<bool> isSupported() async {
     final result = await analytics_interop.isSupported().toDart;
-    return (result! as JSBoolean).toDart;
+    return result.toDart;
   }
 
   /// Non-null App for this instance of analytics service.

diff --git a/packages/firebase_analytics/firebase_analytics_web/lib/interop/analytics_interop.dart b/packages/firebase_analytics/firebase_analytics_web/lib/interop/analytics_interop.dart
@@ -24,7 +24,7 @@ external AnalyticsJsImpl initializeAnalytics(
 
 @JS()
 @staticInterop
-external JSPromise /* bool */ isSupported();
+external JSPromise<JSBoolean> isSupported();
 
 @JS()
 @staticInterop

diff --git a/packages/firebase_analytics/firebase_analytics_web/pubspec.yaml b/packages/firebase_analytics/firebase_analytics_web/pubspec.yaml
@@ -5,8 +5,8 @@ repository: https://github.com/firebase/flutterfire/tree/main/packages/firebase_
 version: 0.5.9+2
 
 environment:
-  sdk: '>=3.2.0 <4.0.0'
-  flutter: '>=3.3.0'
+  sdk: '>=3.4.0 <4.0.0'
+  flutter: '>=3.22.0'
 
 dependencies:
   _flutterfire_internals: ^1.3.41

diff --git a/packages/firebase_app_check/firebase_app_check_web/pubspec.yaml b/packages/firebase_app_check/firebase_app_check_web/pubspec.yaml
@@ -4,8 +4,8 @@ homepage: https://github.com/firebase/flutterfire/tree/main/packages/firebase_ap
 version: 0.1.2+13
 
 environment:
-  sdk: '>=3.2.0 <4.0.0'
-  flutter: '>=3.3.0'
+  sdk: '>=3.4.0 <4.0.0'
+  flutter: '>=3.22.0'
 
 dependencies:
   _flutterfire_internals: ^1.3.41
@@ -16,7 +16,7 @@ dependencies:
     sdk: flutter
   flutter_web_plugins:
     sdk: flutter
-  web: ^0.5.1
+  web: ^1.0.0
 
 dev_dependencies:
   build_runner: ^2.3.3

diff --git a/...ebase_app_installations/firebase_app_installations_web/lib/src/interop/installations.dart b/...ebase_app_installations/firebase_app_installations_web/lib/src/interop/installations.dart
@@ -34,12 +34,12 @@ class Installations
 
   Future<String> getId() => (installations_interop.getId(jsObject))
       .toDart
-      .then((value) => value! as String);
+      .then((value) => value as String);
 
   Future<String> getToken([bool forceRefresh = false]) =>
       (installations_interop.getToken(jsObject, forceRefresh.toJS))
           .toDart
-          .then((value) => value! as String);
+          .then((value) => value as String);
 
   JSFunction? _onIdChangedUnsubscribe;
 

diff --git a/...p_installations/firebase_app_installations_web/lib/src/interop/installations_interop.dart b/...p_installations/firebase_app_installations_web/lib/src/interop/installations_interop.dart
@@ -15,11 +15,11 @@ external InstallationsJsImpl getInstallations([AppJsImpl? app]);
 
 @JS()
 @staticInterop
-external JSPromise /* String */ getId(InstallationsJsImpl installations);
+external JSPromise<JSString> getId(InstallationsJsImpl installations);
 
 @JS()
 @staticInterop
-external JSPromise /* String */ getToken(InstallationsJsImpl installations,
+external JSPromise<JSString> getToken(InstallationsJsImpl installations,
     [JSBoolean? forceRefresh]);
 
 @JS()

diff --git a/packages/firebase_app_installations/firebase_app_installations_web/pubspec.yaml b/packages/firebase_app_installations/firebase_app_installations_web/pubspec.yaml
@@ -5,8 +5,8 @@ homepage: https://github.com/firebase/flutterfire/tree/main/packages/firebase_ap
 repository: https://github.com/firebase/flutterfire/tree/main/packages/firebase_app_installations/firebase_app_installations_web
 
 environment:
-  sdk: '>=3.2.0 <4.0.0'
-  flutter: '>=3.3.0'
+  sdk: '>=3.4.0 <4.0.0'
+  flutter: '>=3.22.0'
 
 dependencies:
   _flutterfire_internals: ^1.3.41

diff --git a/...firebase_auth/firebase_auth_web/lib/src/firebase_auth_web_recaptcha_verifier_factory.dart b/...firebase_auth/firebase_auth_web/lib/src/firebase_auth_web_recaptcha_verifier_factory.dart
@@ -100,7 +100,7 @@ class RecaptchaVerifierFactoryWeb extends RecaptchaVerifierFactoryPlatform {
     }
 
     _delegate = auth_interop.RecaptchaVerifier(
-      element,
+      element.toJS,
       parameters,
       auth.delegate,
     );

diff --git a/packages/firebase_auth/firebase_auth_web/lib/src/interop/auth.dart b/packages/firebase_auth/firebase_auth_web/lib/src/interop/auth.dart
@@ -576,7 +576,7 @@ class Auth extends JsObjectWrapper<auth_interop.AuthJsImpl> {
   Future<List<String>> fetchSignInMethodsForEmail(String email) => auth_interop
       .fetchSignInMethodsForEmail(jsObject, email.toJS)
       .toDart
-      .then((value) => List<String>.from((value! as JSArray).toDart));
+      .then((value) => List<String>.from(value.toDart));
 
   /// Checks if an incoming link is a sign-in with email link.
   bool isSignInWithEmailLink(String emailLink) =>
@@ -1168,7 +1168,7 @@ class RecaptchaVerifier
   ///       }
   ///     });
   factory RecaptchaVerifier(
-      container, Map<String, dynamic> parameters, Auth auth) {
+      JSAny container, Map<String, dynamic> parameters, Auth auth) {
     return RecaptchaVerifier.fromJsObject(
       auth_interop.RecaptchaVerifierJsImpl(
         auth.jsObject,

diff --git a/packages/firebase_auth/firebase_auth_web/lib/src/interop/auth_interop.dart b/packages/firebase_auth/firebase_auth_web/lib/src/interop/auth_interop.dart
@@ -84,8 +84,8 @@ external JSPromise deleteUser(
 );
 
 @JS()
-// Promise<List>
-external JSPromise fetchSignInMethodsForEmail(AuthJsImpl auth, JSString email);
+external JSPromise<JSArray<JSString>> fetchSignInMethodsForEmail(
+    AuthJsImpl auth, JSString email);
 
 @JS()
 external JSBoolean isSignInWithEmailLink(JSString emailLink);

diff --git a/packages/firebase_auth/firebase_auth_web/pubspec.yaml b/packages/firebase_auth/firebase_auth_web/pubspec.yaml
@@ -5,8 +5,8 @@ repository: https://github.com/firebase/flutterfire/tree/main/packages/firebase_
 version: 5.12.6
 
 environment:
-  sdk: '>=3.2.0 <4.0.0'
-  flutter: '>=3.16.0'
+  sdk: '>=3.4.0 <4.0.0'
+  flutter: '>=3.22.0'
 
 dependencies:
   firebase_auth_platform_interface: ^7.4.4
@@ -18,7 +18,7 @@ dependencies:
     sdk: flutter
   http_parser: ^4.0.0
   meta: ^1.8.0
-  web: ^0.5.1
+  web: ^1.0.0
 
 dev_dependencies:
   flutter_test:

diff --git a/packages/firebase_core/firebase_core_web/pubspec.yaml b/packages/firebase_core/firebase_core_web/pubspec.yaml
@@ -5,8 +5,8 @@ repository: https://github.com/firebase/flutterfire/tree/main/packages/firebase_
 version: 2.17.5
 
 environment:
-  sdk: '>=3.2.0 <4.0.0'
-  flutter: '>=3.16.0'
+  sdk: '>=3.4.0 <4.0.0'
+  flutter: '>=3.22.0'
 
 dependencies:
   firebase_core_platform_interface: ^5.2.1
@@ -15,7 +15,7 @@ dependencies:
   flutter_web_plugins:
     sdk: flutter
   meta: ^1.8.0
-  web: ^0.5.1
+  web: ^1.0.0
 
 dev_dependencies:
   flutter_test:

diff --git a/packages/firebase_database/firebase_database_web/pubspec.yaml b/packages/firebase_database/firebase_database_web/pubspec.yaml
@@ -4,8 +4,8 @@ version: 0.2.5+14
 homepage: https://github.com/firebase/flutterfire/tree/main/packages/firebase_database/firebase_database_web
 
 environment:
-  sdk: '>=3.2.0 <4.0.0'
-  flutter: '>=3.3.0'
+  sdk: '>=3.4.0 <4.0.0'
+  flutter: '>=3.22.0'
 
 dependencies:
   collection: ^1.18.0

diff --git a/packages/firebase_messaging/firebase_messaging_web/lib/src/interop/messaging.dart b/packages/firebase_messaging/firebase_messaging_web/lib/src/interop/messaging.dart
@@ -31,10 +31,8 @@ class Messaging extends JsObjectWrapper<messaging_interop.MessagingJsImpl> {
     return _expando[jsObject] ??= Messaging._fromJsObject(jsObject);
   }
 
-  static Future<bool> isSupported() => messaging_interop
-      .isSupported()
-      .toDart
-      .then((value) => (value! as JSBoolean).toDart);
+  static Future<bool> isSupported() =>
+      messaging_interop.isSupported().toDart.then((value) => value.toDart);
 
   Messaging._fromJsObject(messaging_interop.MessagingJsImpl jsObject)
       : super.fromJsObject(jsObject);
@@ -47,14 +45,14 @@ class Messaging extends JsObjectWrapper<messaging_interop.MessagingJsImpl> {
   /// that can be used to send push messages to this user.
   Future<String> getToken({String? vapidKey}) async {
     try {
-      final token = ((await messaging_interop
+      final token = (await messaging_interop
               .getToken(
                   jsObject,
                   vapidKey == null
                       ? null
                       : messaging_interop.GetTokenOptions(
                           vapidKey: vapidKey.toJS))
-              .toDart)! as JSString)
+              .toDart)
           .toDart;
       return token;
     } catch (err) {

diff --git a/packages/firebase_messaging/firebase_messaging_web/lib/src/interop/messaging_interop.dart b/packages/firebase_messaging/firebase_messaging_web/lib/src/interop/messaging_interop.dart
@@ -18,16 +18,16 @@ external MessagingJsImpl getMessaging([AppJsImpl? app]);
 
 @JS()
 @staticInterop
-external JSPromise /* bool */ deleteToken(MessagingJsImpl messaging);
+external JSPromise<JSBoolean> deleteToken(MessagingJsImpl messaging);
 
 @JS()
 @staticInterop
-external JSPromise /* String */ getToken(
+external JSPromise<JSString> getToken(
     MessagingJsImpl messaging, GetTokenOptions? getTokenOptions);
 
 @JS('isSupported')
 @staticInterop
-external JSPromise /* bool */ isSupported();
+external JSPromise<JSBoolean> isSupported();
 
 @JS()
 @staticInterop

diff --git a/packages/firebase_messaging/firebase_messaging_web/pubspec.yaml b/packages/firebase_messaging/firebase_messaging_web/pubspec.yaml
@@ -5,8 +5,8 @@ repository: https://github.com/firebase/flutterfire/tree/main/packages/firebase_
 version: 3.8.13
 
 environment:
-  sdk: '>=3.2.0 <4.0.0'
-  flutter: '>=3.3.0'
+  sdk: '>=3.4.0 <4.0.0'
+  flutter: '>=3.22.0'
 
 dependencies:
   _flutterfire_internals: ^1.3.41
@@ -18,7 +18,7 @@ dependencies:
   flutter_web_plugins:
     sdk: flutter
   meta: ^1.8.0
-  web: ^0.5.1
+  web: ^1.0.0
 
 dev_dependencies:
   firebase_core_platform_interface: ^5.2.1

diff --git a/packages/firebase_performance/firebase_performance_web/pubspec.yaml b/packages/firebase_performance/firebase_performance_web/pubspec.yaml
@@ -4,8 +4,8 @@ homepage: https://github.com/firebase/flutterfire/tree/main/packages/firebase_pe
 version: 0.1.6+13
 
 environment:
-  sdk: '>=3.2.0 <4.0.0'
-  flutter: '>=3.3.0'
+  sdk: '>=3.4.0 <4.0.0'
+  flutter: '>=3.22.0'
 
 dependencies:
   _flutterfire_internals: ^1.3.41

diff --git a/...base_remote_config/firebase_remote_config_web/lib/src/interop/firebase_remote_config.dart b/...base_remote_config/firebase_remote_config_web/lib/src/interop/firebase_remote_config.dart
@@ -86,7 +86,7 @@ class RemoteConfig
   Future<bool> activate() async => remote_config_interop
       .activate(jsObject)
       .toDart
-      .then((value) => (value! as JSBoolean).toDart);
+      .then((value) => value.toDart);
 
   ///  Ensures the last activated config are available to the getters.
   Future<void> ensureInitialized() async =>
@@ -101,7 +101,7 @@ class RemoteConfig
   /// If the fetched configs were already activated, the promise will resolve to false.
   Future<bool> fetchAndActivate() async =>
       remote_config_interop.fetchAndActivate(jsObject).toDart.then(
-            (value) => (value! as JSBoolean).toDart,
+            (value) => value.toDart,
           );
 
   /// Returns all config values.

diff --git a/...ote_config/firebase_remote_config_web/lib/src/interop/firebase_remote_config_interop.dart b/...ote_config/firebase_remote_config_web/lib/src/interop/firebase_remote_config_interop.dart
@@ -17,15 +17,15 @@ external RemoteConfigJsImpl getRemoteConfig([AppJsImpl? app]);
 
 @JS()
 @staticInterop
-external JSPromise /* bool */ activate(RemoteConfigJsImpl remoteConfig);
+external JSPromise<JSBoolean> activate(RemoteConfigJsImpl remoteConfig);
 
 @JS()
 @staticInterop
 external JSPromise ensureInitialized(RemoteConfigJsImpl remoteConfig);
 
 @JS()
 @staticInterop
-external JSPromise /* bool */ fetchAndActivate(RemoteConfigJsImpl remoteConfig);
+external JSPromise<JSBoolean> fetchAndActivate(RemoteConfigJsImpl remoteConfig);
 
 @JS()
 @staticInterop

diff --git a/packages/firebase_remote_config/firebase_remote_config_web/pubspec.yaml b/packages/firebase_remote_config/firebase_remote_config_web/pubspec.yaml
@@ -6,8 +6,8 @@ repository: https://github.com/firebase/flutterfire/tree/main/packages/firebase_
 version: 1.6.13
 
 environment:
-  sdk: '>=3.2.0 <4.0.0'
-  flutter: '>=3.3.0'
+  sdk: '>=3.4.0 <4.0.0'
+  flutter: '>=3.22.0'
 
 dependencies:
   firebase_core: ^3.4.0

diff --git a/packages/firebase_storage/firebase_storage/example/pubspec.yaml b/packages/firebase_storage/firebase_storage/example/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_storage_example
 description: Demonstrates how to use the firebase_storage plugin.
 
 environment:
-  sdk: '>=3.2.0 <4.0.0'
+  sdk: '>=3.4.0 <4.0.0'
 
 dependencies:
   firebase_core: ^3.4.0
@@ -11,7 +11,7 @@ dependencies:
     sdk: flutter
   image_picker: ^1.0.2
   image_picker_for_web: ^2.1.12
-  web: ^0.5.1
+  web: ^1.0.0
 
 flutter:
   uses-material-design: true

diff --git a/packages/firebase_storage/firebase_storage_web/lib/src/interop/storage.dart b/packages/firebase_storage/firebase_storage_web/lib/src/interop/storage.dart
@@ -134,7 +134,7 @@ class StorageReference
   /// Returns a long lived download URL for this reference.
   Future<Uri> getDownloadURL() async {
     final uriString = await storage_interop.getDownloadURL(jsObject).toDart;
-    final dartString = (uriString! as JSString).toDart;
+    final dartString = uriString.toDart;
     return Uri.parse(dartString);
   }
 

diff --git a/packages/firebase_storage/firebase_storage_web/lib/src/interop/storage_interop.dart b/packages/firebase_storage/firebase_storage_web/lib/src/interop/storage_interop.dart
@@ -28,17 +28,17 @@ external JSPromise /* void */ deleteObject(ReferenceJsImpl ref);
 
 @JS()
 @staticInterop
-external JSPromise /* String */ getBlob(ReferenceJsImpl ref,
+external JSPromise<JSString> getBlob(ReferenceJsImpl ref,
     [JSNumber? maxDownloadSizeBytes]);
 
 @JS()
 @staticInterop
-external JSPromise /* List<String> */ getBytes(ReferenceJsImpl ref,
+external JSPromise<JSArray<JSString>> getBytes(ReferenceJsImpl ref,
     [JSNumber? maxDownloadSizeBytes]);
 
 @JS()
 @staticInterop
-external JSPromise /* String */ getDownloadURL(ReferenceJsImpl ref);
+external JSPromise<JSString> getDownloadURL(ReferenceJsImpl ref);
 
 @JS()
 @staticInterop