Skip to content

Commit c4f8541

Browse files
Feiyang1Feiyang1
committed
Merge branch 'release'
7.19.1 release
2 parents b0a75ac + e92fb01 commit c4f8541

File tree

17 files changed

+56
-81
lines changed

17 files changed

+56
-81
lines changed

‎.changeset/fuzzy-seas-compare.md

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

‎.changeset/mean-jokes-tan.md

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

‎integration/firebase/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 -s test"
88
},
99
"devDependencies": {
10-
"firebase": "7.19.0",
10+
"firebase": "7.19.1",
1111
"@babel/core": "7.11.4",
1212
"@babel/preset-env": "7.11.0",
1313
"@types/chai": "4.2.12",

‎integration/firestore/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"devDependencies": {
1717
"@firebase/app": "0.6.10",
18-
"@firebase/firestore": "1.16.5",
18+
"@firebase/firestore": "1.16.6",
1919
"@types/mocha": "7.0.2",
2020
"gulp": "4.0.2",
2121
"gulp-filter": "6.0.0",

‎integration/messaging/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"test:manual": "mocha --exit"
1010
},
1111
"devDependencies": {
12-
"firebase": "7.19.0",
12+
"firebase": "7.19.1",
1313
"chai": "4.2.0",
1414
"chromedriver": "84.0.1",
1515
"express": "4.17.1",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"@firebase/app-exp": "0.0.800",
4040
"@firebase/app-compat": "0.0.800",
4141
"@firebase/functions-exp": "0.0.800",
42-
"@firebase/firestore": "1.16.5"
42+
"@firebase/firestore": "1.16.6"
4343
},
4444
"devDependencies": {
4545
"rollup": "2.26.5",

‎packages/firebase/CHANGELOG.md

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

3+
## 7.19.1
4+
5+
### Patch Changes
6+
7+
- [`61b4cd31b`](https://github.com/firebase/firebase-js-sdk/commit/61b4cd31b961c90354be38b18af5fbea9da8d5a3) [#3464](https://github.com/firebase/firebase-js-sdk/pull/3464) (fixes [#3354](https://github.com/firebase/firebase-js-sdk/issues/3354)) - feat: Added `merge` option to `firestore.settings()`, which merges the provided settings with
8+
settings from a previous call. This allows adding settings on top of the settings that were applied
9+
by `@firebase/testing`.
10+
- Updated dependencies [[`61b4cd31b`](https://github.com/firebase/firebase-js-sdk/commit/61b4cd31b961c90354be38b18af5fbea9da8d5a3)]:
11+
- @firebase/firestore@1.16.6
12+
313
## 7.19.0
414

515
### Minor Changes

‎packages/firebase/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "firebase",
3-
"version": "7.19.0",
3+
"version": "7.19.1",
44
"description": "Firebase JavaScript library for web and Node.js",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",
@@ -49,7 +49,7 @@
4949
"@firebase/app-types": "0.6.1",
5050
"@firebase/auth": "0.14.9",
5151
"@firebase/database": "0.6.11",
52-
"@firebase/firestore": "1.16.5",
52+
"@firebase/firestore": "1.16.6",
5353
"@firebase/functions": "0.4.50",
5454
"@firebase/installations": "0.4.16",
5555
"@firebase/messaging": "0.7.0",

‎packages/firestore-types/CHANGELOG.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
# @firebase/firestore-types
22

3-
## 1.12.0
4-
### Minor Changes
3+
## 1.12.1
4+
5+
### Patch Changes
56

7+
- [`61b4cd31b`](https://github.com/firebase/firebase-js-sdk/commit/61b4cd31b961c90354be38b18af5fbea9da8d5a3) [#3464](https://github.com/firebase/firebase-js-sdk/pull/3464) (fixes [#3354](https://github.com/firebase/firebase-js-sdk/issues/3354)) - feat: Added `merge` option to `firestore.settings()`, which merges the provided settings with
8+
settings from a previous call. This allows adding settings on top of the settings that were applied
9+
by `@firebase/testing`.
610

11+
## 1.12.0
12+
13+
### Minor Changes
714

815
- [`39ca8ecf`](https://github.com/firebase/firebase-js-sdk/commit/39ca8ecf940472159d0bc58212f34a70146da60c) [#3254](https://github.com/firebase/firebase-js-sdk/pull/3254) Thanks [@thebrianchen](https://github.com/thebrianchen)! - Added support for `set()` with merge options when using `FirestoreDataConverter`.

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

‎packages/firestore/CHANGELOG.md

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

3+
## 1.16.6
4+
5+
### Patch Changes
6+
7+
- [`61b4cd31b`](https://github.com/firebase/firebase-js-sdk/commit/61b4cd31b961c90354be38b18af5fbea9da8d5a3) [#3464](https://github.com/firebase/firebase-js-sdk/pull/3464) (fixes [#3354](https://github.com/firebase/firebase-js-sdk/issues/3354)) - feat: Added `merge` option to `firestore.settings()`, which merges the provided settings with
8+
settings from a previous call. This allows adding settings on top of the settings that were applied
9+
by `@firebase/testing`.
10+
- Updated dependencies [[`61b4cd31b`](https://github.com/firebase/firebase-js-sdk/commit/61b4cd31b961c90354be38b18af5fbea9da8d5a3)]:
11+
- @firebase/firestore-types@1.12.1
12+
313
## 1.16.5
414

515
### Patch Changes

‎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.5",
3+
"version": "1.16.6",
44
"engines": {
55
"node": "^8.13.0 || >=10.10.0"
66
},
@@ -61,7 +61,7 @@
6161
],
6262
"dependencies": {
6363
"@firebase/component": "0.1.18",
64-
"@firebase/firestore-types": "1.12.0",
64+
"@firebase/firestore-types": "1.12.1",
6565
"@firebase/logger": "0.2.6",
6666
"@firebase/util": "0.3.1",
6767
"@firebase/webchannel-wrapper": "0.3.0",

‎packages/rules-unit-testing/CHANGELOG.md

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
11
# @firebase/rules-unit-testing
22

3-
## 1.0.0
4-
### Major Changes
3+
## 1.0.1
54

5+
### Patch Changes
66

7+
- [`e749ab8fc`](https://github.com/firebase/firebase-js-sdk/commit/e749ab8fcf8c371cd64fb7cfcaa8029bbacff849) [#3676](https://github.com/firebase/firebase-js-sdk/pull/3676) (fixes [#3671](https://github.com/firebase/firebase-js-sdk/issues/3671)) - Fix assertFails() logic of @firebase/rules-unit-testing
78

8-
- [`980c7d539`](https://github.com/firebase/firebase-js-sdk/commit/980c7d53964cd28d6c6ad2ab4b859580997a476c) [#3378](https://github.com/firebase/firebase-js-sdk/pull/3378) - Release `@firebase/rules-unit-testing` to replace the `@firebase/testing` package. The new
9+
- Updated dependencies [[`61b4cd31b`](https://github.com/firebase/firebase-js-sdk/commit/61b4cd31b961c90354be38b18af5fbea9da8d5a3)]:
10+
- [email protected]
11+
12+
## 1.0.0
13+
14+
### Major Changes
15+
16+
- [`980c7d539`](https://github.com/firebase/firebase-js-sdk/commit/980c7d53964cd28d6c6ad2ab4b859580997a476c) [#3378](https://github.com/firebase/firebase-js-sdk/pull/3378) - Release `@firebase/rules-unit-testing` to replace the `@firebase/testing` package. The new
917
package is API compatible but has the following breaking behavior changes:
10-
11-
* `assertFails()` will now only fail on `PERMISSION DENIED` errors, not any error.
12-
* `initializeAdminApp()` now relies on `firebase-admin` rather than imitating the Admin SDK.
18+
19+
- `assertFails()` will now only fail on `PERMISSION DENIED` errors, not any error.
20+
- `initializeAdminApp()` now relies on `firebase-admin` rather than imitating the Admin SDK.
1321

1422
### Patch Changes
1523

‎packages/rules-unit-testing/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/rules-unit-testing",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"description": "",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",
@@ -19,7 +19,7 @@
1919
},
2020
"license": "Apache-2.0",
2121
"dependencies": {
22-
"firebase": "7.19.0",
22+
"firebase": "7.19.1",
2323
"@firebase/logger": "0.2.6",
2424
"@firebase/util": "0.3.1",
2525
"request": "2.88.2"

‎packages/rxfire/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"rxjs": "6.x.x"
4444
},
4545
"devDependencies": {
46-
"firebase": "7.18.0",
46+
"firebase": "7.19.1",
4747
"rollup": "2.26.5",
4848
"rollup-plugin-commonjs": "10.1.0",
4949
"rollup-plugin-node-resolve": "5.2.0",

‎packages/testing/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
"license": "Apache-2.0",
2121
"dependencies": {
22-
"firebase": "7.19.0",
22+
"firebase": "7.19.1",
2323
"@firebase/logger": "0.2.6",
2424
"@firebase/util": "0.3.1",
2525
"request": "2.88.2"

‎yarn.lock

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,33 +1239,6 @@
12391239
unique-filename "^1.1.1"
12401240
which "^1.3.1"
12411241

1242-
"@firebase/[email protected]":
1243-
version "1.16.4"
1244-
resolved "https://registry.npmjs.org/@firebase/firestore/-/firestore-1.16.4.tgz#29cb121f5686cab6e310bf16a1094f06f3678385"
1245-
integrity sha512-Ur+I8a8RkkbbJRsebkYAUwKFkbh9FemDxTFD/2Vp01pAPM8S3MoIcVegAfTvnPlG/ObBq5O7wI4CRA6b/G/Iyg==
1246-
dependencies:
1247-
"@firebase/component" "0.1.18"
1248-
"@firebase/firestore-types" "1.12.0"
1249-
"@firebase/logger" "0.2.6"
1250-
"@firebase/util" "0.3.1"
1251-
"@firebase/webchannel-wrapper" "0.3.0"
1252-
"@grpc/grpc-js" "^1.0.0"
1253-
"@grpc/proto-loader" "^0.5.0"
1254-
node-fetch "2.6.0"
1255-
tslib "^1.11.1"
1256-
1257-
"@firebase/[email protected]":
1258-
version "0.3.11"
1259-
resolved "https://registry.npmjs.org/@firebase/performance/-/performance-0.3.11.tgz#833c8abe5f5554f25545c8d28b487d8ac3ff3f95"
1260-
integrity sha512-L00vBUa2zzoSSOq3StTN43fPxtJ+myF+t+2kP5bQGHN5WOmf22lIsuEjAy1FAscDjVjhL1k5rKMY332ZwEfblg==
1261-
dependencies:
1262-
"@firebase/component" "0.1.18"
1263-
"@firebase/installations" "0.4.16"
1264-
"@firebase/logger" "0.2.6"
1265-
"@firebase/performance-types" "0.0.13"
1266-
"@firebase/util" "0.3.1"
1267-
tslib "^1.11.1"
1268-
12691242
"@google-cloud/common@^3.0.0":
12701243
version "3.3.2"
12711244
resolved "https://registry.npmjs.org/@google-cloud/common/-/common-3.3.2.tgz#595ce85ebbcaa8b38519336bf6747e32e7706df7"
@@ -7054,26 +7027,6 @@ [email protected]:
70547027
winston "^3.0.0"
70557028
ws "^7.2.3"
70567029

7057-
[email protected]:
7058-
version "7.18.0"
7059-
resolved "https://registry.npmjs.org/firebase/-/firebase-7.18.0.tgz#00e3967f5bc608f3e12c1a5f0192f559de87943e"
7060-
integrity sha512-RGq0rWX25EDsM21TjRe1FbnygJwHXL7yN4P0Zh2Z7dWrBcfJ8tQpDxgwMDtiJTuo9UYExK3py4wjgpGJBau6wg==
7061-
dependencies:
7062-
"@firebase/analytics" "0.4.2"
7063-
"@firebase/app" "0.6.10"
7064-
"@firebase/app-types" "0.6.1"
7065-
"@firebase/auth" "0.14.9"
7066-
"@firebase/database" "0.6.11"
7067-
"@firebase/firestore" "1.16.4"
7068-
"@firebase/functions" "0.4.50"
7069-
"@firebase/installations" "0.4.16"
7070-
"@firebase/messaging" "0.7.0"
7071-
"@firebase/performance" "0.3.11"
7072-
"@firebase/polyfill" "0.3.36"
7073-
"@firebase/remote-config" "0.1.27"
7074-
"@firebase/storage" "0.3.42"
7075-
"@firebase/util" "0.3.1"
7076-
70777030
flagged-respawn@^1.0.0:
70787031
version "1.0.1"
70797032
resolved "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"

0 commit comments

Comments
 (0)