refactor: upgrade to firebase 8

posva · posva · commit f276b80c8c41 · 2020-12-08T12:36:52.000+01:00
diff --git a/__tests__/core/firestore/collection.spec.ts b/__tests__/core/firestore/collection.spec.ts
@@ -1,6 +1,6 @@
 import { bindCollection } from '../../../src/core'
 import { db, createOps, spyUnbind } from '../../src'
-import { firestore } from 'firebase'
+import * as firestore from '@firebase/firestore-types'
 import { OperationsType } from '../../../src/core'
 import { ref, Ref } from 'vue'
 
diff --git a/__tests__/core/firestore/document.spec.ts b/__tests__/core/firestore/document.spec.ts
@@ -1,6 +1,6 @@
 import { bindDocument } from '../../../src/core'
 import { db, spyUnbind, createOps } from '../../src'
-import { firestore } from 'firebase'
+import * as firestore from '@firebase/firestore-types'
 import { OperationsType } from '../../../src/shared'
 import { ref, Ref } from 'vue'
 
diff --git a/__tests__/core/firestore/options.spec.ts b/__tests__/core/firestore/options.spec.ts
@@ -4,7 +4,7 @@ import {
   bindCollection,
 } from '../../../src/core'
 import { db, createOps } from '../../src'
-import { firestore } from 'firebase'
+import * as firestore from '@firebase/firestore-types'
 import { Ref, ref } from 'vue'
 
 describe('options', () => {
@@ -32,7 +32,8 @@ describe('options', () => {
       bindDocument(target, document, ops, resolve, reject, { serialize: spy })
     })
     expect(spy).toHaveBeenCalledTimes(1)
-    expect(spy).toBeCalledWith(
+    expect(spy).toHaveBeenCalledWith(
+      // @ts-ignore WTF TS?????
       expect.objectContaining({ data: expect.any(Function) })
     )
     expect(target.value).toEqual({ bar: 'foo' })
@@ -49,6 +50,7 @@ describe('options', () => {
     })
     expect(spy).toHaveBeenCalledTimes(1)
     expect(spy).toBeCalledWith(
+      // @ts-ignore WTF TS?????
       expect.objectContaining({ data: expect.any(Function) })
     )
     expect(target.value).toEqual([{ bar: 'foo' }])
@@ -65,6 +67,7 @@ describe('options', () => {
     })
     expect(spy).toHaveBeenCalledTimes(1)
     expect(spy).toBeCalledWith(
+      // @ts-ignore WTF TS?????
       expect.objectContaining({ data: expect.any(Function) })
     )
     expect(target.value).toEqual({ bar: 'foo' })
@@ -83,6 +86,7 @@ describe('options', () => {
     })
     expect(spy).toHaveBeenCalledTimes(1)
     expect(spy).toBeCalledWith(
+      // @ts-ignore WTF TS?????
       expect.objectContaining({ data: expect.any(Function) })
     )
     expect(target.value).toEqual([{ bar: 'foo' }])
diff --git a/__tests__/core/firestore/refs-collections.spec.ts b/__tests__/core/firestore/refs-collections.spec.ts
@@ -1,7 +1,7 @@
 import { bindCollection, FirestoreOptions } from '../../../src/core'
 import { db, delay, spyUnbind, delayUpdate, createOps } from '../../src'
 import { OperationsType } from '../../../src/shared'
-import { firestore } from 'firebase'
+import * as firestore from '@firebase/firestore-types'
 import { ref } from 'vue'
 
 const buildRefs = () => ({
diff --git a/__tests__/core/firestore/refs-documents.spec.ts b/__tests__/core/firestore/refs-documents.spec.ts
@@ -7,7 +7,7 @@ import {
   spyOnSnapshotCallback,
   createOps,
 } from '../../src'
-import { firestore } from 'firebase'
+import * as firestore from '@firebase/firestore-types'
 import { OperationsType } from '../../../src/shared'
 import { ref, watch } from 'vue'
 
diff --git a/__tests__/core/rtdb/options.spec.ts b/__tests__/core/rtdb/options.spec.ts
@@ -41,6 +41,7 @@ describe('RTDB options', () => {
 
     expect(spy).toHaveBeenCalledTimes(2)
     expect(spy).toHaveBeenLastCalledWith(
+      // @ts-ignore WTF TS?????
       expect.objectContaining({ val: expect.any(Function) })
     )
     expect(target.value).toEqual({ bar: 'foo' })
@@ -66,6 +67,7 @@ describe('RTDB options', () => {
 
     expect(spy).toHaveBeenCalledTimes(1)
     expect(spy).toBeCalledWith(
+      // @ts-ignore WTF TS?????
       expect.objectContaining({ val: expect.any(Function) })
     )
     expect(target.value).toEqual([{ bar: 'foo' }])
@@ -93,6 +95,7 @@ describe('RTDB options', () => {
 
     expect(spy).toHaveBeenCalledTimes(2)
     expect(spy).toBeCalledWith(
+      // @ts-ignore WTF TS?????
       expect.objectContaining({ val: expect.any(Function) })
     )
     expect(target.value).toEqual({ bar: 'foo' })
@@ -122,6 +125,7 @@ describe('RTDB options', () => {
 
     expect(spy).toHaveBeenCalledTimes(1)
     expect(spy).toBeCalledWith(
+      // @ts-ignore WTF TS?????
       expect.objectContaining({ val: expect.any(Function) })
     )
     expect(target.value).toEqual([{ bar: 'foo' }])
diff --git a/__tests__/src/index.ts b/__tests__/src/index.ts
@@ -1,6 +1,6 @@
 import { nextTick } from 'vue-demi'
 import { MockFirebase, MockedReference } from 'firebase-mock'
-import { firestore } from 'firebase'
+import * as firestore from '@firebase/firestore-types'
 import { walkSet } from '../../src/core'
 
 // Vue.config.productionTip = false
diff --git a/__tests__/vuefire/firestore/bind.spec.ts b/__tests__/vuefire/firestore/bind.spec.ts
@@ -1,6 +1,6 @@
 import { firestorePlugin } from '../../../src'
 import { db, tick, delayUpdate } from '../../src'
-import { firestore } from 'firebase'
+import * as firestore from '@firebase/firestore-types'
 import { ComponentPublicInstance } from 'vue'
 import { mount, VueWrapper } from '@vue/test-utils'
 
diff --git a/__tests__/vuefire/firestore/index.spec.ts b/__tests__/vuefire/firestore/index.spec.ts
@@ -1,6 +1,6 @@
 import { firestorePlugin } from '../../../src'
 import { db, tick } from '../../src'
-import { firestore } from 'firebase'
+import * as firestore from '@firebase/firestore-types'
 import { ComponentPublicInstance } from 'vue'
 import { mount, VueWrapper } from '@vue/test-utils'
 
diff --git a/__tests__/vuefire/firestore/merging.spec.ts b/__tests__/vuefire/firestore/merging.spec.ts
@@ -1,6 +1,6 @@
 import { firestorePlugin } from '../../../src'
 import { db } from '../../src'
-import { firestore } from 'firebase'
+import * as firestore from '@firebase/firestore-types'
 import { mount } from '@vue/test-utils'
 
 // FIXME: implement merging strategies
diff --git a/__tests__/vuefire/firestore/options.spec.ts b/__tests__/vuefire/firestore/options.spec.ts
@@ -1,7 +1,7 @@
 import { firestorePlugin } from '../../../src'
 import { db } from '../../src'
 import { mount } from '@vue/test-utils'
-import { firestore } from 'firebase'
+import * as firestore from '@firebase/firestore-types'
 import { defineComponent } from 'vue'
 
 const component = defineComponent({ template: 'no' })
@@ -49,6 +49,7 @@ describe('Firestore: plugin options', () => {
 
     expect(pluginOptions.serialize).toHaveBeenCalledTimes(1)
     expect(pluginOptions.serialize).toHaveBeenCalledWith(
+      // @ts-ignore WTF TS?????
       expect.objectContaining({ data: expect.any(Function) })
     )
     expect(wrapper.vm.items).toEqual([{ foo: 'bar' }])
@@ -81,6 +82,7 @@ describe('Firestore: plugin options', () => {
     expect(pluginOptions.serialize).not.toHaveBeenCalled()
     expect(spy).toHaveBeenCalledTimes(1)
     expect(spy).toHaveBeenCalledWith(
+      // @ts-ignore WTF TS?????
       expect.objectContaining({ data: expect.any(Function) })
     )
     expect(wrapper.vm.items).toEqual([{ bar: 'bar' }])
diff --git a/__tests__/vuefire/rtdb/options.spec.ts b/__tests__/vuefire/rtdb/options.spec.ts
@@ -50,6 +50,7 @@ describe('RTDB: plugin options', () => {
 
     expect(pluginOptions.serialize).toHaveBeenCalledTimes(1)
     expect(pluginOptions.serialize).toHaveBeenCalledWith(
+      // @ts-ignore WTF TS?????
       expect.objectContaining({ val: expect.any(Function) })
     )
     expect(vm.items).toEqual([{ foo: 'bar' }])
@@ -84,6 +85,7 @@ describe('RTDB: plugin options', () => {
     expect(pluginOptions.serialize).not.toHaveBeenCalled()
     expect(spy).toHaveBeenCalledTimes(1)
     expect(spy).toHaveBeenCalledWith(
+      // @ts-ignore WTF TS?????
       expect.objectContaining({ val: expect.any(Function) })
     )
     expect(vm.items).toEqual([{ bar: 'bar' }])
diff --git a/old_src/vuexfire/rtdb.ts b/old_src/vuexfire/rtdb.ts
@@ -10,7 +10,7 @@ import {
   RTDBOptions,
   rtdbOptions,
 } from '../core'
-import { database } from 'firebase'
+import * as database from '@firebase/database-types'
 import { CommitFunction } from './shared'
 
 import { Action, ActionContext } from 'vuex'
diff --git a/package.json b/package.json
@@ -51,13 +51,13 @@
     "@rollup/plugin-node-resolve": "^9.0.0",
     "@rollup/plugin-replace": "^2.3.3",
     "@size-limit/preset-small-lib": "^4.5.5",
-    "@types/jest": "^26.0.8",
+    "@types/jest": "^26.0.17",
     "@types/jsdom": "^16.2.3",
     "@vue/test-utils": "^2.0.0-beta.1",
     "algoliasearch": "^4.8.2",
     "codecov": "^3.7.2",
     "conventional-changelog-cli": "^2.0.34",
-    "firebase": "^7.19.1",
+    "firebase": "^8.1.2",
     "firebase-mock": "^2.3.2",
     "focus-visible": "^5.2.0",
     "jest": "^26.2.2",
@@ -66,7 +66,7 @@
     "prettier": "^2.0.5",
     "rollup": "^2.23.0",
     "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-typescript2": "^0.27.1",
+    "rollup-plugin-typescript2": "^0.29.0",
     "size-limit": "^4.5.5",
     "ts-jest": "^26.1.4",
     "typescript": "^4.0.2",
diff --git a/src/firestore/index.ts b/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 * as firestore from '@firebase/firestore-types'
 import { ref, Ref, unref } from 'vue-demi'
 
 export interface FirestoreOptions {
diff --git a/src/firestore/utils.ts b/src/firestore/utils.ts
@@ -1,4 +1,4 @@
-import { firestore } from 'firebase'
+import * as firestore from '@firebase/firestore-types'
 import { isTimestamp, isObject, isDocumentRef, TODO } from '../shared'
 
 export type FirestoreReference =
diff --git a/src/global.d.ts b/src/global.d.ts
@@ -4,7 +4,7 @@ declare var __BROWSER__: boolean
 declare var __CI__: boolean
 
 declare module 'firebase-mock' {
-  import { database } from 'firebase'
+  import * as database from '@firebase/database-types'
 
   type TODO = any
 
diff --git a/src/rtdb/index.ts b/src/rtdb/index.ts
@@ -1,4 +1,4 @@
-import { database } from 'firebase'
+import * as database from '@firebase/database-types'
 import {
   createRecordFromRTDBSnapshot,
   indexForKey,
diff --git a/src/rtdb/utils.ts b/src/rtdb/utils.ts
@@ -1,4 +1,4 @@
-import { database } from 'firebase'
+import * as database from '@firebase/database-types'
 import { isObject } from '../shared'
 
 /**
diff --git a/src/shared.ts b/src/shared.ts
@@ -1,12 +1,8 @@
-import { firestore } from 'firebase'
+import * as firestore from '@firebase/firestore-types'
 
 export interface OperationsType {
   set: (target: Record<string, any>, key: string | number, value: any) => any
-  add: (
-    array: any[],
-    index: number,
-    data: firebase.firestore.DocumentData
-  ) => any
+  add: (array: any[], index: number, data: firestore.DocumentData) => any
   remove: (array: any[], index: number) => any
 }
 
diff --git a/src/vuefire/firestore.ts b/src/vuefire/firestore.ts
@@ -6,7 +6,7 @@ import {
   FirestoreOptions,
   OperationsType,
 } from '../core'
-import { firestore } from 'firebase'
+import * as firestore from '@firebase/firestore-types'
 import {
   App,
   ComponentPublicInstance,
diff --git a/src/vuefire/rtdb.ts b/src/vuefire/rtdb.ts
@@ -6,7 +6,7 @@ import {
   walkSet,
   OperationsType,
 } from '../core'
-import { database } from 'firebase'
+import * as database from '@firebase/database-types'
 import {
   ComponentPublicInstance,
   App,
diff --git a/yarn.lock b/yarn.lock
