feat(firebase_core_web): decouple foundation imports and fix JS SDK interop (#18624)

Author: kevmoo

packages/firebase_core/firebase_core_web/lib/firebase_core_web.dart

@@ -11,8 +11,6 @@ import 'package:firebase_core_platform_interface/firebase_core_platform_interfac
 import 'package:firebase_core_web/src/firebase_core_version.dart';
 import 'package:firebase_core_web/src/interop/package_web_tweaks.dart';
 import 'package:firebase_core_web/src/interop/utils/es6_interop.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter_web_plugins/flutter_web_plugins.dart';
 import 'package:meta/meta.dart';
 import 'package:web/web.dart' as web;
 

packages/firebase_core/firebase_core_web/lib/src/firebase_core_web.dart

@@ -68,7 +68,7 @@ class FirebaseCoreWeb extends FirebasePlatform {
   static const String _libraryName = 'flutter-fire-core';
 
   /// Registers that [FirebaseCoreWeb] is the platform implementation.
-  static void registerWith(Registrar registrar) {
+  static void registerWith(dynamic registrar) {
     FirebasePlatform.instance = FirebaseCoreWeb();
   }
 

packages/firebase_core/firebase_core_web/lib/src/interop/core.dart

@@ -34,23 +34,22 @@ App initializeApp({
   String? measurementId,
   String? appId,
 }) {
-  name ??= defaultFirebaseAppName;
-
-  return App.getInstance(
-    firebase_interop.initializeApp(
-      firebase_interop.FirebaseOptions(
-        apiKey: apiKey?.toJS,
-        authDomain: authDomain?.toJS,
-        databaseURL: databaseURL?.toJS,
-        projectId: projectId?.toJS,
-        storageBucket: storageBucket?.toJS,
-        messagingSenderId: messagingSenderId?.toJS,
-        measurementId: measurementId?.toJS,
-        appId: appId?.toJS,
-      ),
-      name.toJS,
-    ),
+  final options = firebase_interop.FirebaseOptions(
+    apiKey: apiKey?.toJS,
+    authDomain: authDomain?.toJS,
+    databaseURL: databaseURL?.toJS,
+    projectId: projectId?.toJS,
+    storageBucket: storageBucket?.toJS,
+    messagingSenderId: messagingSenderId?.toJS,
+    measurementId: measurementId?.toJS,
+    appId: appId?.toJS,
   );
+
+  final jsApp = (name != null && name != defaultFirebaseAppName)
+      ? firebase_interop.initializeApp(options, name.toJS)
+      : firebase_interop.initializeApp(options);
+
+  return App.getInstance(jsApp);
 }
 
 App app([String? name]) {

packages/firebase_core/firebase_core_web/lib/src/interop/utils/utils.dart

@@ -11,32 +11,30 @@ import 'dart:async';
 import 'dart:js_interop';
 import 'dart:js_interop_unsafe';
 import 'package:web/web.dart' as web;
-import 'package:flutter/foundation.dart';
 
 import 'func.dart';
 
+// ignore: do_not_use_environment
+const bool _kDebugMode = !bool.fromEnvironment('dart.vm.product');
+
 /// Handles the [Future] object with the provided [mapper] function.
 JSPromise handleFutureWithMapper<T, S>(
-  Future<JSAny?> future,
+  Future<T> future,
   Func1<T, S> mapper,
 ) {
-  // Taken from js_interop:286
   return JSPromise((JSFunction resolve, JSFunction reject) {
-    future.then((JSAny? value) {
-      resolve.callAsFunction(resolve, value);
-      return value;
+    future.then<void>((T value) {
+      final Object? target = mapper(value);
+      final JSAny? jsVal = target?.jsify();
+      resolve.callAsFunction(resolve, jsVal);
     }, onError: (Object error, StackTrace stackTrace) {
       final errorConstructor =
           globalContext.getProperty('Error'.toJS)! as JSFunction;
-      final wrapper = errorConstructor.callAsConstructor<JSObject>(
-          'Dart exception thrown from converted Future. Use the properties '
-                  "'error' to fetch the boxed error and 'stack' to recover "
-                  'the stack trace.'
-              .toJS);
+      final wrapper = errorConstructor
+          .callAsConstructor<JSObject>('Dart exception: $error'.toJS);
       wrapper['error'] = error.toJSBox;
       wrapper['stack'] = stackTrace.toString().toJS;
       reject.callAsFunction(reject, wrapper);
-      return wrapper;
     });
   }.toJS);
 }
@@ -45,7 +43,7 @@ JSPromise handleFutureWithMapper<T, S>(
 // and clean up on hot restart if it exists.
 // See: https://github.com/firebase/flutterfire/issues/7064
 void unsubscribeWindowsListener(String key) {
-  if (kDebugMode) {
+  if (_kDebugMode) {
     final unsubscribe = web.window.getProperty(key.toJS);
     if (unsubscribe != null) {
       (unsubscribe as JSFunction).callAsFunction();
@@ -54,13 +52,13 @@ void unsubscribeWindowsListener(String key) {
 }
 
 void setWindowsListener(String key, JSFunction unsubscribe) {
-  if (kDebugMode) {
+  if (_kDebugMode) {
     web.window.setProperty(key.toJS, unsubscribe);
   }
 }
 
 void removeWindowsListener(String key) {
-  if (kDebugMode) {
+  if (_kDebugMode) {
     if (web.window.hasProperty(key.toJS) == true.toJS) {
       web.window.delete(key.toJS);
     }

packages/firebase_core/firebase_core_web/pubspec.yaml

@@ -11,10 +11,6 @@ environment:
 
 dependencies:
   firebase_core_platform_interface: ^8.1.1
-  flutter:
-    sdk: flutter
-  flutter_web_plugins:
-    sdk: flutter
   meta: ^1.8.0
   web: ^1.0.0