Skip to content

Commit d03f9b0

Browse files
authored
Merge branch 'master' into firestore-overlays
2 parents 54011ec + 1a06d5d commit d03f9b0

File tree

220 files changed

+12073
-8783
lines changed

Some content is hidden

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

220 files changed

+12073
-8783
lines changed

.changeset/cool-elephants-leave.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 field to `firebase` claim in token result typing

.changeset/eighty-coats-hide.md

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

.github/CODEOWNERS

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ packages/storage-compat @schmidt-sebastian @firebase/jssdk-global-approvers
5252
packages/storage-types @schmidt-sebastian @firebase/jssdk-global-approvers
5353

5454
# Messaging Code
55-
packages/messaging @zwu52 @chliangGoogle @ciarand @firebase/jssdk-global-approvers
56-
packages/messaging-compat @zwu52 @chliangGoogle @ciarand @firebase/jssdk-global-approvers
57-
packages/messaging-types @zwu52 @chliangGoogle @ciarand @firebase/jssdk-global-approvers
58-
packages/messaging-interop-types @zwu52 @chliangGoogle @ciarand @firebase/jssdk-global-approvers
59-
integration/messaging @zwu52 @chliangGoogle @ciarand @firebase/jssdk-global-approvers
55+
packages/messaging @zwu52 @firebase/jssdk-global-approvers
56+
packages/messaging-compat @zwu52 @firebase/jssdk-global-approvers
57+
packages/messaging-types @zwu52 @firebase/jssdk-global-approvers
58+
packages/messaging-interop-types @zwu52 @firebase/jssdk-global-approvers
59+
integration/messaging @zwu52 @firebase/jssdk-global-approvers
6060

6161
# Auth Code
6262
packages/auth @avolkovi @lisajian @sam-gc @yuchenshi @firebase/jssdk-global-approvers

.github/workflows/assign-tech-writers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ jobs:
1010

1111
steps:
1212
- name: assign techwriters to PR
13-
uses: kentaro-m/[email protected].0
13+
uses: kentaro-m/[email protected].1
1414
with:
1515
configuration-path: ".github/auto_assign.yml"

.github/workflows/cross-browser-test.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Merge Release Into Master
2+
3+
on: workflow_dispatch
4+
5+
jobs:
6+
merge_to_master:
7+
runs-on: ubuntu-latest
8+
# Allow GITHUB_TOKEN to have write permissions
9+
permissions:
10+
contents: write
11+
steps:
12+
- name: Checkout Release Branch
13+
uses: actions/checkout@master
14+
with:
15+
ref: release
16+
- name: Get release version
17+
id: get-version
18+
run: |
19+
export VERSION_SCRIPT="const pkg = require('./packages/firebase/package.json'); console.log(pkg.version);"
20+
export VERSION=`node -e "${VERSION_SCRIPT}"`
21+
echo "::set-output name=RELEASE_VERSION::$VERSION"
22+
- name: Echo version in shell
23+
run: |
24+
echo "Merging release ${{ steps.get-version.outputs.RELEASE_VERSION }}"
25+
- name: Merge to master
26+
uses: actions/github-script@v6
27+
with:
28+
github-token: ${{ secrets.GITHUB_TOKEN }}
29+
script: |
30+
github.rest.repos.merge({
31+
owner: context.repo.owner,
32+
repo: context.repo.repo,
33+
base: 'master',
34+
head: 'release',
35+
commit_message: 'Release ${{ steps.get-version.outputs.RELEASE_VERSION }}'
36+
})

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Before you start working on a larger contribution, you should get in touch with
7777

