Skip to content

Commit f9d9898

Browse files
committed
Merge remote-tracking branch 'origin/master' into ss-fork-testing
2 parents 2b92d40 + 68995c2 commit f9d9898

File tree

32 files changed

+144
-97
lines changed

32 files changed

+144
-97
lines changed

.changeset/calm-apes-collect.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

.changeset/spicy-masks-sort.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
"@firebase/firebase": patch
2+
"firebase": patch
33
"@firebase/analytics": patch
44
---
55

.changeset/thirty-flies-flow.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

.changeset/tidy-elephants-beam.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@firebase/firestore": patch
3+
---
4+
5+
Fixed a bug that caused slow retries for IndexedDB operations even when a webpage re-entered the foreground.

integration/browserify/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"test:ci": "node ../../scripts/run_tests_in_ci.js"
99
},
1010
"devDependencies": {
11-
"firebase": "7.17.1",
11+
"firebase": "7.17.2",
1212
"@babel/core": "7.11.0",
1313
"@babel/preset-env": "7.11.0",
1414
"browserify": "16.5.1",

integration/firebase-typings/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"test:ci": "node ../../scripts/run_tests_in_ci.js"
88
},
99
"devDependencies": {
10-
"firebase": "7.17.1",
10+
"firebase": "7.17.2",
1111
"typescript": "3.9.7"
1212
}
1313
}

