update firebase 7.24.0 -> 8.0.1

Author: aperron

package.json

@@ -23,7 +23,7 @@
     "eslint": "^6.1.0",
     "eslint-config-prettier": "^6.0.0",
     "eslint-plugin-prettier": "^3.1.0",
-    "firebase": "^7.2.3",
+    "firebase": "^8.0.1",
     "jest": "^25.1.0",
     "lerna": "^3.16.2",
     "prettier": "^1.18.2",

packages/@posva/vuefire-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@posva/vuefire-core",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "description": "Shared code for vue + Firebase apps used by vuefire and vuexfire",
   "author": "Eduardo San Martin Morote <[email protected]>",
   "homepage": "https://github.com/vuejs/vuefire#readme",

packages/@posva/vuefire-core/src/firestore/index.ts

@@ -1,6 +1,6 @@
 import { createSnapshot, extractRefs, FirestoreSerializer } from './utils'
 import { walkGet, callOnceWithArg, OperationsType } from '../shared'
-import { firestore } from 'firebase'
+import firebase from 'firebase/app'
 
 export interface FirestoreOptions {
   maxRefDepth?: number
@@ -21,7 +21,7 @@ interface FirestoreSubscription {
   unsub: () => void
   // Firestore unique key eg: items/12
   path: string
-  data: () => firestore.DocumentData | null
+  data: () => firebase.firestore.DocumentData | null
   // // path inside the object to access the data items.3
   // key: string
 }
@@ -36,7 +36,7 @@ function updateDataFromDocumentSnapshot(
   options: Required<FirestoreOptions>,
   target: CommonBindOptionsParameter['vm'],
   path: string,
-  snapshot: firestore.DocumentSnapshot,
+  snapshot: firebase.firestore.DocumentSnapshot,
   subs: Record<string, FirestoreSubscription>,
   ops: CommonBindOptionsParameter['ops'],
   depth: number,
@@ -53,7 +53,7 @@ interface SubscribeToDocumentParamater {
   depth: number
   resolve: () => void
   ops: CommonBindOptionsParameter['ops']
-  ref: firestore.DocumentReference
+  ref: firebase.firestore.DocumentReference
 }
 
 function subscribeToDocument(
@@ -79,7 +79,7 @@ function subscribeToDocument(
 interface SubscribeToRefsParameter {
   subs: Record<string, FirestoreSubscription>
   target: CommonBindOptionsParameter['vm']
-  refs: Record<string, firestore.DocumentReference>
+  refs: Record<string, firebase.firestore.DocumentReference>
   path: string | number
   depth: number
   resolve: CommonBindOptionsParameter['resolve']
@@ -94,7 +94,7 @@ function subscribeToRefs(
   target: CommonBindOptionsParameter['vm'],
   path: string | number,
   subs: Record<string, FirestoreSubscription>,
-  refs: Record<string, firestore.DocumentReference>,
+  refs: Record<string, firebase.firestore.DocumentReference>,
   ops: CommonBindOptionsParameter['ops'],
   depth: number,
   resolve: CommonBindOptionsParameter['resolve']
@@ -159,7 +159,7 @@ interface CommonBindOptionsParameter {
 }
 
 interface BindCollectionParamater extends CommonBindOptionsParameter {
-  collection: firestore.CollectionReference | firestore.Query
+  collection: firebase.firestore.CollectionReference | firebase.firestore.Query
 }
 
 // TODO: refactor without using an object to improve size like the other functions
@@ -179,14 +179,14 @@ export function bindCollection(
   const arraySubs: Record<string, FirestoreSubscription>[] = []
 
   const change = {
-    added: ({ newIndex, doc }: firestore.DocumentChange) => {
+    added: ({ newIndex, doc }: firebase.firestore.DocumentChange) => {
       arraySubs.splice(newIndex, 0, Object.create(null))
       const subs = arraySubs[newIndex]
       const [data, refs] = extractRefs(options.serialize(doc), undefined, subs)
       ops.add(array, newIndex, data)
       subscribeToRefs(options, array, newIndex, subs, refs, ops, 0, resolve.bind(null, doc))
     },
-    modified: ({ oldIndex, newIndex, doc }: firestore.DocumentChange) => {
+    modified: ({ oldIndex, newIndex, doc }: firebase.firestore.DocumentChange) => {
       const subs = arraySubs[oldIndex]
       const oldData = array[oldIndex]
       const [data, refs] = extractRefs(options.serialize(doc), oldData, subs)
@@ -197,7 +197,7 @@ export function bindCollection(
       ops.add(array, newIndex, data)
       subscribeToRefs(options, array, newIndex, subs, refs, ops, 0, resolve)
     },
-    removed: ({ oldIndex }: firestore.DocumentChange) => {
+    removed: ({ oldIndex }: firebase.firestore.DocumentChange) => {
       ops.remove(array, oldIndex)
       unsubscribeAll(arraySubs.splice(oldIndex, 1)[0])
     },
@@ -215,7 +215,7 @@ export function bindCollection(
       typeof snapshot.docChanges === 'function'
         ? snapshot.docChanges()
         : /* istanbul ignore next to support firebase < 5*/
-          ((snapshot.docChanges as unknown) as firestore.DocumentChange[])
+          ((snapshot.docChanges as unknown) as firebase.firestore.DocumentChange[])
 
     if (!isResolved && docChanges.length) {
       // isResolved is only meant to make sure we do the check only once
@@ -263,7 +263,7 @@ export function bindCollection(
 }
 
 interface BindDocumentParamater extends CommonBindOptionsParameter {
-  document: firestore.DocumentReference
+  document: firebase.firestore.DocumentReference
 }
 
 /**

packages/@posva/vuefire-core/src/firestore/utils.ts

@@ -1,13 +1,13 @@
-import { firestore } from 'firebase'
+import firebase from 'firebase/app'
 import { isTimestamp, isObject, isDocumentRef, TODO } from '../shared'
 
 export type FirestoreReference =
-  | firestore.Query
-  | firestore.DocumentReference
-  | firestore.CollectionReference
+  | firebase.firestore.Query
+  | firebase.firestore.DocumentReference
+  | firebase.firestore.CollectionReference
 
 // TODO: fix type not to be any
-export function createSnapshot(doc: firestore.DocumentSnapshot): TODO {
+export function createSnapshot(doc: firebase.firestore.DocumentSnapshot): TODO {
   // TODO: it should create a deep copy instead because otherwise we will modify internal data
   // defaults everything to false, so no need to set
   return Object.defineProperty(doc.data() || {}, 'id', { value: doc.id })
@@ -16,11 +16,11 @@ export function createSnapshot(doc: firestore.DocumentSnapshot): TODO {
 export type FirestoreSerializer = typeof createSnapshot
 
 export function extractRefs(
-  doc: firestore.DocumentData,
-  oldDoc: firestore.DocumentData | void,
-  subs: Record<string, { path: string; data: () => firestore.DocumentData | null }>
-): [firestore.DocumentData, Record<string, firestore.DocumentReference>] {
-  const dataAndRefs: [firestore.DocumentData, Record<string, firestore.DocumentReference>] = [
+  doc: firebase.firestore.DocumentData,
+  oldDoc: firebase.firestore.DocumentData | void,
+  subs: Record<string, { path: string; data: () => firebase.firestore.DocumentData | null }>
+): [firebase.firestore.DocumentData, Record<string, firebase.firestore.DocumentReference>] {
+  const dataAndRefs: [firebase.firestore.DocumentData, Record<string, firebase.firestore.DocumentReference>] = [
     {},
     {},
   ]
@@ -29,13 +29,13 @@ export function extractRefs(
     const sub = subs[subKey]
     resultSubs[sub.path] = sub.data()
     return resultSubs
-  }, {} as Record<string, firestore.DocumentData | null>)
+  }, {} as Record<string, firebase.firestore.DocumentData | null>)
 
   function recursiveExtract(
-    doc: firestore.DocumentData,
-    oldDoc: firestore.DocumentData | void,
+    doc: firebase.firestore.DocumentData,
+    oldDoc: firebase.firestore.DocumentData | void,
     path: string,
-    result: [firestore.DocumentData, Record<string, firestore.DocumentReference>]
+    result: [firebase.firestore.DocumentData, Record<string, firebase.firestore.DocumentReference>]
   ): void {
     // make it easier to later on access the value
     oldDoc = oldDoc || {}

packages/@posva/vuefire-core/src/rtdb/index.ts

@@ -1,4 +1,4 @@
-import { database } from 'firebase'
+import firebase from 'firebase/app'
 import { createRecordFromRTDBSnapshot, indexForKey, RTDBSerializer } from './utils'
 import { OperationsType, ResetOption } from '../shared'
 
@@ -27,7 +27,7 @@ interface CommonBindOptionsParameter {
 // TODO: refactor using normal arguments instead of an array to improve size
 
 interface BindAsObjectParameter extends CommonBindOptionsParameter {
-  document: database.Reference | database.Query
+  document: firebase.database.Reference | firebase.database.Query
 }
 
 /**
@@ -60,7 +60,7 @@ export function rtdbBindAsObject(
 }
 
 interface BindAsArrayParameter extends CommonBindOptionsParameter {
-  collection: database.Reference | database.Query
+  collection: firebase.database.Reference | firebase.database.Query
 }
 
 /**

packages/@posva/vuefire-core/src/rtdb/utils.ts

@@ -1,4 +1,4 @@
-import { database } from 'firebase'
+import firebase from 'firebase/app'
 import { isObject } from '../shared'
 
 /**
@@ -7,7 +7,7 @@ import { isObject } from '../shared'
  * @param snapshot
  * @return
  */
-export function createRecordFromRTDBSnapshot(snapshot: database.DataSnapshot): any {
+export function createRecordFromRTDBSnapshot(snapshot: firebase.database.DataSnapshot): any {
   const value = snapshot.val()
   const res = isObject(value) ? value : Object.defineProperty({}, '.value', { value })
   // if (isObject(value)) {

packages/@posva/vuefire-core/src/shared.ts

@@ -1,4 +1,4 @@
-import { firestore } from 'firebase'
+import firebase from 'firebase/app'
 
 export interface OperationsType {
   set: (target: Record<string, any>, key: string | number, value: any) => any
@@ -62,7 +62,7 @@ export function isTimestamp(o: any): o is Date {
  * Checks if a variable is a Firestore Document Reference
  * @param o
  */
-export function isDocumentRef(o: any): o is firestore.DocumentReference {
+export function isDocumentRef(o: any): o is firebase.firestore.DocumentReference {
   return o && o.onSnapshot
 }
 

packages/vuefire/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vuefire",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "description": "Firestore bindings for Vue.js",
   "main": "dist/vuefire.common.js",
   "module": "dist/vuefire.esm.js",

packages/vuefire/src/firestore.ts

@@ -6,7 +6,7 @@ import {
   FirestoreOptions,
   OperationsType,
 } from '@posva/vuefire-core'
-import { firestore } from 'firebase'
+import firebase from 'firebase/app'
 import Vue, { PluginFunction } from 'vue'
 
 const ops: OperationsType = {
@@ -18,7 +18,7 @@ const ops: OperationsType = {
 function bind(
   vm: Record<string, any>,
   key: string,
-  ref: firestore.CollectionReference | firestore.Query | firestore.DocumentReference,
+  ref: firebase.firestore.CollectionReference | firebase.firestore.Query | firebase.firestore.DocumentReference,
   ops: OperationsType,
   options: FirestoreOptions
 ) {
@@ -74,20 +74,20 @@ declare module 'vue/types/vue' {
   interface Vue {
     $bind(
       name: string,
-      reference: firestore.Query | firestore.CollectionReference,
+      reference: firebase.firestore.Query | firebase.firestore.CollectionReference,
       options?: FirestoreOptions
-    ): Promise<firestore.DocumentData[]>
+    ): Promise<firebase.firestore.DocumentData[]>
     $bind(
       name: string,
-      reference: firestore.DocumentReference,
+      reference: firebase.firestore.DocumentReference,
       options?: FirestoreOptions
-    ): Promise<firestore.DocumentData>
+    ): Promise<firebase.firestore.DocumentData>
     $unbind: (name: string, reset?: FirestoreOptions['reset']) => void
     $firestoreRefs: Readonly<
-      Record<string, firestore.DocumentReference | firestore.CollectionReference>
+      Record<string, firebase.firestore.DocumentReference | firebase.firestore.CollectionReference>
     >
     // _firestoreSources: Readonly<
-    //   Record<string, firestore.CollectionReference | firestore.Query | firestore.DocumentReference>
+    //   Record<string, firebase.firestore.CollectionReference | firebase.firestore.Query | firebase.firestore.DocumentReference>
     // >
     _firestoreUnbinds: Readonly<
       Record<string, ReturnType<typeof bindCollection | typeof bindDocument>>
@@ -97,7 +97,7 @@ declare module 'vue/types/vue' {
 
 type VueFirestoreObject = Record<
   string,
-  firestore.DocumentReference | firestore.Query | firestore.CollectionReference
+  firebase.firestore.DocumentReference | firebase.firestore.Query | firebase.firestore.CollectionReference
 >
 type FirestoreOption<V> = VueFirestoreObject | ((this: V) => VueFirestoreObject)
 
@@ -129,7 +129,7 @@ export const firestorePlugin: PluginFunction<PluginOptions> = function firestore
   Vue.prototype[bindName] = function firestoreBind(
     this: Vue,
     key: string,
-    ref: firestore.Query | firestore.CollectionReference | firestore.DocumentReference,
+    ref: firebase.firestore.Query | firebase.firestore.CollectionReference | firebase.firestore.DocumentReference,
     userOptions?: FirestoreOptions
   ) {
     const options = Object.assign({}, globalOptions, userOptions)
@@ -155,7 +155,7 @@ export const firestorePlugin: PluginFunction<PluginOptions> = function firestore
     },
     created(this: Vue) {
       const { firestore } = this.$options
-      const refs = typeof firestore === 'function' ? firestore.call(this) : firestore
+      const refs = typeof firestore === 'function' ? firebase.firestore.call(this) : firestore
       if (!refs) return
       for (const key in refs) {
         this[bindName as keyof Vue](key, refs[key], globalOptions)

packages/vuefire/src/rtdb.ts

@@ -6,16 +6,16 @@ import {
   walkSet,
   OperationsType,
 } from '@posva/vuefire-core'
-import { database } from 'firebase'
+import firebase from 'firebase/app'
 import Vue, { PluginFunction } from 'vue'
 
 /**
  * Returns the original reference of a Firebase reference or query across SDK versions.
  *
- * @param {firebase.database.Reference|firebase.database.Query} refOrQuery
- * @return {firebase.database.Reference}
+ * @param {firebase.firebase.database.Reference|firebase.firebase.database.Query} refOrQuery
+ * @return {firebase.firebase.database.Reference}
  */
-function getRef(refOrQuery: database.Reference | database.Query): database.Reference {
+function getRef(refOrQuery: firebase.database.Reference | firebase.database.Query): firebase.database.Reference {
   return refOrQuery.ref
 }
 
@@ -28,7 +28,7 @@ const ops: OperationsType = {
 function bind(
   vm: Record<string, any>,
   key: string,
-  source: database.Query | database.Reference,
+  source: firebase.database.Query | firebase.database.Reference,
   options: RTDBOptions
 ) {
   return new Promise((resolve, reject) => {
@@ -89,17 +89,17 @@ declare module 'vue/types/vue' {
   interface Vue {
     $rtdbBind(
       name: string,
-      reference: database.Reference | database.Query,
+      reference: firebase.database.Reference | firebase.database.Query,
       options?: RTDBOptions
-    ): Promise<database.DataSnapshot>
+    ): Promise<firebase.database.DataSnapshot>
     $rtdbUnbind: (name: string, reset?: RTDBOptions['reset']) => void
-    $firebaseRefs: Readonly<Record<string, database.Reference>>
-    _firebaseSources: Readonly<Record<string, database.Reference | database.Query>>
+    $firebaseRefs: Readonly<Record<string, firebase.database.Reference>>
+    _firebaseSources: Readonly<Record<string, firebase.database.Reference | firebase.database.Query>>
     _firebaseUnbinds: Readonly<Record<string, ReturnType<typeof bindAsArray | typeof bindAsObject>>>
   }
 }
 
-type VueFirebaseObject = Record<string, database.Query | database.Reference>
+type VueFirebaseObject = Record<string, firebase.database.Query | firebase.database.Reference>
 type FirebaseOption<V> = VueFirebaseObject | ((this: V) => VueFirebaseObject)
 
 declare module 'vue/types/options' {
@@ -126,7 +126,7 @@ export const rtdbPlugin: PluginFunction<PluginOptions> = function rtdbPlugin(
   Vue.prototype[bindName] = function rtdbBind(
     this: Vue,
     key: string,
-    source: database.Reference | database.Query,
+    source: firebase.database.Reference | firebase.database.Query,
     userOptions?: RTDBOptions
   ) {
     const options = Object.assign({}, globalOptions, userOptions)

packages/vuexfire/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vuexfire",
-  "version": "3.2.4",
+  "version": "3.2.5",
   "description": "Firestore binding for Vuex",
   "main": "dist/vuexfire.common.js",
   "module": "dist/vuexfire.esm.js",