7878
* Create your patch, **including appropriate test cases**. Patches with tests are more likely to be merged.
7979
* Avoid checking in files that shouldn't be tracked (e.g `node_modules`, `gulp-cache`, `.tmp`, `.idea`). If your development setup automatically creates some of these files, please add them to the `.gitignore` at the root of the package (click [here][gitignore] to read more on how to add entries to the `.gitignore`).
80-
* Commit your changes using a commit message that follows our [commit message guidelines](#commit-message-guidelines).
80+
* Commit your changes
8181

8282
```shell
8383
git commit -a

README.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,20 @@ implementation. The SDK is built via a combination of all of these packages
168168
which are published under the [`firebase`
169169
scope](https://www.npmjs.com/search?q=scope%3Afirebase) on NPM.
170170

171+
### Testing the SDK Locally
172+
173+
Please be sure to build your repo before proceeding any further.
174+
In order to manually test your SDK changes locally, you must use [yarn link](https://classic.yarnpkg.com/en/docs/cli/link):
175+
176+
```shell
177+
$ cd packages/firebase
178+
$ yarn link # initialize the linking to the other folder
179+
$ cd ../<my-test-app-dir> # cd into your personal project directory
180+
$ yarn link firebase # tell yarn to use the locally built firebase SDK instead
181+
```
182+
183+
This will create a symlink and point your `<my-test-app-dir>` to the locally built version of the firebase SDK.
184+
171185
### Helper Scripts
172186

173187
Each package in the `packages` directory exposes a `dev` script. This script

common/api-review/app-check.api.md

Lines changed: 105 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,105 @@
1-
## API Report File for "@firebase/app-check"
2-
3-
> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
4-
5-
```ts
6-
7-
import { FirebaseApp } from '@firebase/app';
8-
import { PartialObserver } from '@firebase/util';
9-
import { Unsubscribe } from '@firebase/util';
10-
11-
// @public
12-
export interface AppCheck {
13-
app: FirebaseApp;
14-
}
15-
16-
// @internal (undocumented)
17-
export type _AppCheckComponentName = 'app-check';
18-
19-
// @internal (undocumented)
20-
export type _AppCheckInternalComponentName = 'app-check-internal';
21-
22-
// @public
23-
export interface AppCheckOptions {
24-
isTokenAutoRefreshEnabled?: boolean;
25-
provider: CustomProvider | ReCaptchaV3Provider | ReCaptchaEnterpriseProvider;
26-
}
27-
28-
// @public
29-
export interface AppCheckToken {
30-
readonly expireTimeMillis: number;
31-
// (undocumented)
32-
readonly token: string;
33-
}
34-
35-
// @public
36-
export type AppCheckTokenListener = (token: AppCheckTokenResult) => void;
37-
38-
// @public
39-
export interface AppCheckTokenResult {
40-
readonly token: string;
41-
}
42-
43-
// Warning: (ae-forgotten-export) The symbol "AppCheckProvider" needs to be exported by the entry point index.d.ts
44-
//
45-
// @public
46-
export class CustomProvider implements AppCheckProvider {
47-
constructor(_customProviderOptions: CustomProviderOptions);
48-
// Warning: (ae-forgotten-export) The symbol "AppCheckTokenInternal" needs to be exported by the entry point index.d.ts
49-
//
50-
// @internal (undocumented)
51-
getToken(): Promise<AppCheckTokenInternal>;
52-
// @internal (undocumented)
53-
initialize(app: FirebaseApp): void;
54-
// @internal (undocumented)
55-
isEqual(otherProvider: unknown): boolean;
56-
}
57-
58-
// @public
59-
export interface CustomProviderOptions {
60-
getToken: () => Promise<AppCheckToken>;
61-
}
62-
63-
// @public
64-
export function getToken(appCheckInstance: AppCheck, forceRefresh?: boolean): Promise<AppCheckTokenResult>;
65-
66-
// @public
67-
export function initializeAppCheck(app: FirebaseApp | undefined, options: AppCheckOptions): AppCheck;
68-
69-
// @public
70-
export function onTokenChanged(appCheckInstance: AppCheck, observer: PartialObserver<AppCheckTokenResult>): Unsubscribe;
71-
72-
// @public
73-
export function onTokenChanged(appCheckInstance: AppCheck, onNext: (tokenResult: AppCheckTokenResult) => void, onError?: (error: Error) => void, onCompletion?: () => void): Unsubscribe;
74-
75-
export { PartialObserver }
76-
77-
// @public
78-
export class ReCaptchaEnterpriseProvider implements AppCheckProvider {
79-
constructor(_siteKey: string);
80-
// @internal
81-
getToken(): Promise<AppCheckTokenInternal>;
82-
// @internal (undocumented)
83-
initialize(app: FirebaseApp): void;
84-
// @internal (undocumented)
85-
isEqual(otherProvider: unknown): boolean;
86-
}
87-
88-
// @public
89-
export class ReCaptchaV3Provider implements AppCheckProvider {
90-
constructor(_siteKey: string);
91-
// @internal
92-
getToken(): Promise<AppCheckTokenInternal>;
93-
// @internal (undocumented)
94-
initialize(app: FirebaseApp): void;
95-
// @internal (undocumented)
96-
isEqual(otherProvider: unknown): boolean;
97-
}
98-
99-
// @public
100-
export function setTokenAutoRefreshEnabled(appCheckInstance: AppCheck, isTokenAutoRefreshEnabled: boolean): void;
101-
102-
export { Unsubscribe }
103-
104-
105-
```
1+
## API Report File for "@firebase/app-check"
2+
3+
> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
4+
5+
```ts
6+
7+
import { FirebaseApp } from '@firebase/app';
8+
import { PartialObserver } from '@firebase/util';
9+
import { Unsubscribe } from '@firebase/util';
10+
11+
// @public
12+
export interface AppCheck {
13+
app: FirebaseApp;
14+
}
15+
16+
// @internal (undocumented)
17+
export type _AppCheckComponentName = 'app-check';
18+
19+
// @internal (undocumented)
20+
export type _AppCheckInternalComponentName = 'app-check-internal';
21+
22+
// @public
23+
export interface AppCheckOptions {
24+
isTokenAutoRefreshEnabled?: boolean;
25+
provider: CustomProvider | ReCaptchaV3Provider | ReCaptchaEnterpriseProvider;
26+
}
27+
28+
// @public
29+
export interface AppCheckToken {
30+
readonly expireTimeMillis: number;
31+
// (undocumented)
32+
readonly token: string;
33+
}
34+
35+
// @public
36+
export type AppCheckTokenListener = (token: AppCheckTokenResult) => void;
37+
38+
// @public
39+
export interface AppCheckTokenResult {
40+
readonly token: string;
41+
}
42+
43+
// Warning: (ae-forgotten-export) The symbol "AppCheckProvider" needs to be exported by the entry point index.d.ts
44+
//
45+
// @public
46+
export class CustomProvider implements AppCheckProvider {
47+
constructor(_customProviderOptions: CustomProviderOptions);
48+
// Warning: (ae-forgotten-export) The symbol "AppCheckTokenInternal" needs to be exported by the entry point index.d.ts
49+
//
50+
// @internal (undocumented)
51+
getToken(): Promise<AppCheckTokenInternal>;
52+
// @internal (undocumented)
53+
initialize(app: FirebaseApp): void;
54+
// @internal (undocumented)
55+
isEqual(otherProvider: unknown): boolean;
56+
}
57+
58+
// @public
59+
export interface CustomProviderOptions {
60+
getToken: () => Promise<AppCheckToken>;
61+
}
62+
63+
// @public
64+
export function getToken(appCheckInstance: AppCheck, forceRefresh?: boolean): Promise<AppCheckTokenResult>;
65+
66+
// @public
67+
export function initializeAppCheck(app: FirebaseApp | undefined, options: AppCheckOptions): AppCheck;
68+
69+
// @public
70+
export function onTokenChanged(appCheckInstance: AppCheck, observer: PartialObserver<AppCheckTokenResult>): Unsubscribe;
71+
72+
// @public
73+
export function onTokenChanged(appCheckInstance: AppCheck, onNext: (tokenResult: AppCheckTokenResult) => void, onError?: (error: Error) => void, onCompletion?: () => void): Unsubscribe;
74+
75+
export { PartialObserver }
76+
77+
// @public
78+
export class ReCaptchaEnterpriseProvider implements AppCheckProvider {
79+
constructor(_siteKey: string);
80+
// @internal
81+
getToken(): Promise<AppCheckTokenInternal>;
82+
// @internal (undocumented)
83+
initialize(app: FirebaseApp): void;
84+
// @internal (undocumented)
85+
isEqual(otherProvider: unknown): boolean;
86+
}
87+
88+
// @public
89+
export class ReCaptchaV3Provider implements AppCheckProvider {
90+
constructor(_siteKey: string);
91+
// @internal
92+
getToken(): Promise<AppCheckTokenInternal>;
93+
// @internal (undocumented)
94+
initialize(app: FirebaseApp): void;
95+
// @internal (undocumented)
96+
isEqual(otherProvider: unknown): boolean;
97+
}
98+
99+
// @public
100+
export function setTokenAutoRefreshEnabled(appCheckInstance: AppCheck, isTokenAutoRefreshEnabled: boolean): void;
101+
102+
export { Unsubscribe }
103+
104+
105+
```

0 commit comments

Comments
 (0)