feat(web): upgrade to support v9.8.1 Firebase JS SDK

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

@@ -10,15 +10,21 @@ class FirebaseWebService {
  /// The name which matches the Firebase JS Web SDK postfix.
  String name;
 
+ /// Naming of Firebase web products is different from Flutterfire plugins. This
+ /// property allows overriding of web naming to Flutterfire plugin naming.
+ String? override;
+
  /// Creates a new [FirebaseWebService].
- FirebaseWebService._(this.name);
+ FirebaseWebService._(this.name, [this.override]);
 }
 
 /// The entry point for accessing Firebase.
 ///
 /// You can get an instance by calling [FirebaseCore.instance].
 class FirebaseCoreWeb extends FirebasePlatform {
- static Map<String, FirebaseWebService> _services = {};
+ static Map<String, FirebaseWebService> _services = {
+ 'core': FirebaseWebService._('app', 'core'),
+ };
 
  /// Internally registers a Firebase Service to be initialized.
  static void registerService(String service) {
@@ -30,12 +36,6 @@ class FirebaseCoreWeb extends FirebasePlatform {
  FirebasePlatform.instance = FirebaseCoreWeb();
  }
 
- /// Returns whether `requirejs` is within the global context (usually the
- /// case in development).
- bool get _isRequireJsDefined {
- return context['require'] != null;
- }
-
  /// Returns the Firebase JS SDK Version to use.
  ///
  /// You can override the supported version by attaching a version string to
@@ -75,118 +75,62 @@ class FirebaseCoreWeb extends FirebasePlatform {
 
  /// Injects a `script` with a `src` dynamically into the head of the current
  /// document.
- Future<void> _injectSrcScript(String src) async {
+ Future<void> _injectSrcScript(String src, String windowVar) async {
  ScriptElement script = ScriptElement();
  script.type = 'text/javascript';
- script.src = src;
- script.async = true;
+ script.text = '''
+ window.ff_trigger_$windowVar = async (callback) => {
+ callback(await import("$src"));
+ };
+ ''';
+
  assert(document.head != null);
  document.head!.append(script);
- await script.onLoad.first;
+ Completer completer = Completer();
+
+ context.callMethod('ff_trigger_$windowVar', [
+ (module) {
+ context[windowVar] = module;
+ context.deleteProperty('ff_trigger_$windowVar');
+ completer.complete();
+ }
+ ]);
+
+ await completer.future;
  }
 
  /// Initializes the Firebase JS SDKs by injecting them into the `head` of the
- /// document when Firebase is initalized.
+ /// document when Firebase is initialized.
  Future<void> _initializeCore() async {
  // If Firebase is already available, core has already been initialized
  // (or the user has added the scripts to their html file).
- if (context['firebase'] != null) {
+ if (context['firebase_core'] != null) {
  return;
  }
 
  String version = _firebaseSDKVersion;
  List<String> ignored = _ignoredServiceScripts;
 
- // This must be loaded first!
- await _injectSrcScript(
- 'https://www.gstatic.com/firebasejs/$version/firebase-app.js',
- );
-
  await Future.wait(
  _services.values.map((service) {
- if (ignored.contains(service.name)) {
+ if (ignored.contains(service.override ?? service.name)) {
  return Future.value();
  }
 
  return _injectSrcScript(
  'https://www.gstatic.com/firebasejs/$version/firebase-${service.name}.js',
+ 'firebase_${service.override ?? service.name}',
  );
  }),
  );
  }
 
- /// In development (or manually added), requirejs is added to the window.
- ///
- /// The Firebase JS SDKs define their modules via requirejs (if it exists),
- /// otherwise they attach to the window. This code loads Firebase from
- /// requirejs manually attaches it to the window.
- Future<void> _initializeCoreRequireJs() async {
- // If Firebase is already available, core has already been initialized
- // (or the user has added the scripts to their html file).
- if (context['firebase'] != null) {
- return;
- }
-
- String version = _firebaseSDKVersion;
- List<String> ignored = _ignoredServiceScripts;
-
- // In dev, requirejs is loaded in
- JsObject require = JsObject.fromBrowserObject(context['require']);
- require.callMethod('config', [
- JsObject.jsify({
- 'paths': {
- '@firebase/app':
- 'https://www.gstatic.com/firebasejs/$version/firebase-app',
- '@firebase/analytics':
- 'https://www.gstatic.com/firebasejs/$version/firebase-analytics',
- '@firebase/app-check':
- 'https://www.gstatic.com/firebasejs/$version/firebase-app-check',
- '@firebase/auth':
- 'https://www.gstatic.com/firebasejs/$version/firebase-auth',
- '@firebase/firestore':
- 'https://www.gstatic.com/firebasejs/$version/firebase-firestore',
- '@firebase/functions':
- 'https://www.gstatic.com/firebasejs/$version/firebase-functions',
- '@firebase/messaging':
- 'https://www.gstatic.com/firebasejs/$version/firebase-messaging',
- '@firebase/storage':
- 'https://www.gstatic.com/firebasejs/$version/firebase-storage',
- '@firebase/database':
- 'https://www.gstatic.com/firebasejs/$version/firebase-database',
- '@firebase/remote-config':
- 'https://www.gstatic.com/firebasejs/$version/firebase-remote-config',
- '@firebase/performance':
- 'https://www.gstatic.com/firebasejs/$version/firebase-performance',
- '@firebase/installations':
- 'https://www.gstatic.com/firebasejs/$version/firebase-installations',
- },
- })
- ]);
-
- Completer completer = Completer();
-
- List<String> services = ['@firebase/app'];
- _services.values.forEach((service) {
- if (!ignored.contains(service.name)) {
- services.add('@firebase/${service.name}');
- }
- });
-
- context.callMethod('require', [
- JsObject.jsify(services),
- (app) {
- context['firebase'] = app;
- completer.complete();
- }
- ]);
-
- await completer.future;
- }
-
  /// Returns all created [FirebaseAppPlatform] instances.
  @override
  List<FirebaseAppPlatform> get apps {
- return firebase.apps.map(_createFromJsApp).toList(growable: false);
+ return guardNotInitialized(
+ () => firebase.apps.map(_createFromJsApp).toList(growable: false),
+ );
  }
 
  /// Initializes a new [FirebaseAppPlatform] instance by [name] and [options] and returns
@@ -199,21 +143,8 @@ class FirebaseCoreWeb extends FirebasePlatform {
  String? name,
  FirebaseOptions? options,
  }) async {
- if (!_isRequireJsDefined) {
- await _initializeCore();
- } else {
- await _initializeCoreRequireJs();
- }
-
- try {
- firebase.SDK_VERSION;
- } catch (e) {
- if (e
- .toString()
- .contains("Cannot read property 'SDK_VERSION' of undefined")) {
- throw coreNotInitialized();
- }
- }
+ await _initializeCore();
+ guardNotInitialized(() => firebase.SDK_VERSION);
 
  assert(
  () {
@@ -329,14 +260,8 @@ class FirebaseCoreWeb extends FirebasePlatform {
  firebase.App app;
 
  try {
- app = firebase.app(name);
+ app = guardNotInitialized(() => firebase.app(name));
  } catch (e) {
- if ((e.toString().contains('Cannot read property') ||
- e.toString().contains('Cannot read properties')) &&
- e.toString().contains("'app'")) {
- throw coreNotInitialized();
- }
-
  if (_getJSErrorCode(e) == 'app/no-app') {
  throw noAppExists(name);
  }
@@ -347,3 +272,29 @@ class FirebaseCoreWeb extends FirebasePlatform {
  return _createFromJsApp(app);
  }
 }
+
+/// Converts a Exception to a FirebaseAdminException.
+Never _handleException(Object exception, StackTrace stackTrace) {
+ if (exception.toString().contains('of undefined')) {
+ throw coreNotInitialized();
+ }
+
+ Error.throwWithStackTrace(exception, stackTrace);
+}
+
+/// A generic guard wrapper for API calls to handle exceptions.
+R guardNotInitialized<R>(R Function() cb) {
+ try {
+ final value = cb();
+
+ if (value is Future) {
+ return value.catchError(
+ _handleException,
+ ) as R;
+ }
+
+ return value;
+ } catch (error, stackTrace) {
+ _handleException(error, stackTrace);
+ }
+}

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

@@ -6,4 +6,4 @@
 part of firebase_core_web;
 
 /// The currently supported Firebase JS SDK version.
-const String supportedFirebaseJsSdkVersion = '8.10.1';
+const String supportedFirebaseJsSdkVersion = '9.8.1';

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

@@ -5,10 +5,12 @@
 
 // ignore_for_file: public_member_api_docs
 
+import 'package:firebase_core_web/firebase_core_web_interop.dart';
+
 import 'app_interop.dart';
 import 'core_interop.dart';
+import 'core.dart' as core_interop;
 import 'utils/js.dart';
-import 'utils/utils.dart';
 
 /// A Firebase App holds the initialization information for a collection
 /// of services.
@@ -31,5 +33,5 @@ class App extends JsObjectWrapper<AppJsImpl> {
  }
 
  /// Deletes the app and frees resources of all App's services.
- Future delete() => handleThenable(jsObject.delete());
+ Future<void> delete() => handleThenable(core_interop.deleteApp(jsObject));
 }

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

@@ -5,16 +5,14 @@
 
 // ignore_for_file: public_member_api_docs
 
-@JS('firebase.app')
+@JS('firebase_core')
 library firebase_interop.core.app;
 
 import 'package:js/js.dart';
 import 'core_interop.dart';
-import 'utils/es6_interop.dart';
 
-@JS('App')
+@JS('FirebaseApp')
 abstract class AppJsImpl {
  external String get name;
  external FirebaseOptions get options;
- external PromiseJsImpl<void> delete();
 }

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

@@ -14,7 +14,8 @@ export 'app.dart';
 export 'app_interop.dart';
 export 'core_interop.dart';
 
-List<App> get apps => firebase_interop.apps
+List<App> get apps => firebase_interop
+ .getApps()
  // explicitly typing the param as dynamic to work-around
  // https://github.com/dart-lang/sdk/issues/33537
  // ignore: unnecessary_lambdas
@@ -49,11 +50,10 @@ App initializeApp({
  name,
  ),
  );
- // TODO if error - firebase not loaded?
 }
 
 App app([String? name]) {
  return App.getInstance(
- name != null ? firebase_interop.app(name) : firebase_interop.app(),
+ name != null ? firebase_interop.getApp(name) : firebase_interop.getApp(),
  );
 }

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

@@ -5,15 +5,16 @@
 
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names
 
-@JS('firebase')
+@JS('firebase_core')
 library firebase_interop.core;
 
+import 'package:firebase_core_web/firebase_core_web_interop.dart';
 import 'package:js/js.dart';
 
 import 'app_interop.dart';
 
 @JS()
-external List<AppJsImpl> get apps;
+external List<AppJsImpl> getApps();
 
 /// The current SDK version.
 ///
@@ -25,7 +26,10 @@ external String get SDK_VERSION;
 external AppJsImpl initializeApp(FirebaseOptions options, [String? name]);
 
 @JS()
-external AppJsImpl app([String? name]);
+external AppJsImpl getApp([String? name]);
+
+@JS()
+external PromiseJsImpl<void> deleteApp(AppJsImpl app);
 
 /// FirebaseError is a subclass of the standard Error object.
 /// In addition to a message string, it contains a string-valued code.

packages/firebase_core/firebase_core_web/test/firebase_core_web_exceptions_test.dart

@@ -58,6 +58,14 @@ void main() {
  });
 
  test('should throw exception if no named app was found', () async {
+ (js.context['firebase_core'] as js.JsObject)['getApp'] =
+ js.allowInterop((String name) {
+ final dynamic error = js_util.newObject();
+ js_util.setProperty(error, 'name', 'FirebaseError');
+ js_util.setProperty(error, 'code', 'app/no-app');
+ throw error;
+ });
+
  await expectLater(
  () => Firebase.app('foo'),
  throwsA(noAppExists('foo')),