fix test

Author: aperron

packages/@posva/vuefire-test-helpers/src/index.ts

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import { MockFirebase, MockedReference } from 'firebase-mock'
-import { firestore } from '../../../../node_modules/firebase/index'
+import firebase from '../../../../node_modules/firebase/index'
 import { walkSet } from '@posva/vuefire-core'
 
 Vue.config.productionTip = false
@@ -10,9 +10,9 @@ export { Vue, MockFirebase, MockedReference }
 export * from './mock'
 
 type FirestoreReference =
-  | firestore.CollectionReference
-  | firestore.DocumentReference
-  | firestore.Query
+  | firebase.firestore.CollectionReference
+  | firebase.firestore.DocumentReference
+  | firebase.firestore.Query
 
 export function spyUnbind(ref: FirestoreReference) {
   const unbindSpy = jest.fn()
@@ -49,7 +49,7 @@ export function spyOnSnapshotCallback(ref: FirestoreReference) {
 }
 
 // This makes sure some tests fail by delaying callbacks
-export function delayUpdate(ref: firestore.DocumentReference, time = 0) {
+export function delayUpdate(ref: firebase.firestore.DocumentReference, time = 0) {
   const onSnapshot = ref.onSnapshot.bind(ref)
   // @ts-ignore
   ref.onSnapshot = fn =>

packages/vuefire/__tests__/firestore/bind.spec.ts

@@ -1,13 +1,13 @@
 import { firestorePlugin } from '../../src'
 import { db, tick, delayUpdate, Vue } from '@posva/vuefire-test-helpers'
-import { firestore } from 'firebase'
+import firebase from 'firebase/app'
 import { CombinedVueInstance } from 'vue/types/vue'
 
 Vue.use(firestorePlugin)
 
 describe('Firestore: binding', () => {
-  let collection: firestore.CollectionReference,
-    document: firestore.DocumentReference,
+  let collection: firebase.firestore.CollectionReference,
+    document: firebase.firestore.DocumentReference,
     vm: CombinedVueInstance<Vue, { items: any[]; item: any }, object, object, Record<never, any>>
   beforeEach(async () => {
     // @ts-ignore
@@ -59,7 +59,7 @@ describe('Firestore: binding', () => {
   it('unbinds previously bound refs', async () => {
     await document.update({ foo: 'foo' })
     // @ts-ignore
-    const doc2: firestore.DocumentReference = db.collection().doc()
+    const doc2: firebase.firestore.DocumentReference = db.collection().doc()
     await doc2.update({ bar: 'bar' })
     await vm.$bind('item', document)
     expect(vm.$firestoreRefs.item).toBe(document)
@@ -74,7 +74,7 @@ describe('Firestore: binding', () => {
   it('waits for all refs in document', async () => {
     const a = db.collection().doc()
     // @ts-ignore
-    const b: firestore.DocumentReference = db.collection().doc()
+    const b: firebase.firestore.DocumentReference = db.collection().doc()
     delayUpdate(b)
     await document.update({ a, b })
 
@@ -89,7 +89,7 @@ describe('Firestore: binding', () => {
   test('waits for all refs in document with interrupting by new ref', async () => {
     const a = db.collection().doc()
     // @ts-ignore
-    const b: firestore.DocumentReference = db.collection().doc()
+    const b: firebase.firestore.DocumentReference = db.collection().doc()
     const c = db.collection().doc()
     delayUpdate(b)
     await document.update({ a, b })
@@ -110,7 +110,7 @@ describe('Firestore: binding', () => {
   it('waits for all refs in collection', async () => {
     const a = db.collection().doc()
     // @ts-ignore
-    const b: firestore.DocumentReference = db.collection().doc()
+    const b: firebase.firestore.DocumentReference = db.collection().doc()
     delayUpdate(b)
     await collection.add({ a })
     await collection.add({ b })
@@ -123,9 +123,9 @@ describe('Firestore: binding', () => {
   it('waits for nested refs in document', async () => {
     const a = db.collection().doc()
     // @ts-ignore
-    const b: firestore.DocumentReference = db.collection().doc()
+    const b: firebase.firestore.DocumentReference = db.collection().doc()
     // @ts-ignore
-    const c: firestore.DocumentReference = db.collection().doc()
+    const c: firebase.firestore.DocumentReference = db.collection().doc()
     await b.update({ c })
     delayUpdate(b)
     delayUpdate(c, 5)
@@ -142,9 +142,9 @@ describe('Firestore: binding', () => {
   it('waits for nested refs with data in document', async () => {
     const a = db.collection().doc()
     // @ts-ignore
-    const b: firestore.DocumentReference = db.collection().doc()
+    const b: firebase.firestore.DocumentReference = db.collection().doc()
     // @ts-ignore
-    const c: firestore.DocumentReference = db.collection().doc()
+    const c: firebase.firestore.DocumentReference = db.collection().doc()
     await a.update({ isA: true })
     await c.update({ isC: true })
     await b.update({ c })
@@ -163,9 +163,9 @@ describe('Firestore: binding', () => {
   it('waits for nested refs in collections', async () => {
     const a = db.collection().doc()
     // @ts-ignore
-    const b: firestore.DocumentReference = db.collection().doc()
+    const b: firebase.firestore.DocumentReference = db.collection().doc()
     // @ts-ignore
-    const c: firestore.DocumentReference = db.collection().doc()
+    const c: firebase.firestore.DocumentReference = db.collection().doc()
     await b.update({ c })
     delayUpdate(b)
     delayUpdate(c, 5)
@@ -180,9 +180,9 @@ describe('Firestore: binding', () => {
   it('waits for nested refs with data in collections', async () => {
     const a = db.collection().doc()
     // @ts-ignore
-    const b: firestore.DocumentReference = db.collection().doc()
+    const b: firebase.firestore.DocumentReference = db.collection().doc()
     // @ts-ignore
-    const c: firestore.DocumentReference = db.collection().doc()
+    const c: firebase.firestore.DocumentReference = db.collection().doc()
     await a.update({ isA: true })
     await c.update({ isC: true })
     await b.update({ c })
@@ -199,7 +199,7 @@ describe('Firestore: binding', () => {
   it('can customize the reset option through $bind', async () => {
     await document.update({ foo: 'foo' })
     // @ts-ignore
-    const doc2: firestore.DocumentReference = db.collection().doc()
+    const doc2: firebase.firestore.DocumentReference = db.collection().doc()
     await doc2.update({ bar: 'bar' })
     await vm.$bind('item', document)
     expect(vm.item).toEqual({ foo: 'foo' })
@@ -214,7 +214,7 @@ describe('Firestore: binding', () => {
   it('can customize the reset option through $unbind', async () => {
     await document.update({ foo: 'foo' })
     // @ts-ignore
-    const doc2: firestore.DocumentReference = db.collection().doc()
+    const doc2: firebase.firestore.DocumentReference = db.collection().doc()
     await doc2.update({ bar: 'bar' })
     await vm.$bind('item', document)
     vm.$unbind('item', false)
@@ -229,7 +229,7 @@ describe('Firestore: binding', () => {
     await collection.add({ foo: 'foo' })
     await vm.$bind('items', collection)
     // @ts-ignore
-    const col2: firestore.CollectionReference = db.collection()
+    const col2: firebase.firestore.CollectionReference = db.collection()
     await col2.add({ bar: 'bar' })
     const p = vm.$bind('items', col2, { wait: true, reset: true })
     expect(vm.items).toEqual([{ foo: 'foo' }])
@@ -241,7 +241,7 @@ describe('Firestore: binding', () => {
     await collection.add({ foo: 'foo' })
     await vm.$bind('items', collection)
     // @ts-ignore
-    const col2: firestore.CollectionReference = db.collection()
+    const col2: firebase.firestore.CollectionReference = db.collection()
     await col2.add({ bar: 'bar' })
     const p = vm.$bind('items', col2, { wait: true, reset: () => ['foo'] })
     expect(vm.items).toEqual(['foo'])

packages/vuefire/__tests__/firestore/index.spec.ts

@@ -1,13 +1,13 @@
 import { firestorePlugin } from '../../src'
 import { db, tick, Vue } from '@posva/vuefire-test-helpers'
-import { firestore } from 'firebase'
+import firebase from 'firebase/app'
 import { CombinedVueInstance } from 'vue/types/vue'
 
 Vue.use(firestorePlugin)
 
 describe('Firestore: firestore option', () => {
-  let collection: firestore.CollectionReference,
-    document: firestore.DocumentReference,
+  let collection: firebase.firestore.CollectionReference,
+    document: firebase.firestore.DocumentReference,
     vm: CombinedVueInstance<Vue, { items: any[]; item: any }, object, object, Record<never, any>>
   beforeEach(async () => {
     // @ts-ignore

packages/vuefire/__tests__/firestore/merging.spec.ts

@@ -1,6 +1,5 @@
 import { firestorePlugin } from '../../src'
 import { db, Vue } from '@posva/vuefire-test-helpers'
-import { firestore } from 'firebase'
 
 Vue.use(firestorePlugin)
 

packages/vuefire/__tests__/firestore/options.spec.ts

@@ -1,6 +1,5 @@
 import { firestorePlugin } from '../../src'
 import { db, Vue } from '@posva/vuefire-test-helpers'
-import { firestore } from 'firebase'
 
 const createLocalVue = () => {
   const newVue = Vue.extend()

packages/vuefire/src/firestore.ts

@@ -163,9 +163,10 @@ export const firestorePlugin: PluginFunction<PluginOptions> = function firestore
     },
     created(this: Vue) {
       const { firestore } = this.$options
-      const refs = typeof firestore === 'function' ? firebase.firestore.call(this) : firestore
+      const refs = typeof firestore === 'function' ? firestore.call(this) : firestore
       if (!refs) return
       for (const key in refs) {
+        // @ts-ignore
         this[bindName as keyof Vue](key, refs[key], globalOptions)
       }
     },

rollup.config.js

@@ -51,7 +51,7 @@ function createEntry(
       }),
       alias({
         resolve: ['.ts', '.js'],
-        entries: [{ find: 'firebase', replacement: path.join(__dirname, './stub') }],
+        entries: [{ find: 'firebase/app', replacement: path.join(__dirname, './stub') }],
       }),
     ],
     output: {

stub.ts

@@ -1,2 +1,3 @@
 const database = {}
 export { database }
+export default database