Skip to content

Commit 0433b82

Browse files
Merge branch 'master' into mrschmidt/indexfree-master
2 parents b3c514a + 0462045 commit 0433b82

File tree

31 files changed

+145
-188
lines changed

31 files changed

+145
-188
lines changed

integration/browserify/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"test": "karma start --single-run"
88
},
99
"dependencies": {
10-
"firebase": "6.5.0"
10+
"firebase": "6.6.0"
1111
},
1212
"devDependencies": {
1313
"@babel/core": "7.5.5",

integration/firebase-typings/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"test": "tsc"
77
},
88
"dependencies": {
9-
"firebase": "6.5.0"
9+
"firebase": "6.6.0"
1010
},
1111
"devDependencies": {
1212
"typescript": "3.5.3"

integration/messaging/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"test:manual": "mocha --exit"
99
},
1010
"dependencies": {
11-
"firebase": "6.5.0"
11+
"firebase": "6.6.0"
1212
},
1313
"devDependencies": {
1414
"chai": "4.2.0",

integration/typescript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"test": "karma start --single-run"
77
},
88
"dependencies": {
9-
"firebase": "6.5.0"
9+
"firebase": "6.6.0"
1010
},
1111
"devDependencies": {
1212
"@babel/core": "7.5.5",

integration/webpack/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"test": "karma start --single-run"
88
},
99
"dependencies": {
10-
"firebase": "6.5.0"
10+
"firebase": "6.6.0"
1111
},
1212
"devDependencies": {
1313
"@babel/core": "7.5.5",

packages/app/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/app",
3-
"version": "0.4.15",
3+
"version": "0.4.16",
44
"description": "The primary entrypoint to the Firebase JS SDK",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.node.cjs.js",
@@ -27,8 +27,8 @@
2727
"license": "Apache-2.0",
2828
"dependencies": {
2929
"@firebase/app-types": "0.4.3",
30-
"@firebase/util": "0.2.26",
31-
"@firebase/logger": "0.1.23",
30+
"@firebase/util": "0.2.27",
31+
"@firebase/logger": "0.1.24",
3232
"tslib": "1.10.0",
3333
"dom-storage": "2.1.0",
3434
"xmlhttprequest": "1.8.0"

packages/auth-types/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/auth-types",
3-
"version": "0.7.2",
3+
"version": "0.8.0",
44
"description": "@firebase/auth Types",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",

packages/auth/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/auth",
3-
"version": "0.11.8",
3+
"version": "0.12.0",
44
"main": "dist/auth.js",
55
"module": "dist/auth.esm.js",
66
"description": "Javascript library for Firebase Auth SDK",
@@ -19,7 +19,7 @@
1919
},
2020
"license": "Apache-2.0",
2121
"dependencies": {
22-
"@firebase/auth-types": "0.7.2"
22+
"@firebase/auth-types": "0.8.0"
2323
},
2424
"devDependencies": {
2525
"del": "5.1.0",

packages/database/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/database",
3-
"version": "0.5.1",
3+
"version": "0.5.2",
44
"description": "",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.node.cjs.js",
@@ -24,13 +24,13 @@
2424
"peerDependencies": {},
2525
"dependencies": {
2626
"@firebase/database-types": "0.4.3",
27-
"@firebase/logger": "0.1.23",
28-
"@firebase/util": "0.2.26",
27+
"@firebase/logger": "0.1.24",
28+
"@firebase/util": "0.2.27",
2929
"faye-websocket": "0.11.3",
3030
"tslib": "1.10.0"
3131
},
3232
"devDependencies": {
33-
"@firebase/app": "0.4.15",
33+
"@firebase/app": "0.4.16",
3434
"@firebase/app-types": "0.x",
3535
"@types/chai": "4.2.0",
3636
"@types/mocha": "5.2.7",

packages/firebase/package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "firebase",
3-
"version": "6.5.0",
3+
"version": "6.6.0",
44
"description": "Firebase JavaScript library for web and Node.js",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",
@@ -37,18 +37,18 @@
3737
"module": "dist/index.esm.js",
3838
"react-native": "dist/index.rn.cjs.js",
3939
"dependencies": {
40-
"@firebase/app": "0.4.15",
40+
"@firebase/app": "0.4.16",
4141
"@firebase/app-types": "0.4.3",
42-
"@firebase/auth": "0.11.8",
43-
"@firebase/database": "0.5.1",
44-
"@firebase/firestore": "1.5.0",
45-
"@firebase/functions": "0.4.16",
46-
"@firebase/installations": "0.2.5",
47-
"@firebase/messaging": "0.4.9",
48-
"@firebase/polyfill": "0.3.20",
49-
"@firebase/storage": "0.3.10",
50-
"@firebase/performance": "0.2.17",
51-
"@firebase/util": "0.2.26"
42+
"@firebase/auth": "0.12.0",
43+
"@firebase/database": "0.5.2",
44+
"@firebase/firestore": "1.5.1",
45+
"@firebase/functions": "0.4.17",
46+
"@firebase/installations": "0.2.6",
47+
"@firebase/messaging": "0.4.10",
48+
"@firebase/polyfill": "0.3.21",
49+
"@firebase/storage": "0.3.11",
50+
"@firebase/performance": "0.2.18",
51+
"@firebase/util": "0.2.27"
5252
},
5353
"devDependencies": {
5454
"git-rev-sync": "1.12.0",

packages/firestore/.idea/runConfigurations/All_Tests.xml renamed to packages/firestore/.idea/runConfigurations/All_Tests__Emulator_.xml

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/firestore/.idea/runConfigurations/All_Tests__w__Mock_Persistence_.xml renamed to packages/firestore/.idea/runConfigurations/All_Tests__Emulator_w__Mock_Persistence_.xml

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/firestore/.idea/runConfigurations/Integration_Tests.xml renamed to packages/firestore/.idea/runConfigurations/Integration_Tests__Emulator_.xml

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/firestore/.idea/runConfigurations/Integration_Tests__w__Mock_Persistence_.xml renamed to packages/firestore/.idea/runConfigurations/Integration_Tests__Emulator_w__Mock_Persistence_.xml

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/firestore/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/firestore",
3-
"version": "1.5.0",
3+
"version": "1.5.1",
44
"description": "",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"scripts": {
@@ -31,10 +31,10 @@
3131
],
3232
"dependencies": {
3333
"@firebase/firestore-types": "1.5.0",
34-
"@firebase/logger": "0.1.23",
35-
"@firebase/webchannel-wrapper": "0.2.25",
34+
"@firebase/logger": "0.1.24",
35+
"@firebase/webchannel-wrapper": "0.2.26",
3636
"@grpc/proto-loader": "^0.5.0",
37-
"@firebase/util": "0.2.26",
37+
"@firebase/util": "0.2.27",
3838
"grpc": "1.23.3",
3939
"tslib": "1.10.0"
4040
},

packages/firestore/src/core/firestore_client.ts

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ export class FirestoreClient {
329329
): Promise<LruGarbageCollector> {
330330
// TODO(http://b/33384523): For now we just disable garbage collection
331331
// when persistence is enabled.
332-
const storagePrefix = IndexedDbPersistence.buildStoragePrefix(
332+
const persistenceKey = IndexedDbPersistence.buildStoragePrefix(
333333
this.databaseInfo
334334
);
335335
// Opt to use proto3 JSON in case the platform doesn't support Uint8Array.
@@ -348,36 +348,31 @@ export class FirestoreClient {
348348
);
349349
}
350350

351-
let persistence: IndexedDbPersistence;
352351
const lruParams = settings.lruParams();
353-
if (settings.synchronizeTabs) {
354-
this.sharedClientState = new WebStorageSharedClientState(
355-
this.asyncQueue,
356-
this.platform,
357-
storagePrefix,
358-
this.clientId,
359-
user
360-
);
361-
persistence = await IndexedDbPersistence.createMultiClientIndexedDbPersistence(
362-
storagePrefix,
363-
this.clientId,
364-
this.platform,
365-
this.asyncQueue,
352+
353+
this.sharedClientState = settings.synchronizeTabs
354+
? new WebStorageSharedClientState(
355+
this.asyncQueue,
356+
this.platform,
357+
persistenceKey,
358+
this.clientId,
359+
user
360+
)
361+
: new MemorySharedClientState();
362+
363+
const persistence = await IndexedDbPersistence.createIndexedDbPersistence(
364+
{
365+
allowTabSynchronization: settings.synchronizeTabs,
366+
persistenceKey,
367+
clientId: this.clientId,
368+
platform: this.platform,
369+
queue: this.asyncQueue,
366370
serializer,
367371
lruParams,
368-
{ sequenceNumberSyncer: this.sharedClientState }
369-
);
370-
} else {
371-
this.sharedClientState = new MemorySharedClientState();
372-
persistence = await IndexedDbPersistence.createIndexedDbPersistence(
373-
storagePrefix,
374-
this.clientId,
375-
this.platform,
376-
this.asyncQueue,
377-
serializer,
378-
lruParams
379-
);
380-
}
372+
sequenceNumberSyncer: this.sharedClientState
373+
}
374+
);
375+
381376
this.persistence = persistence;
382377
return persistence.referenceDelegate.garbageCollector;
383378
});

0 commit comments

Comments
 (0)