Skip to content

Commit f276b80

Browse files
posvaposva
committed
refactor: upgrade to firebase 8
1 parent c1adcd3 commit f276b80

23 files changed

+445
-283
lines changed

‎__tests__/core/firestore/collection.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { bindCollection } from '../../../src/core'
22
import { db, createOps, spyUnbind } from '../../src'
3-
import { firestore } from 'firebase'
3+
import * as firestore from '@firebase/firestore-types'
44
import { OperationsType } from '../../../src/core'
55
import { ref, Ref } from 'vue'
66

‎__tests__/core/firestore/document.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { bindDocument } from '../../../src/core'
22
import { db, spyUnbind, createOps } from '../../src'
3-
import { firestore } from 'firebase'
3+
import * as firestore from '@firebase/firestore-types'
44
import { OperationsType } from '../../../src/shared'
55
import { ref, Ref } from 'vue'
66

‎__tests__/core/firestore/options.spec.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
bindCollection,
55
} from '../../../src/core'
66
import { db, createOps } from '../../src'
7-
import { firestore } from 'firebase'
7+
import * as firestore from '@firebase/firestore-types'
88
import { Ref, ref } from 'vue'
99

1010
describe('options', () => {
@@ -32,7 +32,8 @@ describe('options', () => {
3232
bindDocument(target, document, ops, resolve, reject, { serialize: spy })
3333
})
3434
expect(spy).toHaveBeenCalledTimes(1)
35-
expect(spy).toBeCalledWith(
35+
expect(spy).toHaveBeenCalledWith(
36+
// @ts-ignore WTF TS?????
3637
expect.objectContaining({ data: expect.any(Function) })
3738
)
3839
expect(target.value).toEqual({ bar: 'foo' })
@@ -49,6 +50,7 @@ describe('options', () => {
4950
})
5051
expect(spy).toHaveBeenCalledTimes(1)
5152
expect(spy).toBeCalledWith(
53+
// @ts-ignore WTF TS?????
5254
expect.objectContaining({ data: expect.any(Function) })
5355
)
5456
expect(target.value).toEqual([{ bar: 'foo' }])
@@ -65,6 +67,7 @@ describe('options', () => {
6567
})
6668
expect(spy).toHaveBeenCalledTimes(1)
6769
expect(spy).toBeCalledWith(
70+
// @ts-ignore WTF TS?????
6871
expect.objectContaining({ data: expect.any(Function) })
6972
)
7073
expect(target.value).toEqual({ bar: 'foo' })
@@ -83,6 +86,7 @@ describe('options', () => {
8386
})
8487
expect(spy).toHaveBeenCalledTimes(1)
8588
expect(spy).toBeCalledWith(
89+
// @ts-ignore WTF TS?????
8690
expect.objectContaining({ data: expect.any(Function) })
8791
)
8892
expect(target.value).toEqual([{ bar: 'foo' }])

‎__tests__/core/firestore/refs-collections.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { bindCollection, FirestoreOptions } from '../../../src/core'
22
import { db, delay, spyUnbind, delayUpdate, createOps } from '../../src'
33
import { OperationsType } from '../../../src/shared'
4-
import { firestore } from 'firebase'
4+
import * as firestore from '@firebase/firestore-types'
55
import { ref } from 'vue'
66

77
const buildRefs = () => ({

‎__tests__/core/firestore/refs-documents.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
spyOnSnapshotCallback,
88
createOps,
99
} from '../../src'
10-
import { firestore } from 'firebase'
10+
import * as firestore from '@firebase/firestore-types'
1111
import { OperationsType } from '../../../src/shared'
1212
import { ref, watch } from 'vue'
1313

‎__tests__/core/rtdb/options.spec.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ describe('RTDB options', () => {
4141

4242
expect(spy).toHaveBeenCalledTimes(2)
4343
expect(spy).toHaveBeenLastCalledWith(
44+
// @ts-ignore WTF TS?????
4445
expect.objectContaining({ val: expect.any(Function) })
4546
)
4647
expect(target.value).toEqual({ bar: 'foo' })
@@ -66,6 +67,7 @@ describe('RTDB options', () => {
6667

6768
expect(spy).toHaveBeenCalledTimes(1)
6869
expect(spy).toBeCalledWith(
70+
// @ts-ignore WTF TS?????
6971
expect.objectContaining({ val: expect.any(Function) })
7072
)
7173
expect(target.value).toEqual([{ bar: 'foo' }])
@@ -93,6 +95,7 @@ describe('RTDB options', () => {
9395

9496
expect(spy).toHaveBeenCalledTimes(2)
9597
expect(spy).toBeCalledWith(
98+
// @ts-ignore WTF TS?????
9699
expect.objectContaining({ val: expect.any(Function) })
97100
)
98101
expect(target.value).toEqual({ bar: 'foo' })
@@ -122,6 +125,7 @@ describe('RTDB options', () => {
122125

123126
expect(spy).toHaveBeenCalledTimes(1)
124127
expect(spy).toBeCalledWith(
128+
// @ts-ignore WTF TS?????
125129
expect.objectContaining({ val: expect.any(Function) })
126130
)
127131
expect(target.value).toEqual([{ bar: 'foo' }])

‎__tests__/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { nextTick } from 'vue-demi'
22
import { MockFirebase, MockedReference } from 'firebase-mock'
3-
import { firestore } from 'firebase'
3+
import * as firestore from '@firebase/firestore-types'
44
import { walkSet } from '../../src/core'
55

66
// Vue.config.productionTip = false

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { firestorePlugin } from '../../../src'
22
import { db, tick, delayUpdate } from '../../src'
3-
import { firestore } from 'firebase'
3+
import * as firestore from '@firebase/firestore-types'
44
import { ComponentPublicInstance } from 'vue'
55
import { mount, VueWrapper } from '@vue/test-utils'
66

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { firestorePlugin } from '../../../src'
22
import { db, tick } from '../../src'
3-
import { firestore } from 'firebase'
3+
import * as firestore from '@firebase/firestore-types'
44
import { ComponentPublicInstance } from 'vue'
55
import { mount, VueWrapper } from '@vue/test-utils'
66

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { firestorePlugin } from '../../../src'
22
import { db } from '../../src'
3-
import { firestore } from 'firebase'
3+
import * as firestore from '@firebase/firestore-types'
44
import { mount } from '@vue/test-utils'
55

66
// FIXME: implement merging strategies

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { firestorePlugin } from '../../../src'
22
import { db } from '../../src'
33
import { mount } from '@vue/test-utils'
4-
import { firestore } from 'firebase'
4+
import * as firestore from '@firebase/firestore-types'
55
import { defineComponent } from 'vue'
66

77
const component = defineComponent({ template: 'no' })
@@ -49,6 +49,7 @@ describe('Firestore: plugin options', () => {
4949

5050
expect(pluginOptions.serialize).toHaveBeenCalledTimes(1)
5151
expect(pluginOptions.serialize).toHaveBeenCalledWith(
52+
// @ts-ignore WTF TS?????
5253
expect.objectContaining({ data: expect.any(Function) })
5354
)
5455
expect(wrapper.vm.items).toEqual([{ foo: 'bar' }])
@@ -81,6 +82,7 @@ describe('Firestore: plugin options', () => {
8182
expect(pluginOptions.serialize).not.toHaveBeenCalled()
8283
expect(spy).toHaveBeenCalledTimes(1)
8384
expect(spy).toHaveBeenCalledWith(
85+
// @ts-ignore WTF TS?????
8486
expect.objectContaining({ data: expect.any(Function) })
8587
)
8688
expect(wrapper.vm.items).toEqual([{ bar: 'bar' }])

‎__tests__/vuefire/rtdb/options.spec.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ describe('RTDB: plugin options', () => {
5050

5151
expect(pluginOptions.serialize).toHaveBeenCalledTimes(1)
5252
expect(pluginOptions.serialize).toHaveBeenCalledWith(
53+
// @ts-ignore WTF TS?????
5354
expect.objectContaining({ val: expect.any(Function) })
5455
)
5556
expect(vm.items).toEqual([{ foo: 'bar' }])
@@ -84,6 +85,7 @@ describe('RTDB: plugin options', () => {
8485
expect(pluginOptions.serialize).not.toHaveBeenCalled()
8586
expect(spy).toHaveBeenCalledTimes(1)
8687
expect(spy).toHaveBeenCalledWith(
88+
// @ts-ignore WTF TS?????
8789
expect.objectContaining({ val: expect.any(Function) })
8890
)
8991
expect(vm.items).toEqual([{ bar: 'bar' }])

‎old_src/vuexfire/rtdb.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
RTDBOptions,
1111
rtdbOptions,
1212
} from '../core'
13-
import { database } from 'firebase'
13+
import * as database from '@firebase/database-types'
1414
import { CommitFunction } from './shared'
1515

1616
import { Action, ActionContext } from 'vuex'

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@
5151
"@rollup/plugin-node-resolve": "^9.0.0",
5252
"@rollup/plugin-replace": "^2.3.3",
5353
"@size-limit/preset-small-lib": "^4.5.5",
54-
"@types/jest": "^26.0.8",
54+
"@types/jest": "^26.0.17",
5555
"@types/jsdom": "^16.2.3",
5656
"@vue/test-utils": "^2.0.0-beta.1",
5757
"algoliasearch": "^4.8.2",
5858
"codecov": "^3.7.2",
5959
"conventional-changelog-cli": "^2.0.34",
60-
"firebase": "^7.19.1",
60+
"firebase": "^8.1.2",
6161
"firebase-mock": "^2.3.2",
6262
"focus-visible": "^5.2.0",
6363
"jest": "^26.2.2",
@@ -66,7 +66,7 @@
6666
"prettier": "^2.0.5",
6767
"rollup": "^2.23.0",
6868
"rollup-plugin-terser": "^7.0.2",
69-
"rollup-plugin-typescript2": "^0.27.1",
69+
"rollup-plugin-typescript2": "^0.29.0",
7070
"size-limit": "^4.5.5",
7171
"ts-jest": "^26.1.4",
7272
"typescript": "^4.0.2",

‎src/firestore/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { createSnapshot, extractRefs, FirestoreSerializer } from './utils'
22
import { walkGet, callOnceWithArg, OperationsType } from '../shared'
3-
import { firestore } from 'firebase'
3+
import * as firestore from '@firebase/firestore-types'
44
import { ref, Ref, unref } from 'vue-demi'
55

66
export interface FirestoreOptions {

‎src/firestore/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { firestore } from 'firebase'
1+
import * as firestore from '@firebase/firestore-types'
22
import { isTimestamp, isObject, isDocumentRef, TODO } from '../shared'
33

44
export type FirestoreReference =

‎src/global.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ declare var __BROWSER__: boolean
44
declare var __CI__: boolean
55

66
declare module 'firebase-mock' {
7-
import { database } from 'firebase'
7+
import * as database from '@firebase/database-types'
88

99
type TODO = any
1010

‎src/rtdb/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { database } from 'firebase'
1+
import * as database from '@firebase/database-types'
22
import {
33
createRecordFromRTDBSnapshot,
44
indexForKey,

‎src/rtdb/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { database } from 'firebase'
1+
import * as database from '@firebase/database-types'
22
import { isObject } from '../shared'
33

44
/**

‎src/shared.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
import { firestore } from 'firebase'
1+
import * as firestore from '@firebase/firestore-types'
22

33
export interface OperationsType {
44
set: (target: Record<string, any>, key: string | number, value: any) => any
5-
add: (
6-
array: any[],
7-
index: number,
8-
data: firebase.firestore.DocumentData
9-
) => any
5+
add: (array: any[], index: number, data: firestore.DocumentData) => any
106
remove: (array: any[], index: number) => any
117
}
128

‎src/vuefire/firestore.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
FirestoreOptions,
77
OperationsType,
88
} from '../core'
9-
import { firestore } from 'firebase'
9+
import * as firestore from '@firebase/firestore-types'
1010
import {
1111
App,
1212
ComponentPublicInstance,

‎src/vuefire/rtdb.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
walkSet,
77
OperationsType,
88
} from '../core'
9-
import { database } from 'firebase'
9+
import * as database from '@firebase/database-types'
1010
import {
1111
ComponentPublicInstance,
1212
App,

0 commit comments

Comments
 (0)