Skip to content

Commit adbf3f3

Browse files
schmidt-sebastianschmidt-sebastian
committed
Merge branch 'master' into mrschmidt/compat-fieldvalue
2 parents d1509b1 + 70fe239 commit adbf3f3

File tree

43 files changed

+603
-459
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+603
-459
lines changed

‎.changeset/mean-queens-roll.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+
Fixes an issue that prevents `waitForPendingWrites()` from resolving in background tabs when multi-tab is used (https://github.com/firebase/firebase-js-sdk/issues/3816).

‎.changeset/moody-jobs-deliver.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+
Fixes a "Comparison with -0" lint warning for customers that build from source.

‎config/functions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Cloud Functions for Firebase",
44
"dependencies": {
55
"cors": "2.8.5",
6-
"firebase-admin": "9.1.1",
6+
"firebase-admin": "9.2.0",
77
"firebase-functions": "3.11.0"
88
},
99
"private": true,

‎integration/firebase/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88
},
99
"devDependencies": {
1010
"firebase": "7.21.0",
11-
"@babel/core": "7.11.4",
12-
"@babel/preset-env": "7.11.0",
11+
"@babel/core": "7.11.6",
12+
"@babel/preset-env": "7.11.5",
1313
"@types/chai": "4.2.12",
1414
"@types/mocha": "7.0.2",
1515
"chai": "4.2.0",
16-
"karma": "5.1.1",
16+
"karma": "5.2.2",
1717
"karma-babel-preprocessor": "8.0.1",
1818
"karma-chrome-launcher": "3.1.0",
1919
"karma-firefox-launcher": "1.3.0",
2020
"karma-mocha": "2.0.1",
2121
"karma-sauce-launcher": "1.2.0",
2222
"karma-spec-reporter": "0.0.32",
23-
"karma-typescript": "5.1.0",
23+
"karma-typescript": "5.2.0",
2424
"mocha": "7.2.0",
2525
"npm-run-all": "4.1.5",
2626
"typescript": "4.0.2"

‎integration/firestore/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
"gulp": "4.0.2",
2121
"gulp-filter": "6.0.0",
2222
"gulp-replace": "1.0.0",
23-
"karma": "5.1.1",
23+
"karma": "5.2.2",
2424
"karma-chrome-launcher": "3.1.0",
2525
"karma-firefox-launcher": "1.3.0",
2626
"karma-mocha": "2.0.1",
2727
"karma-spec-reporter": "0.0.32",
2828
"mocha": "7.2.0",
29-
"ts-loader": "8.0.3",
29+
"ts-loader": "8.0.4",
3030
"typescript": "4.0.2",
31-
"webpack": "4.44.1",
31+
"webpack": "4.44.2",
3232
"webpack-stream": "5.2.1"
3333
}
3434
}

