Merge pull request #86 from mdirolf/firebase-8

chrisbianca · web-flow · commit ede53626a80b · 2020-12-10T17:35:34.000Z
Upgrade firebase and update imports to work w/ upstream changes
diff --git a/auth/useAuthState.ts b/auth/useAuthState.ts
@@ -1,13 +1,13 @@
-import { auth, User } from 'firebase';
+import firebase from 'firebase/app';
 import { useEffect } from 'react';
 import { LoadingHook, useLoadingValue } from '../util';
 
-export type AuthStateHook = LoadingHook<User, auth.Error>;
+export type AuthStateHook = LoadingHook<firebase.User, firebase.auth.Error>;
 
-export default (auth: auth.Auth): AuthStateHook => {
+export default (auth: firebase.auth.Auth): AuthStateHook => {
   const { error, loading, setError, setValue, value } = useLoadingValue<
-    User,
-    auth.Error
+    firebase.User,
+    firebase.auth.Error
   >(() => auth.currentUser);
 
   useEffect(
diff --git a/database/helpers/index.ts b/database/helpers/index.ts
@@ -1,10 +1,10 @@
-import { database } from 'firebase';
+import firebase from 'firebase/app';
 
 const isObject = (val: any) =>
   val != null && typeof val === 'object' && Array.isArray(val) === false;
 
 export const snapshotToData = (
-  snapshot: database.DataSnapshot,
+  snapshot: firebase.database.DataSnapshot,
   keyField?: string
 ) => {
   if (!snapshot.exists) {
diff --git a/database/helpers/useListReducer.ts b/database/helpers/useListReducer.ts
@@ -1,36 +1,36 @@
-import { database, FirebaseError } from 'firebase';
+import firebase from 'firebase/app';
 import { useReducer } from 'react';
 
 type KeyValueState = {
   keys?: string[];
-  values?: database.DataSnapshot[];
+  values?: firebase.database.DataSnapshot[];
 };
 
 type ReducerState = {
-  error?: FirebaseError;
+  error?: firebase.FirebaseError;
   loading: boolean;
   value: KeyValueState;
 };
 
 type AddAction = {
   type: 'add';
   previousKey?: string | null;
-  snapshot: database.DataSnapshot | null;
+  snapshot: firebase.database.DataSnapshot | null;
 };
 type ChangeAction = {
   type: 'change';
-  snapshot: database.DataSnapshot | null;
+  snapshot: firebase.database.DataSnapshot | null;
 };
 type EmptyAction = { type: 'empty' };
-type ErrorAction = { type: 'error'; error: FirebaseError };
+type ErrorAction = { type: 'error'; error: firebase.FirebaseError };
 type MoveAction = {
   type: 'move';
   previousKey?: string | null;
-  snapshot: database.DataSnapshot | null;
+  snapshot: firebase.database.DataSnapshot | null;
 };
 type RemoveAction = {
   type: 'remove';
-  snapshot: database.DataSnapshot | null;
+  snapshot: firebase.database.DataSnapshot | null;
 };
 type ResetAction = { type: 'reset' };
 type ValueAction = { type: 'value' };
diff --git a/database/useList.ts b/database/useList.ts
@@ -1,41 +1,41 @@
-import { database, FirebaseError } from 'firebase';
+import firebase from 'firebase';
 import { useEffect, useMemo } from 'react';
 import { snapshotToData } from './helpers';
 import useListReducer from './helpers/useListReducer';
 import { LoadingHook, useIsEqualRef } from '../util';
 
-export type ListHook = LoadingHook<database.DataSnapshot[], FirebaseError>;
-export type ListKeysHook = LoadingHook<string[], FirebaseError>;
-export type ListValsHook<T> = LoadingHook<T[], FirebaseError>;
+export type ListHook = LoadingHook<firebase.database.DataSnapshot[], firebase.FirebaseError>;
+export type ListKeysHook = LoadingHook<string[], firebase.FirebaseError>;
+export type ListValsHook<T> = LoadingHook<T[], firebase.FirebaseError>;
 
-export const useList = (query?: database.Query | null): ListHook => {
+export const useList = (query?: firebase.database.Query | null): ListHook => {
   const [state, dispatch] = useListReducer();
 
   const ref = useIsEqualRef(query, () => dispatch({ type: 'reset' }));
 
   const onChildAdded = (
-    snapshot: database.DataSnapshot | null,
+    snapshot: firebase.database.DataSnapshot | null,
     previousKey?: string | null
   ) => {
     dispatch({ type: 'add', previousKey, snapshot });
   };
 
-  const onChildChanged = (snapshot: database.DataSnapshot | null) => {
+  const onChildChanged = (snapshot: firebase.database.DataSnapshot | null) => {
     dispatch({ type: 'change', snapshot });
   };
 
   const onChildMoved = (
-    snapshot: database.DataSnapshot | null,
+    snapshot: firebase.database.DataSnapshot | null,
     previousKey?: string | null
   ) => {
     dispatch({ type: 'move', previousKey, snapshot });
   };
 
-  const onChildRemoved = (snapshot: database.DataSnapshot | null) => {
+  const onChildRemoved = (snapshot: firebase.database.DataSnapshot | null) => {
     dispatch({ type: 'remove', snapshot });
   };
 
-  const onError = (error: FirebaseError) => {
+  const onError = (error: firebase.FirebaseError) => {
     dispatch({ type: 'error', error });
   };
 
@@ -44,7 +44,7 @@ export const useList = (query?: database.Query | null): ListHook => {
   };
 
   useEffect(() => {
-    const query: database.Query | null | undefined = ref.current;
+    const query: firebase.database.Query | null | undefined = ref.current;
     if (!query) {
       dispatch({ type: 'empty' });
       return;
@@ -67,7 +67,7 @@ export const useList = (query?: database.Query | null): ListHook => {
   return [state.value.values, state.loading, state.error];
 };
 
-export const useListKeys = (query?: database.Query | null): ListKeysHook => {
+export const useListKeys = (query?: firebase.database.Query | null): ListKeysHook => {
   const [value, loading, error] = useList(query);
   return [
     value ? value.map(snapshot => snapshot.key as string) : undefined,
@@ -77,7 +77,7 @@ export const useListKeys = (query?: database.Query | null): ListKeysHook => {
 };
 
 export const useListVals = <T>(
-  query?: database.Query | null,
+  query?: firebase.database.Query | null,
   options?: {
     keyField?: string;
   }
diff --git a/database/useObject.ts b/database/useObject.ts
@@ -1,15 +1,15 @@
-import { database, FirebaseError } from 'firebase';
+import firebase from 'firebase/app';
 import { useEffect, useMemo } from 'react';
 import { snapshotToData } from './helpers';
 import { LoadingHook, useIsEqualRef, useLoadingValue } from '../util';
 
-export type ObjectHook = LoadingHook<database.DataSnapshot, FirebaseError>;
-export type ObjectValHook<T> = LoadingHook<T, FirebaseError>;
+export type ObjectHook = LoadingHook<firebase.database.DataSnapshot, firebase.FirebaseError>;
+export type ObjectValHook<T> = LoadingHook<T, firebase.FirebaseError>;
 
-export const useObject = (query?: database.Query | null): ObjectHook => {
+export const useObject = (query?: firebase.database.Query | null): ObjectHook => {
   const { error, loading, reset, setError, setValue, value } = useLoadingValue<
-    database.DataSnapshot,
-    FirebaseError
+    firebase.database.DataSnapshot,
+    firebase.FirebaseError
   >();
   const ref = useIsEqualRef(query, reset);
 
@@ -34,7 +34,7 @@ export const useObject = (query?: database.Query | null): ObjectHook => {
 };
 
 export const useObjectVal = <T>(
-  query?: database.Query | null,
+  query?: firebase.database.Query | null,
   options?: {
     keyField?: string;
   }
diff --git a/firestore/helpers/index.ts b/firestore/helpers/index.ts
@@ -1,7 +1,7 @@
-import { firestore } from 'firebase';
+import firebase from 'firebase/app';
 
 export const snapshotToData = (
-  snapshot: firestore.DocumentSnapshot,
+  snapshot: firebase.firestore.DocumentSnapshot,
   idField?: string
 ) => {
   if (!snapshot.exists) {
diff --git a/firestore/useCollection.ts b/firestore/useCollection.ts
@@ -1,19 +1,19 @@
-import { firestore } from 'firebase';
+import firebase from 'firebase/app';
 import { useEffect, useMemo } from 'react';
 import { snapshotToData } from './helpers';
 import { LoadingHook, useIsEqualRef, useLoadingValue } from '../util';
 
-export type CollectionHook = LoadingHook<firestore.QuerySnapshot, Error>;
+export type CollectionHook = LoadingHook<firebase.firestore.QuerySnapshot, Error>;
 export type CollectionDataHook<T> = LoadingHook<T[], Error>;
 
 export const useCollection = (
-  query?: firestore.Query | null,
+  query?: firebase.firestore.Query | null,
   options?: {
-    snapshotListenOptions?: firestore.SnapshotListenOptions;
+    snapshotListenOptions?: firebase.firestore.SnapshotListenOptions;
   }
 ): CollectionHook => {
   const { error, loading, reset, setError, setValue, value } = useLoadingValue<
-    firestore.QuerySnapshot,
+    firebase.firestore.QuerySnapshot,
     Error
   >();
   const ref = useIsEqualRef(query, reset);
@@ -44,10 +44,10 @@ export const useCollection = (
 };
 
 export const useCollectionData = <T>(
-  query?: firestore.Query | null,
+  query?: firebase.firestore.Query | null,
   options?: {
     idField?: string;
-    snapshotListenOptions?: firestore.SnapshotListenOptions;
+    snapshotListenOptions?: firebase.firestore.SnapshotListenOptions;
   }
 ): CollectionDataHook<T> => {
   const idField = options ? options.idField : undefined;
diff --git a/firestore/useCollectionOnce.ts b/firestore/useCollectionOnce.ts
@@ -1,19 +1,19 @@
-import { firestore } from 'firebase';
+import firebase from 'firebase/app';
 import { useEffect } from 'react';
 import { snapshotToData } from './helpers';
 import { LoadingHook, useIsEqualRef, useLoadingValue } from '../util';
 
-export type CollectionOnceHook = LoadingHook<firestore.QuerySnapshot, Error>;
+export type CollectionOnceHook = LoadingHook<firebase.firestore.QuerySnapshot, Error>;
 export type CollectionDataOnceHook<T> = LoadingHook<T[], Error>;
 
 export const useCollectionOnce = (
-  query?: firestore.Query | null,
+  query?: firebase.firestore.Query | null,
   options?: {
-    getOptions?: firestore.GetOptions;
+    getOptions?: firebase.firestore.GetOptions;
   }
 ): CollectionOnceHook => {
   const { error, loading, reset, setError, setValue, value } = useLoadingValue<
-    firestore.QuerySnapshot,
+    firebase.firestore.QuerySnapshot,
     Error
   >();
   const ref = useIsEqualRef(query, reset);
@@ -36,9 +36,9 @@ export const useCollectionOnce = (
 };
 
 export const useCollectionDataOnce = <T>(
-  query?: firestore.Query | null,
+  query?: firebase.firestore.Query | null,
   options?: {
-    getOptions?: firestore.GetOptions;
+    getOptions?: firebase.firestore.GetOptions;
     idField?: string;
   }
 ): CollectionDataOnceHook<T> => {
diff --git a/firestore/useDocument.ts b/firestore/useDocument.ts
@@ -1,19 +1,19 @@
-import { firestore } from 'firebase';
+import firebase from 'firebase/app';
 import { useEffect, useMemo } from 'react';
 import { snapshotToData } from './helpers';
 import { LoadingHook, useIsEqualRef, useLoadingValue } from '../util';
 
-export type DocumentHook = LoadingHook<firestore.DocumentSnapshot, Error>;
+export type DocumentHook = LoadingHook<firebase.firestore.DocumentSnapshot, Error>;
 export type DocumentDataHook<T> = LoadingHook<T, Error>;
 
 export const useDocument = (
-  docRef?: firestore.DocumentReference | null,
+  docRef?: firebase.firestore.DocumentReference | null,
   options?: {
-    snapshotListenOptions?: firestore.SnapshotListenOptions;
+    snapshotListenOptions?: firebase.firestore.SnapshotListenOptions;
   }
 ): DocumentHook => {
   const { error, loading, reset, setError, setValue, value } = useLoadingValue<
-    firestore.DocumentSnapshot,
+    firebase.firestore.DocumentSnapshot,
     Error
   >();
   const ref = useIsEqualRef(docRef, reset);
@@ -44,10 +44,10 @@ export const useDocument = (
 };
 
 export const useDocumentData = <T>(
-  docRef?: firestore.DocumentReference | null,
+  docRef?: firebase.firestore.DocumentReference | null,
   options?: {
     idField?: string;
-    snapshotListenOptions?: firestore.SnapshotListenOptions;
+    snapshotListenOptions?: firebase.firestore.SnapshotListenOptions;
   }
 ): DocumentDataHook<T> => {
   const idField = options ? options.idField : undefined;
diff --git a/firestore/useDocumentOnce.ts b/firestore/useDocumentOnce.ts
@@ -1,19 +1,19 @@
-import { firestore } from 'firebase';
+import firebase from 'firebase/app';
 import { useEffect } from 'react';
 import { snapshotToData } from './helpers';
 import { LoadingHook, useIsEqualRef, useLoadingValue } from '../util';
 
-export type DocumentOnceHook = LoadingHook<firestore.DocumentSnapshot, Error>;
+export type DocumentOnceHook = LoadingHook<firebase.firestore.DocumentSnapshot, Error>;
 export type DocumentDataOnceHook<T> = LoadingHook<T, Error>;
 
 export const useDocumentOnce = (
-  docRef?: firestore.DocumentReference | null,
+  docRef?: firebase.firestore.DocumentReference | null,
   options?: {
-    getOptions?: firestore.GetOptions;
+    getOptions?: firebase.firestore.GetOptions;
   }
 ): DocumentOnceHook => {
   const { error, loading, reset, setError, setValue, value } = useLoadingValue<
-    firestore.DocumentSnapshot,
+    firebase.firestore.DocumentSnapshot,
     Error
   >();
   const ref = useIsEqualRef(docRef, reset);
@@ -36,9 +36,9 @@ export const useDocumentOnce = (
 };
 
 export const useDocumentDataOnce = <T>(
-  docRef?: firestore.DocumentReference | null,
+  docRef?: firebase.firestore.DocumentReference | null,
   options?: {
-    getOptions?: firestore.GetOptions;
+    getOptions?: firebase.firestore.GetOptions;
     idField?: string;
   }
 ): DocumentDataOnceHook<T> => {
diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
   "dependencies": {},
   "devDependencies": {
     "@types/react": "^16.8.3",
-    "firebase": "^5.5.6",
+    "firebase": "^8.0.0",
     "path": "^0.12.7",
     "react": "^16.8.0",
     "rimraf": "^2.6.2",
diff --git a/storage/useDownloadURL.ts b/storage/useDownloadURL.ts
@@ -1,13 +1,13 @@
-import { storage, FirebaseError } from 'firebase';
+import firebase from 'firebase/app';
 import { useEffect } from 'react';
 import { LoadingHook, useComparatorRef, useLoadingValue } from '../util';
 
-export type DownloadURLHook = LoadingHook<string, FirebaseError>;
+export type DownloadURLHook = LoadingHook<string, firebase.FirebaseError>;
 
-export default (storageRef?: storage.Reference | null): DownloadURLHook => {
+export default (storageRef?: firebase.storage.Reference | null): DownloadURLHook => {
   const { error, loading, reset, setError, setValue, value } = useLoadingValue<
     string,
-    FirebaseError
+    firebase.FirebaseError
   >();
   const ref = useComparatorRef(storageRef, isEqual, reset);
 
@@ -29,8 +29,8 @@ export default (storageRef?: storage.Reference | null): DownloadURLHook => {
 };
 
 const isEqual = (
-  v1: storage.Reference | null | undefined,
-  v2: storage.Reference | null | undefined
+  v1: firebase.storage.Reference | null | undefined,
+  v2: firebase.storage.Reference | null | undefined
 ): boolean => {
   const bothNull: boolean = !v1 && !v2;
   const equal: boolean = !!v1 && !!v2 && v1.fullPath === v2.fullPath;
