Skip to content

Commit 04497df

Browse files
committed
Merge branch 'master' of https://github.com/firebase/firebase-js-sdk into tomandersen/multiDb
2 parents ab45518 + f88805e commit 04497df

File tree

182 files changed

+2033
-1380
lines changed

Some content is hidden

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

182 files changed

+2033
-1380
lines changed

.changeset/calm-pugs-leave.md

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

.changeset/five-yaks-travel.md

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

.changeset/happy-eels-confess.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 proactive refresh logic in Auth when RTDB/Firestore/Storage are in use

.changeset/kind-pots-admire.md

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

.github/CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
* @dwyfrequency @hsubox76 @firebase/jssdk-global-approvers
3737

3838
# Database Code
39-
packages/database @maneesht @jsdt @firebase/jssdk-global-approvers
40-
packages/database-compat @maneesht @jsdt @firebase/jssdk-global-approvers
41-
packages/database-types @maneesht @jsdt @firebase/jssdk-global-approvers
39+
packages/database @maneesht @jsdt @IanWyszynski @firebase/jssdk-global-approvers
40+
packages/database-compat @maneesht @jsdt @IanWyszynski @firebase/jssdk-global-approvers
41+
packages/database-types @maneesht @jsdt @IanWyszynski @firebase/jssdk-global-approvers
4242

4343
# Firestore Code
4444
packages/firestore @firebase/firestore-js-team @firebase/jssdk-global-approvers

.github/workflows/test-changed-auth.yml

Lines changed: 56 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,62 @@ env:
77
DETECT_CHROMEDRIVER_VERSION: true
88

99
jobs:
10-
test:
11-
name: Test Auth If Changed
10+
test-chrome:
11+
name: Test Auth on Chrome and Node If Changed
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
# install Chrome first, so the correct version of webdriver can be installed by chromedriver when setting up the repo
16-
- name: install Chrome stable
17-
run: |
18-
sudo apt-get update
19-
sudo apt-get install google-chrome-stable
20-
- name: Checkout Repo
21-
uses: actions/checkout@master
22-
with:
23-
# This makes Actions fetch all Git history so run-changed script can diff properly.
24-
fetch-depth: 0
25-
- name: Set up Node (14)
26-
uses: actions/setup-node@v2
27-
with:
28-
node-version: 14.x
29-
- name: Bump Node memory limit
30-
run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
31-
- name: Test setup and yarn install
32-
run: |
33-
cp config/ci.config.json config/project.json
34-
yarn
35-
- name: build
36-
run: yarn build:changed auth
37-
- name: Run tests on changed packages
38-
run: xvfb-run yarn test:changed auth
15+
# install Chrome first, so the correct version of webdriver can be installed by chromedriver when setting up the repo
16+
- name: install Chrome stable
17+
run: |
18+
sudo apt-get update
19+
sudo apt-get install google-chrome-stable
20+
- name: Checkout Repo
21+
uses: actions/checkout@master
22+
with:
23+
# This makes Actions fetch all Git history so run-changed script can diff properly.
24+
fetch-depth: 0
25+
- name: Set up Node (14)
26+
uses: actions/setup-node@v2
27+
with:
28+
node-version: 14.x
29+
- name: Bump Node memory limit
30+
run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
31+
- name: Test setup and yarn install
32+
run: |
33+
cp config/ci.config.json config/project.json
34+
yarn
35+
- name: build
36+
run: yarn build:changed auth
37+
- name: Run tests on changed packages
38+
run: xvfb-run yarn test:changed auth
39+
test-firefox:
40+
name: Test Auth on Firefox If Changed
41+
runs-on: ubuntu-latest
42+
43+
steps:
44+
- name: install Firefox stable
45+
run: |
46+
sudo apt-get update
47+
sudo apt-get install firefox
48+
- name: Checkout Repo
49+
uses: actions/checkout@master
50+
with:
51+
# This makes Actions fetch all Git history so run-changed script can diff properly.
52+
fetch-depth: 0
53+
- name: Set up Node (14)
54+
uses: actions/setup-node@v2
55+
with:
56+
node-version: 14.x
57+
- name: Bump Node memory limit
58+
run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
59+
- name: Test setup and yarn install
60+
run: |
61+
cp config/ci.config.json config/project.json
62+
yarn
63+
- name: build
64+
run: yarn build:changed auth
65+
- name: Run tests on auth changed packages
66+
run: xvfb-run yarn test:changed auth
67+
env:
68+
BROWSERS: 'Firefox'

.prettierignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# This file is pre-built and need not be formatted
2-
packages/auth
32
packages/firebase/firebase*
43
packages/firestore/scripts
54
dist

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ command, as follows:
126126

127127

128128
```bash
129-
# Select the Firebase project via the text-based UI.
129+
# Select the Firebase project via the text-based UI. This will run tools/config.js
130+
# and deploy from config/ to your Firebase project.
130131
$ yarn test:setup
131132

132133
# Specify the Firebase project via the command-line arguments.

common/api-review/database.api.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ export class DataSnapshot {
3333
child(path: string): DataSnapshot;
3434
exists(): boolean;
3535
exportVal(): any;
36-
forEach(action: (child: DataSnapshot & {
37-
key: string;
38-
}) => boolean | void): boolean;
36+
forEach(action: (child: DataSnapshot) => boolean | void): boolean;
3937
hasChild(path: string): boolean;
4038
hasChildren(): boolean;
4139
get key(): string | null;

config/database.rules.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
22
"rules": {
33
".read": true,
4-
".write": true
4+
".write": true,
5+
"testing": {
6+
".indexOn": "testIndex"
7+
}
58
}
69
}

e2e/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"author": "",
1717
"license": "ISC",
1818
"dependencies": {
19-
"firebase": "9.8.1"
19+
"firebase": "9.9.2"
2020
},
2121
"devDependencies": {
2222
"@babel/core": "7.17.10",

0 commit comments

Comments
 (0)