Merge branch 'master' into performance-example-app

Author: russellwheatley

melos.yaml

@@ -16,7 +16,8 @@ command:
 
     changelogs:
       - path: firebase_ui_changelog.md
-        scope: firebase_ui_*
+        packageFilters: 
+          scope: firebase_ui_*
         description: |
           All notable changes for firebase_ui packages
 

packages/cloud_firestore/cloud_firestore/example/integration_test/instance_e2e.dart

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:convert';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -229,6 +230,30 @@ void runInstanceTests() {
           fieldOverrides: [fieldOverride1, fieldOverride2],
         );
       });
+
+      test('setIndexConfigurationFromJSON()', () async {
+        final json = jsonEncode({
+          'indexes': [
+            {
+              'collectionGroup': 'posts',
+              'queryScope': 'COLLECTION',
+              'fields': [
+                {'fieldPath': 'author', 'arrayConfig': 'CONTAINS'},
+                {'fieldPath': 'timestamp', 'order': 'DESCENDING'}
+              ]
+            }
+          ],
+          'fieldOverrides': [
+            {
+              'collectionGroup': 'posts',
+              'fieldPath': 'myBigMapField',
+              'indexes': []
+            }
+          ]
+        });
+
+        await firestore.setIndexConfigurationFromJSON(json);
+      });
     },
   );
 }

packages/cloud_firestore/cloud_firestore/lib/src/firestore.dart

@@ -323,6 +323,20 @@ class FirebaseFirestore extends FirebasePluginPlatform {
     return _delegate.setIndexConfiguration(json);
   }
 
+  /// Configures indexing for local query execution. Any previous index configuration is overridden.
+  ///
+  /// The index entries themselves are created asynchronously. You can continue to use queries that
+  /// require indexing even if the indices are not yet available. Query execution will automatically
+  /// start using the index once the index entries have been written.
+  /// See Firebase documentation to learn how to configure your index configuration JSON file:
+  /// https://firebase.google.com/docs/reference/firestore/indexes
+  ///
+  /// This API is in preview mode and is subject to change.
+  @experimental
+  Future<void> setIndexConfigurationFromJSON(String json) async {
+    return _delegate.setIndexConfiguration(json);
+  }
+
   @override
   // ignore: avoid_equals_and_hash_code_on_mutable_classes
   bool operator ==(Object other) =>

packages/cloud_firestore/cloud_firestore_web/lib/src/interop/firestore.dart

@@ -63,9 +63,14 @@ class Firestore extends JsObjectWrapper<firestore_interop.FirestoreJsImpl> {
       firestore_interop.doc(jsObject, documentPath));
 
   Future<void> enablePersistence(
-          [firestore_interop.PersistenceSettings? settings]) =>
-      handleThenable(
-          firestore_interop.enableIndexedDbPersistence(jsObject, settings));
+      [firestore_interop.PersistenceSettings? settings]) {
+    if (settings != null && settings.synchronizeTabs == true) {
+      return handleThenable(
+          firestore_interop.enableMultiTabIndexedDbPersistence(jsObject));
+    }
+    return handleThenable(
+        firestore_interop.enableIndexedDbPersistence(jsObject));
+  }
 
   Stream<void> snapshotsInSync() {
     late StreamController<void> controller;

packages/cloud_firestore/cloud_firestore_web/lib/src/interop/firestore_interop.dart

@@ -85,7 +85,8 @@ external PromiseJsImpl<void> enableIndexedDbPersistence(
 
 @JS()
 external PromiseJsImpl<void> enableMultiTabIndexedDbPersistence(
-    FirestoreJsImpl firestore);
+  FirestoreJsImpl firestore,
+);
 
 @JS()
 external PromiseJsImpl<void> enableNetwork(FirestoreJsImpl firestore);

packages/firebase_auth/firebase_auth/example/android/app/build.gradle

@@ -43,7 +43,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "io.flutter.plugins.firebaseauthexample"
+        applicationId "io.flutter.plugins.firebase.auth.example"
         minSdkVersion 19
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
@@ -69,4 +69,4 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
-apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.google.gms.google-services'