‎integration/messaging/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"devDependencies": {
1212
"firebase": "7.21.0",
1313
"chai": "4.2.0",
14-
"chromedriver": "84.0.1",
14+
"chromedriver": "85.0.1",
1515
"express": "4.17.1",
1616
"geckodriver": "1.20.0",
1717
"mocha": "7.2.0",

‎package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@
6666
],
6767
"devDependencies": {
6868
"@changesets/changelog-github": "0.2.7",
69-
"@changesets/cli": "2.10.2",
70-
"@microsoft/api-documenter": "7.8.36",
71-
"@microsoft/api-extractor": "7.9.11",
69+
"@changesets/cli": "2.10.3",
70+
"@microsoft/api-documenter": "7.8.53",
71+
"@microsoft/api-extractor": "7.9.19",
7272
"@types/chai": "4.2.12",
7373
"@types/chai-as-promised": "7.1.3",
7474
"@types/child-process-promise": "2.2.1",
@@ -78,7 +78,7 @@
7878
"@types/long": "4.0.1",
7979
"@types/mocha": "7.0.2",
8080
"@types/mz": "2.7.1",
81-
"@types/node": "12.12.54",
81+
"@types/node": "12.12.62",
8282
"@types/sinon": "9.0.5",
8383
"@types/sinon-chai": "3.2.4",
8484
"@types/tmp": "0.2.0",
@@ -95,21 +95,21 @@
9595
"coveralls": "3.1.0",
9696
"del": "5.1.0",
9797
"dependency-graph": "0.9.0",
98-
"eslint": "7.7.0",
98+
"eslint": "7.9.0",
9999
"eslint-plugin-import": "2.22.0",
100100
"express": "4.17.1",
101101
"find-free-port": "2.0.0",
102102
"firebase-functions": "3.11.0",
103-
"firebase-tools": "8.9.2",
103+
"firebase-tools": "8.10.0",
104104
"git-rev-sync": "3.0.1",
105105
"glob": "7.1.6",
106106
"http-server": "0.12.3",
107-
"husky": "4.2.5",
108-
"indexeddbshim": "6.6.0",
107+
"husky": "4.3.0",
108+
"indexeddbshim": "7.0.0",
109109
"inquirer": "7.3.3",
110110
"istanbul-instrumenter-loader": "3.0.1",
111111
"js-yaml": "3.14.0",
112-
"karma": "5.1.1",
112+
"karma": "5.2.2",
113113
"karma-chrome-launcher": "3.1.0",
114114
"karma-cli": "2.0.0",
115115
"karma-coverage-istanbul-reporter": "2.1.1",
@@ -134,24 +134,24 @@
134134
"npm-run-all": "4.1.5",
135135
"npm-run-path": "4.0.1",
136136
"nyc": "15.1.0",
137-
"ora": "5.0.0",
138-
"prettier": "2.1.1",
137+
"ora": "5.1.0",
138+
"prettier": "2.1.2",
139139
"protractor": "5.4.2",
140-
"rxjs": "6.6.2",
140+
"rxjs": "6.6.3",
141141
"semver": "7.3.2",
142142
"simple-git": "2.20.1",
143143
"sinon": "9.0.3",
144144
"sinon-chai": "3.5.0",
145-
"source-map-loader": "1.0.2",
146-
"terser": "5.2.1",
147-
"ts-loader": "8.0.3",
148-
"ts-node": "8.10.2",
145+
"source-map-loader": "1.1.0",
146+
"terser": "5.3.2",
147+
"ts-loader": "8.0.4",
148+
"ts-node": "9.0.0",
149149
"tslint": "6.1.3",
150150
"typedoc": "0.16.11",
151151
"typescript": "4.0.2",
152152
"watch": "1.0.2",
153-
"webpack": "4.44.1",
154-
"yargs": "15.4.1"
153+
"webpack": "4.44.2",
154+
"yargs": "16.0.3"
155155
},
156156
"husky": {
157157
"hooks": {

‎packages-exp/app-compat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"xmlhttprequest": "1.8.0"
3838
},
3939
"devDependencies": {
40-
"rollup": "2.26.7",
40+
"rollup": "2.28.1",
4141
"rollup-plugin-json": "4.0.0",
4242
"rollup-plugin-replace": "2.2.0",
4343
"rollup-plugin-typescript2": "0.27.2",

‎packages-exp/app-exp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
},
3939
"license": "Apache-2.0",
4040
"devDependencies": {
41-
"rollup": "2.26.7",
41+
"rollup": "2.28.1",
4242
"rollup-plugin-json": "4.0.0",
4343
"rollup-plugin-replace": "2.2.0",
4444
"rollup-plugin-typescript2": "0.27.2",

‎packages-exp/firebase-exp/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@
4343
"@firebase/firestore": "1.17.0"
4444
},
4545
"devDependencies": {
46-
"rollup": "2.26.7",
46+
"rollup": "2.28.1",
4747
"rollup-plugin-commonjs": "10.1.0",
4848
"rollup-plugin-license": "2.2.0",
4949
"rollup-plugin-node-resolve": "5.2.0",
5050
"rollup-plugin-sourcemaps": "0.6.2",
51-
"rollup-plugin-terser": "7.0.0",
51+
"rollup-plugin-terser": "7.0.2",
5252
"rollup-plugin-typescript2": "0.27.2",
5353
"rollup-plugin-uglify": "6.0.4",
5454
"gulp": "4.0.2",

‎packages-exp/functions-exp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
},
3737
"devDependencies": {
3838
"@firebase/app-exp": "0.0.800",
39-
"rollup": "2.26.7",
39+
"rollup": "2.28.1",
4040
"rollup-plugin-typescript2": "0.27.2",
4141
"typescript": "4.0.2"
4242
},

‎packages-exp/installations-exp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
},
4141
"devDependencies": {
4242
"@firebase/app-exp": "0.0.800",
43-
"rollup": "2.26.7",
43+
"rollup": "2.28.1",
4444
"rollup-plugin-commonjs": "10.1.0",
4545
"rollup-plugin-json": "4.0.0",
4646
"rollup-plugin-node-resolve": "5.2.0",

‎packages-exp/performance-exp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"license": "Apache-2.0",
3737
"devDependencies": {
3838
"@firebase/app-exp": "0.0.800",
39-
"rollup": "2.26.7",
39+
"rollup": "2.28.1",
4040
"rollup-plugin-json": "4.0.0",
4141
"rollup-plugin-typescript2": "0.27.2",
4242
"typescript": "4.0.2"

‎packages/analytics/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"license": "Apache-2.0",
3636
"devDependencies": {
3737
"@firebase/app": "0.6.11",
38-
"rollup": "2.26.7",
38+
"rollup": "2.28.1",
3939
"rollup-plugin-commonjs": "10.1.0",
4040
"rollup-plugin-json": "4.0.0",
4141
"rollup-plugin-node-resolve": "5.2.0",

‎packages/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"xmlhttprequest": "1.8.0"
3737
},
3838
"devDependencies": {
39-
"rollup": "2.26.7",
39+
"rollup": "2.28.1",
4040
"rollup-plugin-json": "4.0.0",
4141
"rollup-plugin-replace": "2.2.0",
4242
"rollup-plugin-typescript2": "0.27.2",

‎packages/auth/demo/functions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"logs": "firebase functions:log"
1010
},
1111
"dependencies": {
12-
"firebase-admin": "9.1.1",
12+
"firebase-admin": "9.2.0",
1313
"firebase-functions": "3.11.0"
1414
},
1515
"private": true

‎packages/auth/demo/functions/yarn.lock

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
resolved "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.3.tgz#f934b5cdc939e3c7039ff62b9caaf59a9d89e3a8"
9595
integrity sha512-d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw==
9696

97-
"@google-cloud/storage@^5.0.0":
97+
"@google-cloud/storage@^5.3.0":
9898
version "5.3.0"
9999
resolved "https://registry.npmjs.org/@google-cloud/storage/-/storage-5.3.0.tgz#cf86683911cce68829e46de544abb41947d29da2"
100100
integrity sha512-3t5UF3SZ14Bw2kcBHubCai6EIugU2GnQOstYWVSFuoO8IJ94RAaIOPq/dtexvQbUTpBTAGpd5smVR9WPL1mJVw==
@@ -670,20 +670,20 @@ find-up@^4.1.0:
670670
locate-path "^5.0.0"
671671
path-exists "^4.0.0"
672672

673-
firebase-admin@9.1.1:
674-
version "9.1.1"
675-
resolved "https://registry.npmjs.org/firebase-admin/-/firebase-admin-9.1.1.tgz#153aff515140a41d92ebc51231c12c7b2f4c3e69"
676-
integrity sha512-HkzY9yN/kOe1EQgjheURAQ4pFBerI54TBL0+nj1fwzKnAnGCpcI73Bbwx99Pk3u2x4rj6bDcsZfz9bA8y7DWtQ==
673+
firebase-admin@9.2.0:
674+
version "9.2.0"
675+
resolved "https://registry.npmjs.org/firebase-admin/-/firebase-admin-9.2.0.tgz#df5176e2d0c5711df6dbf7012320492a703538ea"
676+
integrity sha512-LhnMYl71B4gP1FlTLfwaYlOWhBCAcNF+byb2CPTfaW/T4hkp4qlXOgo2bws/zbAv5X9GTFqGir3KexMslVGsIA==
677677
dependencies:
678678
"@firebase/database" "^0.6.10"
679679
"@firebase/database-types" "^0.5.2"
680680
"@types/node" "^10.10.0"
681681
dicer "^0.3.0"
682682
jsonwebtoken "^8.5.1"
683-
node-forge "^0.9.1"
683+
node-forge "^0.10.0"
684684
optionalDependencies:
685685
"@google-cloud/firestore" "^4.0.0"
686-
"@google-cloud/storage" "^5.0.0"
686+
"@google-cloud/storage" "^5.3.0"
687687

688688
[email protected]:
689689
version "3.11.0"
@@ -1120,11 +1120,6 @@ node-forge@^0.10.0:
11201120
resolved "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
11211121
integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
11221122

1123-
node-forge@^0.9.1:
1124-
version "0.9.2"
1125-
resolved "https://registry.npmjs.org/node-forge/-/node-forge-0.9.2.tgz#b35a44c28889b2ea55cabf8c79e3563f9676190a"
1126-
integrity sha512-naKSScof4Wn+aoHU6HBsifh92Zeicm1GDQKd1vp3Y/kOi8ub0DozCa9KpvYNCXslFHYRmLNiqRopGdTGwNLpNw==
1127-
11281123
object-assign@^4:
11291124
version "4.1.1"
11301125
resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"

‎packages/component/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"license": "Apache-2.0",
2929
"devDependencies": {
30-
"rollup": "2.26.7",
30+
"rollup": "2.28.1",
3131
"rollup-plugin-typescript2": "0.27.2",
3232
"typescript": "4.0.2"
3333
},

‎packages/database/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"devDependencies": {
3737
"@firebase/app": "0.6.11",
3838
"@firebase/app-types": "0.6.1",
39-
"rollup": "2.26.7",
39+
"rollup": "2.28.1",
4040
"rollup-plugin-typescript2": "0.27.2",
4141
"typescript": "4.0.2"
4242
},

‎packages/firebase/externs/firebase-app-internal-externs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121

2222
/**
23-
* @param {!firebase.FirebaseComponent}
23+
* @param {!Object} component
2424
*/
2525
firebase.INTERNAL.registerComponent = function (component) {};
2626

‎packages/firebase/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@
6161
"@firebase/util": "0.3.2"
6262
},
6363
"devDependencies": {
64-
"rollup": "2.26.7",
64+
"rollup": "2.28.1",
6565
"rollup-plugin-commonjs": "10.1.0",
6666
"rollup-plugin-license": "2.2.0",
6767
"rollup-plugin-node-resolve": "5.2.0",
6868
"rollup-plugin-sourcemaps": "0.6.2",
69-
"rollup-plugin-terser": "7.0.0",
69+
"rollup-plugin-terser": "7.0.2",
7070
"rollup-plugin-typescript2": "0.27.2",
7171
"rollup-plugin-uglify": "6.0.4",
7272
"typescript": "4.0.2"

‎packages/firestore/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@
8080
"@types/json-stable-stringify": "1.0.32",
8181
"json-stable-stringify": "1.0.1",
8282
"protobufjs": "6.10.1",
83-
"rollup": "2.26.7",
83+
"rollup": "2.28.1",
8484
"rollup-plugin-copy-assets": "1.1.0",
8585
"rollup-plugin-json": "4.0.0",
8686
"rollup-plugin-node-resolve": "5.2.0",
8787
"rollup-plugin-replace": "2.2.0",
8888
"rollup-plugin-sourcemaps": "0.6.2",
89-
"rollup-plugin-terser": "7.0.0",
89+
"rollup-plugin-terser": "7.0.2",
9090
"rollup-plugin-typescript2": "0.27.2",
91-
"ts-node": "8.10.2",
91+
"ts-node": "9.0.0",
9292
"typescript": "4.0.2"
9393
},
9494
"repository": {

‎packages/firestore/src/core/sync_engine.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,6 +1185,7 @@ export async function applyBatchState(
11851185
// NOTE: Both these methods are no-ops for batches that originated from
11861186
// other clients.
11871187
processUserCallback(syncEngineImpl, batchId, error ? error : null);
1188+
triggerPendingWritesCallbacks(syncEngineImpl, batchId);
11881189
removeCachedMutationBatchMetadata(syncEngineImpl.localStore, batchId);
11891190
} else {
11901191
fail(`Unknown batchState: ${batchState}`);

‎packages/firestore/src/util/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export function isNullOrUndefined(value: unknown): value is null | undefined {
3131
export function isNegativeZero(value: number): boolean {
3232
// Detect if the value is -0.0. Based on polyfill from
3333
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
34-
return value === -0 && 1 / value === 1 / -0;
34+
return value === 0 && 1 / value === 1 / -0;
3535
}
3636

3737
/**

‎packages/firestore/test/unit/specs/spec_builder.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -793,6 +793,14 @@ export class SpecBuilder {
793793
return this;
794794
}
795795

796+
waitForPendingWrites(): this {
797+
this.nextStep();
798+
this.currentStep = {
799+
waitForPendingWrites: true
800+
};
801+
return this;
802+
}
803+
796804
expectUserCallbacks(docs: {
797805
acknowledged?: string[];
798806
rejected?: string[];
@@ -944,6 +952,13 @@ export class SpecBuilder {
944952
return this;
945953
}
946954

955+
expectWaitForPendingWritesEvent(count = 1): this {
956+
this.assertStep('Expectations require previous step');
957+
const currentStep = this.currentStep!;
958+
currentStep.expectedWaitForPendingWritesEvents = count;
959+
return this;
960+
}
961+
947962
private static queryToSpec(query: Query): SpecQuery {
948963
// TODO(dimond): full query support
949964
const spec: SpecQuery = { path: query.path.canonicalString() };

0 commit comments

Comments
 (0)