integration/firestore/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"peerDependencies": {
1717
"@firebase/app": "0.x",
18-
"@firebase/firestore": "1.16.2"
18+
"@firebase/firestore": "1.16.3"
1919
},
2020
"devDependencies": {
2121
"@types/mocha": "7.0.2",

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
"devDependencies": {
11-
"firebase": "7.17.1",
11+
"firebase": "7.17.2",
1212
"chai": "4.2.0",
1313
"chromedriver": "84.0.1",
1414
"express": "4.17.1",

integration/typescript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"test:ci": "node ../../scripts/run_tests_in_ci.js"
88
},
99
"devDependencies": {
10-
"firebase": "7.17.1",
10+
"firebase": "7.17.2",
1111
"@babel/core": "7.11.0",
1212
"@babel/preset-env": "7.11.0",
1313
"@types/chai": "4.2.12",

integration/webpack/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"test:ci": "node ../../scripts/run_tests_in_ci.js"
99
},
1010
"devDependencies": {
11-
"firebase": "7.17.1",
11+
"firebase": "7.17.2",
1212
"@babel/core": "7.11.0",
1313
"@babel/preset-env": "7.11.0",
1414
"chai": "4.2.0",

packages-exp/firebase-exp/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "firebase-exp",
3-
"version": "0.800.3",
3+
"version": "0.800.4",
44
"private": true,
55
"description": "Firebase JavaScript library for web and Node.js",
66
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
@@ -37,7 +37,7 @@
3737
"dependencies": {
3838
"@firebase/app-exp": "0.0.800",
3939
"@firebase/functions-exp": "0.0.800",
40-
"@firebase/firestore": "1.16.2"
40+
"@firebase/firestore": "1.16.3"
4141
},
4242
"devDependencies": {
4343
"rollup": "2.23.0",

packages/database-types/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# @firebase/database-types
2+
3+
## 0.5.2
4+
### Patch Changes
5+
6+
7+
8+
- [`ef348fed`](https://github.com/firebase/firebase-js-sdk/commit/ef348fed291338351706a697cbb9fb17a9d06ff4) [#3511](https://github.com/firebase/firebase-js-sdk/pull/3511) - Added interface `Database` which is implemented by `FirebaseDatabase`. This allows consumer SDKs (such as the Firebase Admin SDK) to export the database types as an interface.

packages/database-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/database-types",
3-
"version": "0.5.1",
3+
"version": "0.5.2",
44
"description": "@firebase/database Types",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",

packages/database/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Unreleased
22

3+
## 0.6.10
4+
5+
### Patch Changes
6+
7+
- [`ef348fed`](https://github.com/firebase/firebase-js-sdk/commit/ef348fed291338351706a697cbb9fb17a9d06ff4) [#3511](https://github.com/firebase/firebase-js-sdk/pull/3511) - Added interface `Database` which is implemented by `FirebaseDatabase`. This allows consumer SDKs (such as the Firebase Admin SDK) to export the database types as an interface.
8+
9+
- Updated dependencies [[`ef348fed`](https://github.com/firebase/firebase-js-sdk/commit/ef348fed291338351706a697cbb9fb17a9d06ff4)]:
10+
- @firebase/database-types@0.5.2
11+
312
## 0.6.9
413

514
### Patch Changes

packages/database/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/database",
3-
"version": "0.6.9",
3+
"version": "0.6.10",
44
"description": "",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.node.cjs.js",
@@ -25,7 +25,7 @@
2525
"license": "Apache-2.0",
2626
"peerDependencies": {},
2727
"dependencies": {
28-
"@firebase/database-types": "0.5.1",
28+
"@firebase/database-types": "0.5.2",
2929
"@firebase/logger": "0.2.6",
3030
"@firebase/util": "0.3.0",
3131
"@firebase/component": "0.1.17",

packages/firebase/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# firebase
22

3+
## 7.17.2
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`ef348fed`](https://github.com/firebase/firebase-js-sdk/commit/ef348fed291338351706a697cbb9fb17a9d06ff4)]:
8+
- @firebase/database@0.6.10
9+
- @firebase/firestore@1.16.3
10+
311
## 7.17.1
412

513
### Patch Changes

packages/firebase/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "firebase",
3-
"version": "7.17.1",
3+
"version": "7.17.2",
44
"description": "Firebase JavaScript library for web and Node.js",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",
@@ -48,8 +48,8 @@
4848
"@firebase/app": "0.6.9",
4949
"@firebase/app-types": "0.6.1",
5050
"@firebase/auth": "0.14.9",
51-
"@firebase/database": "0.6.9",
52-
"@firebase/firestore": "1.16.2",
51+
"@firebase/database": "0.6.10",
52+
"@firebase/firestore": "1.16.3",
5353
"@firebase/functions": "0.4.49",
5454
"@firebase/installations": "0.4.15",
5555
"@firebase/messaging": "0.6.21",

packages/firestore/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# @firebase/firestore
22

3+
## 1.16.3
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`7f0860a4`](https://github.com/firebase/firebase-js-sdk/commit/7f0860a4ced76da8492ae44d2267a2f1cc58eccb)]:
8+
- @firebase/webchannel-wrapper@0.3.0
9+
310
## 1.16.2
411

512
### Patch Changes

packages/firestore/exp/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
* limitations under the License.
1616
*/
1717

18-
import './register';
18+
import { registerFirestore } from './register';
19+
20+
registerFirestore();
1921

2022
export { FieldPath, documentId } from '../lite/src/api/field_path';
2123

packages/firestore/exp/register.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,3 @@ export function registerFirestore(): void {
3737
);
3838
registerVersion('firestore-exp', version, 'node');
3939
}
40-
41-
registerFirestore();

packages/firestore/exp/test/bootstrap.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
* limitations under the License.
1616
*/
1717

18-
import '../register';
19-
18+
import { registerFirestore } from '../register';
19+
registerFirestore();
2020
/**
2121
* This will include all of the test files and compile them as needed
2222
*

packages/firestore/lite/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
* limitations under the License.
1616
*/
1717

18-
import './register';
18+
import { registerFirestore } from './register';
19+
20+
registerFirestore();
1921

2022
export {
2123
Firestore as FirebaseFirestore,

packages/firestore/lite/register.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,3 @@ export function registerFirestore(): void {
3737
);
3838
registerVersion('firestore-lite', version, 'node');
3939
}
40-
41-
registerFirestore();

packages/firestore/lite/test/bootstrap.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
* limitations under the License.
1616
*/
1717

18-
import '../register';
19-
18+
import { registerFirestore } from '../register';
19+
registerFirestore();
2020
/**
2121
* This will include all of the test files and compile them as needed
2222
*

packages/firestore/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/firestore",
3-
"version": "1.16.2",
3+
"version": "1.16.3",
44
"engines": {
55
"node": "^8.13.0 || >=10.10.0"
66
},
@@ -60,7 +60,7 @@
6060
"@firebase/firestore-types": "1.12.0",
6161
"@firebase/logger": "0.2.6",
6262
"@firebase/util": "0.3.0",
63-
"@firebase/webchannel-wrapper": "0.2.41",
63+
"@firebase/webchannel-wrapper": "0.3.0",
6464
"@grpc/grpc-js": "^1.0.0",
6565
"@grpc/proto-loader": "^0.5.0",
6666
"node-fetch": "2.6.0",

packages/firestore/src/local/indexeddb_persistence.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@ export class IndexedDbPersistence implements Persistence {
294294
debugAssert(!this.started, 'IndexedDbPersistence double-started!');
295295
debugAssert(this.window !== null, "Expected 'window' to be defined");
296296

297-
// NOTE: This is expected to fail sometimes (in the case of another tab
298-
// already having the persistence lock), so it's the first thing we should
297+
// NOTE: This is expected to fail sometimes (in the case of another tab
298+
// already having the persistence lock), so it's the first thing we should
299299
// do.
300300
return this.updateClientMetadataAndTryBecomePrimary()
301301
.then(() => {

packages/firestore/src/util/async_queue.ts

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { logDebug, logError } from './log';
2121
import { Deferred } from './promise';
2222
import { ExponentialBackoff } from '../remote/backoff';
2323
import { isIndexedDbTransactionError } from '../local/simple_db';
24-
import { getWindow } from '../platform/dom';
24+
import { getDocument } from '../platform/dom';
2525

2626
const LOG_TAG = 'AsyncQueue';
2727

@@ -235,12 +235,22 @@ export class AsyncQueue {
235235
// Visibility handler that triggers an immediate retry of all retryable
236236
// operations. Meant to speed up recovery when we regain file system access
237237
// after page comes into foreground.
238-
private visibilityHandler = (): void => this.backoff.skipBackoff();
238+
private visibilityHandler: () => void = () => {
239+
const document = getDocument();
240+
if (document) {
241+
logDebug(
242+
LOG_TAG,
243+
'Visibility state changed to ',
244+
document.visibilityState
245+
);
246+
}
247+
this.backoff.skipBackoff();
248+
};
239249

240250
constructor() {
241-
const window = getWindow();
242-
if (window && typeof window.addEventListener === 'function') {
243-
window.addEventListener('visibilitychange', this.visibilityHandler);
251+
const document = getDocument();
252+
if (document && typeof document.addEventListener === 'function') {
253+
document.addEventListener('visibilitychange', this.visibilityHandler);
244254
}
245255
}
246256

@@ -293,9 +303,12 @@ export class AsyncQueue {
293303
this.verifyNotFailed();
294304
if (!this._isShuttingDown) {
295305
this._isShuttingDown = true;
296-
const window = getWindow();
297-
if (window) {
298-
window.removeEventListener('visibilitychange', this.visibilityHandler);
306+
const document = getDocument();
307+
if (document && typeof document.removeEventListener === 'function') {
308+
document.removeEventListener(
309+
'visibilitychange',
310+
this.visibilityHandler
311+
);
299312
}
300313
await this.enqueueEvenAfterShutdown(op);
301314
}

packages/rules-unit-testing/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# @firebase/testing
22

3+
## 0.20.10
4+
5+
### Patch Changes
6+
7+
- Updated dependencies []:
8+
9+
310
## 0.20.9
411

512
### Patch Changes

packages/rules-unit-testing/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"license": "Apache-2.0",
2323
"dependencies": {
24-
"firebase": "7.17.1",
24+
"firebase": "7.17.2",
2525
"@firebase/logger": "0.2.6",
2626
"@firebase/util": "0.3.0",
2727
"request": "2.88.2"
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# @firebase/webchannel-wrapper
2+
3+
## 0.3.0
4+
### Minor Changes
5+
6+
7+
8+
- [`7f0860a4`](https://github.com/firebase/firebase-js-sdk/commit/7f0860a4ced76da8492ae44d2267a2f1cc58eccb) [#3372](https://github.com/firebase/firebase-js-sdk/pull/3372) - Upgrade to the latest version of Google Closure Library and Compiler. This dependency will be
9+
necessary for future updates to the @firebase/firestore package. Developers will not need to
10+
make any changes to their code to handle this change.

packages/webchannel-wrapper/package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
{
22
"name": "@firebase/webchannel-wrapper",
3-
"version": "0.2.41",
3+
"version": "0.3.0",
44
"description": "A wrapper of the webchannel packages from closure-library for use outside of a closure compiled application",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.js",
77
"module": "dist/index.esm.js",
88
"esm2017": "dist/index.esm2017.js",
9-
"files": [
10-
"dist"
11-
],
9+
"files": ["dist"],
1210
"scripts": {
1311
"dev": "watch 'yarn build' src",
1412
"build": "gulp",

0 commit comments

Comments
 (0)