Skip to content

Commit b99bfa3

Browse files
jamesdanielsdavideast
jamesdaniels
authored and
davideast
committedMay 12, 2018
feat(): Support Firebase JS SDK 5.0 (#1628)
·
v5.2.05.0.0-rc.8
1 parent 57906bd commit b99bfa3

File tree

6 files changed

+95
-84
lines changed

6 files changed

+95
-84
lines changed
 

‎karma.conf.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ module.exports = function(config) {
2626

2727
'karma-test-shim.js',
2828
'node_modules/firebase/firebase.js',
29-
'node_modules/firebase/firebase-firestore.js',
3029
'dist/packages-dist/bundles/core.umd.{js,map}',
3130
'dist/packages-dist/bundles/auth.umd.{js,map}',
3231
'dist/packages-dist/bundles/database.umd.{js,map}',

‎package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@
3434
"@angular/core": "^5.0.0",
3535
"@angular/platform-browser": "^5.0.0",
3636
"@angular/platform-browser-dynamic": "^5.0.0",
37-
"@firebase/app": "^0.2.0",
38-
"@firebase/app-types": "^0.2.0",
39-
"@firebase/auth": "^0.4.2",
40-
"@firebase/auth-types": "^0.2.1",
41-
"@firebase/database": "^0.2.2",
42-
"@firebase/database-types": "^0.2.1",
43-
"@firebase/firestore": "^0.4.1",
44-
"@firebase/firestore-types": "^0.3.0",
45-
"@firebase/messaging-types": "^0.1.3",
46-
"@firebase/storage": "^0.1.9",
47-
"@firebase/storage-types": "^0.1.3",
37+
"@firebase/app": "^0.3.1",
38+
"@firebase/app-types": "^0.3.1",
39+
"@firebase/auth": "^0.5.2",
40+
"@firebase/auth-types": "^0.3.2",
41+
"@firebase/database": "^0.3.1",
42+
"@firebase/database-types": "^0.3.1",
43+
"@firebase/firestore": "^0.5.2",
44+
"@firebase/firestore-types": "^0.4.1",
45+
"@firebase/messaging-types": "^0.2.2",
46+
"@firebase/storage": "^0.2.2",
47+
"@firebase/storage-types": "^0.2.2",
4848
"bufferutil": "^3.0.3",
49-
"firebase": "^4.13.0",
49+
"firebase": "^5.0.2",
5050
"rxjs": "^5.5.4",
5151
"utf-8-validate": "^4.0.0",
5252
"ws": "^3.3.2",

‎src/firestore/collection/changes.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export function docChanges(query: Query): Observable<DocumentChangeAction[]> {
1414
return fromCollectionRef(query)
1515
.pipe(
1616
map(action =>
17-
action.payload.docChanges
17+
action.payload.docChanges()
1818
.map(change => ({ type: change.type, payload: change }))));
1919
}
2020

@@ -25,7 +25,7 @@ export function docChanges(query: Query): Observable<DocumentChangeAction[]> {
2525
export function sortedChanges(query: Query, events: DocumentChangeType[]): Observable<DocumentChangeAction[]> {
2626
return fromCollectionRef(query)
2727
.pipe(
28-
map(changes => changes.payload.docChanges),
28+
map(changes => changes.payload.docChanges()),
2929
scan((current, changes) => combineChanges(current, changes, events), []),
3030
map(changes => changes.map(c => ({ type: c.type, payload: c }))));
3131
}

‎src/storage/storage.spec.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,14 @@ describe('AngularFireStorage', () => {
6060
const data = { angular: "fire" };
6161
const blob = new Blob([JSON.stringify(data)], { type : 'application/json' });
6262
const ref = afStorage.ref('af.json');
63-
const task = ref.put(blob);
64-
const url$ = task.downloadURL();
65-
url$.subscribe(
66-
url => { expect(url).toBeDefined(); },
67-
e => { done.fail(); },
68-
() => { ref.delete().subscribe(done, done.fail); }
69-
);
63+
const task = ref.put(blob).then(() => {;
64+
const url$ = ref.getDownloadURL();
65+
url$.subscribe(
66+
url => { expect(url).toBeDefined(); },
67+
e => { done.fail(); },
68+
() => { ref.delete().subscribe(done, done.fail); }
69+
);
70+
});
7071
});
7172

7273
it('should resolve the task as a promise', (done) => {

‎src/storage/task.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ export interface AngularFireUploadTask {
88
task: UploadTask,
99
snapshotChanges(): Observable<UploadTaskSnapshot | undefined>;
1010
percentageChanges(): Observable<number | undefined>;
11-
downloadURL(): Observable<string | null>;
1211
pause(): boolean;
1312
cancel(): boolean;
1413
resume(): boolean;
@@ -35,7 +34,6 @@ export function createUploadTask(task: UploadTask): AngularFireUploadTask {
3534
cancel: task.cancel.bind(task),
3635
resume: task.resume.bind(task),
3736
snapshotChanges: () => inner$,
38-
downloadURL: () => from(task.then(s => s.downloadURL)),
3937
percentageChanges: () => inner$.pipe(
4038
map(s => s.bytesTransferred / s.totalBytes * 100)
4139
)

‎yarn.lock

Lines changed: 73 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,36 @@
4949
tslib "^1.7.1"
5050
xhr2 "^0.1.4"
5151

52-
"@firebase/app-types@0.2.0", "@firebase/app-types@^0.2.0":
53-
version "0.2.0"
54-
resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.2.0.tgz#2a0e9c433d5f39e428358c5cd8065010d5a07985"
52+
"@firebase/app-types@0.3.1", "@firebase/app-types@^0.3.1":
53+
version "0.3.1"
54+
resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.3.1.tgz#df4e79c38f759e606a421e866cecb7da4577b606"
5555

56-
"@firebase/app@0.2.0", "@firebase/app@^0.2.0":
57-
version "0.2.0"
58-
resolved "https://registry.yarnpkg.com/@firebase/app/-/app-0.2.0.tgz#015c270f07be2b01cf64129a2d0f9b3b87f3c135"
56+
"@firebase/app@0.3.1", "@firebase/app@^0.3.1":
57+
version "0.3.1"
58+
resolved "https://registry.yarnpkg.com/@firebase/app/-/app-0.3.1.tgz#282a217bc904fd5168e43c3e2d30e6658ceca278"
5959
dependencies:
60-
"@firebase/app-types" "0.2.0"
61-
"@firebase/util" "0.1.11"
60+
"@firebase/app-types" "0.3.1"
61+
"@firebase/util" "0.2.0"
62+
dom-storage "2.1.0"
6263
tslib "1.9.0"
64+
xmlhttprequest "1.8.0"
65+
"@firebase/auth-types@0.3.2", "@firebase/auth-types@^0.3.2":
66+
version "0.3.2"
67+
resolved "https://registry.yarnpkg.com/@firebase/auth-types/-/auth-types-0.3.2.tgz#fc636084eb82cb098e4e76efc5fffd315e22abdd"
68+
69+
"@firebase/auth@0.5.2", "@firebase/auth@^0.5.2":
70+
version "0.5.2"
71+
resolved "https://registry.yarnpkg.com/@firebase/auth/-/auth-0.5.2.tgz#f4d7b699e21523b412f5af21a5507f44625d056c"
72+
dependencies:
73+
"@firebase/auth-types" "0.3.2"
74+
75+
"@firebase/database-types@0.3.1", "@firebase/database-types@^0.3.1":
76+
version "0.3.1"
77+
resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.3.1.tgz#4a15423f3b2cb3bed111f5a353c5c1bb2e2787ba"
78+
79+
"@firebase/database@0.3.1", "@firebase/database@^0.3.1":
80+
version "0.3.1"
81+
resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.3.1.tgz#1ca0797b8e9a243d383d31b1873373b84a2048b9"
6382

6483
"@firebase/auth-types@0.2.1", "@firebase/auth-types@^0.2.1":
6584
version "0.2.1"
@@ -78,53 +97,48 @@
7897
"@firebase/database@0.2.2", "@firebase/database@^0.2.2":
7998
version "0.2.2"
8099
resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.2.2.tgz#a8a0709644d7f281b400e983c71c8c65fba90c70"
81-
dependencies:
82-
"@firebase/database-types" "0.2.1"
83-
"@firebase/logger" "0.1.1"
84-
"@firebase/util" "0.1.11"
85-
faye-websocket "0.11.1"
86-
tslib "1.9.0"
87100

88-
"@firebase/firestore-types@0.3.0", "@firebase/firestore-types@^0.3.0":
89-
version "0.3.0"
90-
resolved "https://registry.yarnpkg.com/@firebase/firestore-types/-/firestore-types-0.3.0.tgz#9df0af784145c568c6d306eda1dd25198b5a2b50"
101+
"@firebase/firestore-types@0.4.1", "@firebase/firestore-types@^0.4.1":
91102

92-
"@firebase/firestore@0.4.1", "@firebase/firestore@^0.4.1":
93103
version "0.4.1"
94-
resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-0.4.1.tgz#c42e0c7aebab96eecec5e8ac4a3fe944d573458f"
104+
resolved "https://registry.yarnpkg.com/@firebase/firestore-types/-/firestore-types-0.4.1.tgz#9a96dff26f0537b13ff119b5e7ab4bddad2068d1"
105+
106+
"@firebase/firestore@0.5.2", "@firebase/firestore@^0.5.2":
107+
version "0.5.2"
108+
resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-0.5.2.tgz#92dcbc604e41d97d371e115280f917dbdeaab21a"
95109
dependencies:
96-
"@firebase/firestore-types" "0.3.0"
110+
"@firebase/firestore-types" "0.4.1"
97111
"@firebase/logger" "0.1.1"
98112
"@firebase/webchannel-wrapper" "0.2.8"
99113
grpc "1.10.1"
100114
tslib "1.9.0"
115+
116+
"@firebase/functions-types@0.1.2":
117+
version "0.1.2"
118+
resolved "https://registry.yarnpkg.com/@firebase/functions-types/-/functions-types-0.1.2.tgz#f291b2945218a97d9ab0e20f2fdec2cef6f90f94"
101119

102-
"@firebase/functions-types@0.1.1":
103-
version "0.1.1"
104-
resolved "https://registry.yarnpkg.com/@firebase/functions-types/-/functions-types-0.1.1.tgz#3b2176bdb30a4682321eb2ff79e796f6d9c010e0"
105-
106-
"@firebase/functions@0.1.1":
107-
version "0.1.1"
108-
resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.1.1.tgz#5b351c24de82db823dda1c82d25b76fe5c176141"
120+
"@firebase/functions@0.2.2":
121+
version "0.2.2"
122+
resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.2.2.tgz#fd919deede5ec48870ecf751e4300066fc9424dc"
109123
dependencies:
110-
"@firebase/functions-types" "0.1.1"
111-
"@firebase/messaging-types" "0.1.3"
124+
"@firebase/functions-types" "0.1.2"
125+
"@firebase/messaging-types" "0.2.2"
112126
isomorphic-fetch "2.2.1"
113127

114128
"@firebase/logger@0.1.1":
115129
version "0.1.1"
116130
resolved "https://registry.yarnpkg.com/@firebase/logger/-/logger-0.1.1.tgz#af5df54253286993f4b367c3dabe569c848860d3"
117131

118-
"@firebase/messaging-types@0.1.3", "@firebase/messaging-types@^0.1.3":
119-
version "0.1.3"
120-
resolved "https://registry.yarnpkg.com/@firebase/messaging-types/-/messaging-types-0.1.3.tgz#0a80c69c8f791e3aa94b28f4d2e296d0ea2571bc"
132+
"@firebase/messaging-types@0.2.2", "@firebase/messaging-types@^0.2.2":
133+
version "0.2.2"
134+
resolved "https://registry.yarnpkg.com/@firebase/messaging-types/-/messaging-types-0.2.2.tgz#7d97abb87b599445f09df0085cbd89e9405984c6"
121135

122-
"@firebase/messaging@0.2.4":
123-
version "0.2.4"
124-
resolved "https://registry.yarnpkg.com/@firebase/messaging/-/messaging-0.2.4.tgz#f6404c82f7cb86538f5fa62b4549b28a4edb9f90"
136+
"@firebase/messaging@0.3.2":
137+
version "0.3.2"
138+
resolved "https://registry.yarnpkg.com/@firebase/messaging/-/messaging-0.3.2.tgz#4851b41773deb890f6919a67270d3fd34863756b"
125139
dependencies:
126-
"@firebase/messaging-types" "0.1.3"
127-
"@firebase/util" "0.1.11"
140+
"@firebase/messaging-types" "0.2.2"
141+
"@firebase/util" "0.2.0"
128142
tslib "1.9.0"
129143

130144
"@firebase/polyfill@0.3.1":
@@ -135,20 +149,20 @@
135149
promise-polyfill "7.1.2"
136150
whatwg-fetch "2.0.4"
137151

138-
"@firebase/storage-types@0.1.3", "@firebase/storage-types@^0.1.3":
139-
version "0.1.3"
140-
resolved "https://registry.yarnpkg.com/@firebase/storage-types/-/storage-types-0.1.3.tgz#3e68942c5aab9f5f7180a797dff22d239821668e"
152+
"@firebase/storage-types@0.2.2", "@firebase/storage-types@^0.2.2":
153+
version "0.2.2"
154+
resolved "https://registry.yarnpkg.com/@firebase/storage-types/-/storage-types-0.2.2.tgz#14b56a3b61005e72dfd9ac3ec6bcb160bc3736d3"
141155

142-
"@firebase/storage@0.1.9", "@firebase/storage@^0.1.9":
143-
version "0.1.9"
144-
resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.1.9.tgz#1a32bd3f48a98f7eb1472cb3e5e4e37e04464c48"
156+
"@firebase/storage@0.2.2", "@firebase/storage@^0.2.2":
157+
version "0.2.2"
158+
resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.2.2.tgz#97a90e41b008f6c3b6193e7fed1f4afd3cfda8b4"
145159
dependencies:
146-
"@firebase/storage-types" "0.1.3"
160+
"@firebase/storage-types" "0.2.2"
147161
tslib "1.9.0"
148162

149-
"@firebase/util@0.1.11":
150-
version "0.1.11"
151-
resolved "https://registry.yarnpkg.com/@firebase/util/-/util-0.1.11.tgz#9990dff53930aa9fcae31494ebe8de5c5b8e815c"
163+
"@firebase/util@0.2.0":
164+
version "0.2.0"
165+
resolved "https://registry.yarnpkg.com/@firebase/util/-/util-0.2.0.tgz#b9e176703deda671b823522759f88f8356aaf624"
152166
dependencies:
153167
tslib "1.9.0"
154168

@@ -1904,20 +1918,19 @@ fined@^1.0.1:
19041918
object.pick "^1.2.0"
19051919
parse-filepath "^1.0.1"
19061920

1907-
firebase@^4.13.0:
1908-
version "4.13.1"
1909-
resolved "https://registry.yarnpkg.com/firebase/-/firebase-4.13.1.tgz#87ab64bbb7f707244fb878f2a28235b0e3aed3ec"
1910-
dependencies:
1911-
"@firebase/app" "0.2.0"
1912-
"@firebase/auth" "0.4.2"
1913-
"@firebase/database" "0.2.2"
1914-
"@firebase/firestore" "0.4.1"
1915-
"@firebase/functions" "0.1.1"
1916-
"@firebase/messaging" "0.2.4"
1921+
1922+
firebase@^5.0.2:
1923+
version "5.0.2"
1924+
resolved "https://registry.yarnpkg.com/firebase/-/firebase-5.0.2.tgz#5c0d647acc10552d15169e5f8482413aff1264cb"
1925+
dependencies:
1926+
"@firebase/app" "0.3.1"
1927+
"@firebase/auth" "0.5.2"
1928+
"@firebase/database" "0.3.1"
1929+
"@firebase/firestore" "0.5.2"
1930+
"@firebase/functions" "0.2.2"
1931+
"@firebase/messaging" "0.3.2"
19171932
"@firebase/polyfill" "0.3.1"
1918-
"@firebase/storage" "0.1.9"
1919-
dom-storage "2.1.0"
1920-
xmlhttprequest "1.8.0"
1933+
"@firebase/storage" "0.2.2"
19211934

19221935
first-chunk-stream@^1.0.0:
19231936
version "1.0.0"

0 commit comments

Comments
 (0)
Please sign in to comment.