@rebasepro/firebase 0.11.1-canary.gfd39654 → 0.12.1-canary.gdfba2a1

package/dist/components/FirebaseLoginView.d.ts

@@ -1,5 +1,5 @@
 import React, { ReactNode } from "react";
-import { FirebaseApp } from "@firebase/app";
+import { FirebaseApp } from "firebase/app";
 import type { FirebaseAuthController, FirebaseSignInOption, FirebaseSignInProvider } from "../types/auth";
 /**
  * @category Firebase

package/dist/components/RebaseFirebaseAppProps.d.ts

@@ -2,7 +2,7 @@ import React from "react";
 import { CollectionConfig } from "@rebasepro/types";
 import { AnalyticsEvent, AppView, AppViewsBuilder, CollectionConfigsBuilder, RebasePlugin, Locale, PropertyConfig } from "@rebasepro/admin-types";
 import { FirebaseAccessGate } from "../hooks/useFirebaseAccessGate";
-import { FirebaseApp } from "@firebase/app";
+import { FirebaseApp } from "firebase/app";
 import { FirebaseLoginViewProps } from "./FirebaseLoginView";
 import { AppCheckOptions, FirebaseSignInOption, FirebaseSignInProvider, FirebaseUserWrapper, FirestoreTextSearchControllerBuilder } from "../types";
 import { FirestoreIndexesBuilder } from "../hooks";

package/dist/hooks/useAppCheck.d.ts

@@ -1,4 +1,4 @@
-import { FirebaseApp } from "@firebase/app";
+import { FirebaseApp } from "firebase/app";
 import { AppCheckOptions } from "../types";
 /**
  * @group Firebase

package/dist/hooks/useFirebaseAuthController.d.ts

@@ -1,4 +1,4 @@
-import { FirebaseApp } from "@firebase/app";
+import { FirebaseApp } from "firebase/app";
 import { FirebaseAuthController, FirebaseSignInOption, FirebaseSignInProvider, FirebaseUserWrapper } from "../types";
 import type { User } from "@rebasepro/types";
 export interface FirebaseAuthControllerProps {

package/dist/hooks/useFirebaseRealTimeDBDelegate.d.ts

@@ -1,4 +1,4 @@
-import { FirebaseApp } from "@firebase/app";
+import { FirebaseApp } from "firebase/app";
 import { DataDriver } from "@rebasepro/types";
 export declare function useFirebaseRTDBDelegate({ firebaseApp }: {
     firebaseApp?: FirebaseApp;

package/dist/hooks/useFirebaseStorageSource.d.ts

@@ -1,4 +1,4 @@
-import { FirebaseApp } from "@firebase/app";
+import { FirebaseApp } from "firebase/app";
 import { StorageSource } from "@rebasepro/types";
 /**
  * @group Firebase

package/dist/hooks/useFirestoreDriver.d.ts

@@ -1,7 +1,7 @@
 import { DataDriver, CollectionConfig } from "@rebasepro/types";
 import { FilterCombination } from "@rebasepro/admin-types";
-import { Firestore } from "@firebase/firestore";
-import { FirebaseApp } from "@firebase/app";
+import { Firestore } from "firebase/firestore";
+import { FirebaseApp } from "firebase/app";
 import { FirestoreTextSearchControllerBuilder } from "../types/text_search";
 /**
  * @group Firebase

package/dist/hooks/useInitialiseFirebase.d.ts

@@ -1,4 +1,4 @@
-import { FirebaseApp } from "@firebase/app";
+import { FirebaseApp } from "firebase/app";
 /**
  * @group Firebase
  */

package/dist/hooks/useRecaptcha.d.ts

