Merge master into release

firebase · Jun 6, 2023 · beab2d9 · beab2d9
2 parents 8dd911f + fe7da7e
commit beab2d9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.changeset/giant-bees-clean.md b/.changeset/giant-bees-clean.md
@@ -0,0 +1,5 @@
+---
+"@firebase/firestore": patch
+---
+
+Fix potentially false warning message.
diff --git a/packages/firestore/src/lite-api/database.ts b/packages/firestore/src/lite-api/database.ts
@@ -301,17 +301,18 @@ export function connectFirestoreEmulator(
 ): void {
   firestore = cast(firestore, Firestore);
   const settings = firestore._getSettings();
+  const newHostSetting = `${host}:${port}`;
 
-  if (settings.host !== DEFAULT_HOST && settings.host !== host) {
+  if (settings.host !== DEFAULT_HOST && settings.host !== newHostSetting) {
     logWarn(
-      'Host has been set in both settings() and useEmulator(), emulator host ' +
-        'will be used'
+      'Host has been set in both settings() and connectFirestoreEmulator(), emulator host ' +
+        'will be used.'
     );
   }
 
   firestore._setSettings({
     ...settings,
-    host: `${host}:${port}`,
+    host: newHostSetting,
     ssl: false
   });