From ea3f70cd4c766a8dac850e2e201ac77b5c44ac51 Mon Sep 17 00:00:00 2001
From: "vladimir.koltunov" <progrand@gmail.com>
Date: Fri, 17 Feb 2023 02:21:59 +0300
Subject: [PATCH] fix JS and dart toString name conflict

---
 .../firebase_core_web/lib/src/firebase_core_web.dart        | 2 +-
 .../firebase_core/firebase_core_web/lib/src/interop/js.dart | 6 ++++++
 packages/firebase_core/firebase_core_web/pubspec.yaml       | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/firebase_core/firebase_core_web/lib/src/firebase_core_web.dart b/packages/firebase_core/firebase_core_web/lib/src/firebase_core_web.dart
index 6073747b4d07..93cc515d4ae4 100644
--- a/packages/firebase_core/firebase_core_web/lib/src/firebase_core_web.dart
+++ b/packages/firebase_core/firebase_core_web/lib/src/firebase_core_web.dart
@@ -128,7 +128,7 @@ class FirebaseCoreWeb extends FirebasePlatform {
     script.crossOrigin = 'anonymous';
     script.text = '''
       window.ff_trigger_$windowVar = async (callback) => {
-        callback(await import("${trustedUrl?.toString() ?? src}"));
+        callback(await import("${trustedUrl?.toStringJS() ?? src}"));
       };
     ''';
 
diff --git a/packages/firebase_core/firebase_core_web/lib/src/interop/js.dart b/packages/firebase_core/firebase_core_web/lib/src/interop/js.dart
index 0a720243449d..306d51cb1ed3 100644
--- a/packages/firebase_core/firebase_core_web/lib/src/interop/js.dart
+++ b/packages/firebase_core/firebase_core_web/lib/src/interop/js.dart
@@ -126,6 +126,12 @@ extension DomTrustedTypePolicyExtension on DomTrustedTypePolicy {
 @anonymous
 abstract class DomTrustedScriptUrl {}
 
+/// (Some) methods of the [DomTrustedScriptUrl]
+extension DomTrustedScriptUrlExtension on DomTrustedScriptUrl {
+  @JS('toString')
+  external String toStringJS();
+}
+
 // Getters
 
 /// window.trustedTypes (may or may not be supported by the browser)
diff --git a/packages/firebase_core/firebase_core_web/pubspec.yaml b/packages/firebase_core/firebase_core_web/pubspec.yaml
index 5501e56a0d36..5720d3d77163 100644
--- a/packages/firebase_core/firebase_core_web/pubspec.yaml
+++ b/packages/firebase_core/firebase_core_web/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_core_web
 description: The web implementation of firebase_core
 homepage: https://github.com/firebase/flutterfire/tree/master/packages/firebase_core/firebase_core_web
 repository: https://github.com/firebase/flutterfire/tree/master/packages/firebase_core/firebase_core_web
-version: 2.2.0
+version: 2.2.1
 
 environment:
   sdk: ">=2.16.0 <3.0.0"