@@ -1,4 +1,4 @@
-import { RecaptchaVerifier } from "@firebase/auth";
+import { RecaptchaVerifier } from "firebase/auth";
 declare global {
     interface Window {
         recaptchaVerifier: RecaptchaVerifier;

package/dist/index.es.js

@@ -1,15 +1,15 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { deepEqual } from "fast-equals";
-import { FacebookAuthProvider, GithubAuthProvider, GoogleAuthProvider, OAuthProvider, PhoneAuthProvider, PhoneMultiFactorGenerator, RecaptchaVerifier, TwitterAuthProvider, createUserWithEmailAndPassword, fetchSignInMethodsForEmail, getAuth, getMultiFactorResolver, onAuthStateChanged, sendPasswordResetEmail, signInAnonymously, signInWithEmailAndPassword, signInWithPhoneNumber, signInWithPopup, signOut } from "@firebase/auth";
-import { deleteObject, getDownloadURL, getMetadata, getStorage, list, ref, uploadBytesResumable } from "@firebase/storage";
-import { deleteApp, getApps, initializeApp } from "@firebase/app";
-import { getToken, initializeAppCheck } from "@firebase/app-check";
+import { FacebookAuthProvider, GithubAuthProvider, GoogleAuthProvider, OAuthProvider, PhoneAuthProvider, PhoneMultiFactorGenerator, RecaptchaVerifier, TwitterAuthProvider, createUserWithEmailAndPassword, fetchSignInMethodsForEmail, getAuth, getMultiFactorResolver, onAuthStateChanged, sendPasswordResetEmail, signInAnonymously, signInWithEmailAndPassword, signInWithPhoneNumber, signInWithPopup, signOut } from "firebase/auth";
+import { deleteObject, getDownloadURL, getMetadata, getStorage, list, ref, uploadBytesResumable } from "firebase/storage";
+import { deleteApp, getApps, initializeApp } from "firebase/app";
+import { getToken, initializeAppCheck } from "firebase/app-check";
 import { DEFAULT_DATA_SOURCE_KEY, EntityReference, GeoPoint } from "@rebasepro/types";
-import { DocumentReference, GeoPoint as GeoPoint$1, Timestamp, VectorValue, collection, deleteDoc, deleteField, doc, getCountFromServer, getDoc, getDocs, getFirestore, limit, onSnapshot, orderBy, query, serverTimestamp, setDoc, startAfter, vector, where } from "@firebase/firestore";
+import { DocumentReference, GeoPoint as GeoPoint$1, Timestamp, VectorValue, collection, deleteDoc, deleteField, doc, getCountFromServer, getDoc, getDocs, getFirestore, limit, onSnapshot, orderBy, query, serverTimestamp, setDoc, startAfter, vector, where } from "firebase/firestore";
 import { COLLECTION_PATH_SEPARATOR, buildRebaseData, sortProperties, stripCollectionPath } from "@rebasepro/common";
 import Fuse from "fuse.js";
-import { getFunctions, httpsCallable } from "@firebase/functions";
-import { get, getDatabase, limitToFirst, onValue, orderByChild, orderByKey, push, query as query$1, ref as ref$1, remove, set, startAt } from "@firebase/database";
+import { getFunctions, httpsCallable } from "firebase/functions";
+import { get, getDatabase, limitToFirst, onValue, orderByChild, orderByKey, push, query as query$1, ref as ref$1, remove, set, startAt } from "firebase/database";
 import { removeUndefined } from "@rebasepro/utils";
 import { AdminModeControllerProvider, ErrorView, ModeControllerProvider, Rebase, RebaseLogo, RebaseRoutes, SnackbarProvider, useBrowserTitleAndIcon, useBuildAdminModeController, useBuildLocalConfigurationPersistence, useBuildModeController, useModeController, useSnackbarController } from "@rebasepro/app";
 import { AppBar, CollectionRegistryContext, Drawer, NavigationStateContext, RebaseRoute, Scaffold, SideDialogs, SidePanelProvider, UrlContext, useBuildCollectionRegistryController, useBuildNavigationStateController, useBuildUrlController } from "@rebasepro/admin";
@@ -472,10 +472,11 @@ function useAppCheck({ firebaseApp, options }) {
 		setAppCheckLoading(true);
 		const { provider, isTokenAutoRefreshEnabled } = options;
 		removeCurrentAppCheckDiv();
-		verifyToken(initializeAppCheck(firebaseApp, {
+		const appCheck = initializeAppCheck(firebaseApp, {
 			provider,
 			isTokenAutoRefreshEnabled
-		})).then(() => {
+		});
+		verifyToken(appCheck).then(() => {
 			setAppCheckLoading(false);
 		});
 		initialCheck.current = true;
@@ -513,7 +514,8 @@ var docsToCollectionTree = (docs) => {
 	Object.keys(collectionsMap).sort((a, b) => b.split(COLLECTION_PATH_SEPARATOR).length - a.split(COLLECTION_PATH_SEPARATOR).length).forEach((id) => {
 		const collection = collectionsMap[id];
 		if (id.includes(COLLECTION_PATH_SEPARATOR)) {
-			const parentCollection = collectionsMap[id.split(COLLECTION_PATH_SEPARATOR).slice(0, -1).join(COLLECTION_PATH_SEPARATOR)];
+			const parentId = id.split(COLLECTION_PATH_SEPARATOR).slice(0, -1).join(COLLECTION_PATH_SEPARATOR);
+			const parentCollection = collectionsMap[parentId];
 			if (parentCollection) parentCollection.subcollections = () => [...parentCollection.subcollections?.() ?? [], collection];
 			delete collectionsMap[id];
 		}
@@ -698,7 +700,8 @@ var localSearchControllerBuilder = ({ firebaseApp }) => {
 		return new Promise((resolve, reject) => {
 			if (collectionProp) {
 				console.debug("Init local search controller", path);
-				listeners[path] = onSnapshot(query(collection(databaseId ? getFirestore(firebaseApp, databaseId) : getFirestore(firebaseApp), path)), {
+				const col = collection(databaseId ? getFirestore(firebaseApp, databaseId) : getFirestore(firebaseApp), path);
+				listeners[path] = onSnapshot(query(col), {
 					next: (entity) => {
 						if (entity.metadata.fromCache && entity.metadata.hasPendingWrites) return;
 						const docs = entity.docs.map((doc) => ({
@@ -1575,7 +1578,8 @@ function useBuildUserManagement({ authController, dataSourceDelegate, roles: rol
 				console.debug("Updating users", rows);
 				setUsersError(void 0);
 				try {
-					setUsersWithRoleIds(rowsToUsers(rows));
+					const newUsers = rowsToUsers(rows);
+					setUsersWithRoleIds(newUsers);
 				} catch (e) {
 					setUsersWithRoleIds([]);
 					console.error("Error loading users", e);