Skip to content

Commit 2129848

Browse files
committed
Merge branch 'master' into fei-health
2 parents 2bc0bf0 + f90c1d0 commit 2129848

File tree

54 files changed

+1105
-699
lines changed

Some content is hidden

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

54 files changed

+1105
-699
lines changed

.changeset/blue-rice-ring.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"firebase": minor
3+
"@firebase/remote-config": minor
4+
---
5+
6+
Issue 2393 - Add environment check to Remote-Config Module

.changeset/clean-cameras-check.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@firebase/firestore': minor
3+
---
4+
5+
Fixed a bug where `UpdateData` did not recognize union types or optional, dot-separated string fields.

.changeset/curly-elephants-cover.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@firebase/auth": patch
3+
---
4+
5+
Fix bug with the user `emailVerified` field persistence across tabs

.changeset/fast-brooms-tie.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@firebase/rules-unit-testing": patch
3+
---
4+
5+
Fix typing issues where Database/Firestore/Storage compat instances returned by RulesTestContext are not compatible with v9 modular APIs.

.changeset/little-foxes-own.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@firebase/rules-unit-testing": patch
3+
---
4+
5+
Set RTDB namespace to be same as projectId by default instead of `${projectId}-default-rtdb`. This fixes rules not being applied and other issues related to namespace mismatch.

.changeset/neat-pants-wonder.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@firebase/auth": patch
3+
---
4+
5+
Add missing phone FACTOR_ID static property to the PhoneMultiFactorGenerator class

.changeset/shiny-rats-move.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@firebase/webchannel-wrapper": patch
3+
---
4+
5+
Remove an unused option (`backgroundChannelTest`).

.changeset/tender-walls-hang.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@firebase/auth": patch
3+
---
4+
5+
Fix wrongly-typed tenantId fields in requests to some endpoints

.github/CODEOWNERS

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@
2525
# (secret team to avoid review requests)
2626
#
2727
# - @schmidt-sebastian
28-
# - @wilhuff
29-
# - @var-const
30-
# - @zxu123
28+
# - @thebrianchen
29+
# - @wu-hui
30+
# - @ehsannas
31+
# - @dconeybe
3132

3233

3334
# These owners will be the default owners for everything in the repo.
@@ -40,6 +41,7 @@ packages/database-types @schmidt-sebastian @jsdt @firebase/jssdk-global-approver
4041

4142
# Firestore Code
4243
packages/firestore @firebase/firestore-js-team @firebase/jssdk-global-approvers
44+
packages/firestore-compat @firebase/firestore-js-team @firebase/jssdk-global-approvers
4345
packages/webchannel-wrapper @firebase/firestore-js-team @firebase/jssdk-global-approvers
4446
packages/firestore-types @firebase/firestore-js-team @firebase/jssdk-global-approvers
4547
integration/firestore @firebase/firestore-js-team @firebase/jssdk-global-approvers

.github/workflows/release-log.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Log Release PR
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- release
7+
- v8-releasebranch
8+
9+
jobs:
10+
release:
11+
name: Send PR number to tracker endpoint
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout Repo
15+
uses: actions/checkout@master
16+
17+
- name: Setup Node.js 14.x
18+
uses: actions/setup-node@master
19+
with:
20+
node-version: 14.x
21+
22+
- name: Get PR number and send to tracker.
23+
run: node scripts/ci/log-changesets.js

.github/workflows/release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ jobs:
2323
run: yarn
2424

2525
- name: Add a changeset for @firebase/app
26-
run: yarn ts-node-script scripts/ci/add_changeset.ts
26+
run: |
27+
git pull -f origin master:master
28+
yarn ts-node-script scripts/ci/add_changeset.ts
2729
2830
- name: Create Release Pull Request
2931
uses: changesets/action@master

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dist
44
.awcache
55
.cache
66
/config/project.json
7-
scripts/docgen/html
7+
scripts/docgen-compat/html
88

99
# OS Specific Files
1010
.DS_Store

common/api-review/auth.api.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,7 @@ export interface PhoneMultiFactorEnrollInfoOptions {
596596
// @public
597597
export class PhoneMultiFactorGenerator {
598598
static assertion(credential: PhoneAuthCredential): PhoneMultiFactorAssertion;
599+
static FACTOR_ID: string;
599600
}
600601

601602
// @public

common/api-review/firestore-lite.api.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ export class Bytes {
3232
toUint8Array(): Uint8Array;
3333
}
3434

35+
// @public
36+
export type ChildUpdateFields<K extends string, V> = V extends Record<string, unknown> ? AddPrefixToKeys<K, UpdateData<V>> : never;
37+
3538
// @public
3639
export function collection(firestore: Firestore, path: string, ...pathSegments: string[]): CollectionReference<DocumentData>;
3740

@@ -191,7 +194,7 @@ export { LogLevel }
191194

192195
// @public
193196
export type NestedUpdateFields<T extends Record<string, unknown>> = UnionToIntersection<{
194-
[K in keyof T & string]: T[K] extends Record<string, unknown> ? AddPrefixToKeys<K, UpdateData<T[K]>> : never;
197+
[K in keyof T & string]: ChildUpdateFields<K, T[K]>;
195198
}[keyof T & string]>;
196199

197200
// @public
@@ -332,7 +335,7 @@ export class Transaction {
332335
export type UnionToIntersection<U> = (U extends unknown ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
333336

334337
// @public
335-
export type UpdateData<T> = T extends Primitive ? T : T extends Map<infer K, infer V> ? Map<UpdateData<K>, UpdateData<V>> : T extends {} ? {
338+
export type UpdateData<T> = T extends Primitive ? T : T extends {} ? {
336339
[K in keyof T]?: UpdateData<T[K]> | FieldValue;
337340
} & NestedUpdateFields<T> : Partial<T>;
338341

0 commit comments

Comments
 (0)