Skip to content

Commit 0f3baba

Browse files
Feiyang1Feiyang1
committed
Merge branch 'master' into fei-app-exp-test
2 parents b64ea6b + c0f2be0 commit 0f3baba

File tree

174 files changed

+4491
-3480
lines changed

Some content is hidden

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

174 files changed

+4491
-3480
lines changed

‎.changeset/cold-bats-hammer.md

-9
This file was deleted.

‎.changeset/fuzzy-seas-compare.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@firebase/rules-unit-testing": patch
3+
---
4+
5+
Fix assertFails() logic of @firebase/rules-unit-testing

‎.changeset/mean-jokes-tan.md

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
'firebase': patch
3+
'@firebase/firestore': patch
4+
'@firebase/firestore-types': patch
5+
---
6+
feat: Added `merge` option to `firestore.settings()`, which merges the provided settings with
7+
settings from a previous call. This allows adding settings on top of the settings that were applied
8+
by `@firebase/testing`.

‎.changeset/neat-gorillas-behave.md

-5
This file was deleted.

‎.github/workflows/canary-deploy.yml

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: Canary Deploy
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
deploy:
10+
name: Canary Deploy
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- name: Checkout Repo
15+
uses: actions/checkout@master
16+
with:
17+
# Canary release script requires git history and tags.
18+
fetch-depth: 0
19+
- name: Set up Node (10)
20+
uses: actions/setup-node@v1
21+
with:
22+
node-version: 10.x
23+
- name: Yarn install
24+
run: yarn
25+
- name: Deploy canary
26+
run: yarn release --canary
27+
env:
28+
NPM_TOKEN_ANALYTICS: ${{secrets.NPM_TOKEN_ANALYTICS}}
29+
NPM_TOKEN_ANALYTICS_INTEROP_TYPES: ${{secrets.NPM_TOKEN_ANALYTICS_INTEROP_TYPES}}
30+
NPM_TOKEN_ANALYTICS_TYPES: ${{secrets.NPM_TOKEN_ANALYTICS_TYPES}}
31+
NPM_TOKEN_APP: ${{secrets.NPM_TOKEN_APP}}
32+
NPM_TOKEN_APP_TYPES: ${{secrets.NPM_TOKEN_APP_TYPES}}
33+
NPM_TOKEN_AUTH: ${{secrets.NPM_TOKEN_AUTH}}
34+
NPM_TOKEN_AUTH_INTEROP_TYPES: ${{secrets.NPM_TOKEN_AUTH_INTEROP_TYPES}}
35+
NPM_TOKEN_AUTH_TYPES: ${{secrets.NPM_TOKEN_AUTH_TYPES}}
36+
NPM_TOKEN_COMPONENT: ${{secrets.NPM_TOKEN_COMPONENT}}
37+
NPM_TOKEN_DATABASE: ${{secrets.NPM_TOKEN_DATABASE}}
38+
NPM_TOKEN_DATABASE_TYPES: ${{secrets.NPM_TOKEN_DATABASE_TYPES}}
39+
NPM_TOKEN_FIRESTORE: ${{secrets.NPM_TOKEN_FIRESTORE}}
40+
NPM_TOKEN_FIRESTORE_TYPES: ${{secrets.NPM_TOKEN_FIRESTORE_TYPES}}
41+
NPM_TOKEN_FUNCTIONS: ${{secrets.NPM_TOKEN_FUNCTIONS}}
42+
NPM_TOKEN_FUNCTIONS_TYPES: ${{secrets.NPM_TOKEN_FUNCTIONS_TYPES}}
43+
NPM_TOKEN_INSTALLATIONS: ${{secrets.NPM_TOKEN_INSTALLATIONS}}
44+
NPM_TOKEN_INSTALLATIONS_TYPES: ${{secrets.NPM_TOKEN_INSTALLATIONS_TYPES}}
45+
NPM_TOKEN_LOGGER: ${{secrets.NPM_TOKEN_LOGGER}}
46+
NPM_TOKEN_MESSAGING: ${{secrets.NPM_TOKEN_MESSAGING}}
47+
NPM_TOKEN_MESSAGING_TYPES: ${{secrets.NPM_TOKEN_MESSAGING_TYPES}}
48+
NPM_TOKEN_PERFORMANCE: ${{secrets.NPM_TOKEN_PERFORMANCE}}
49+
NPM_TOKEN_PERFORMANCE_TYPES: ${{secrets.NPM_TOKEN_PERFORMANCE_TYPES}}
50+
NPM_TOKEN_POLYFILL: ${{secrets.NPM_TOKEN_POLYFILL}}
51+
NPM_TOKEN_REMOTE_CONFIG: ${{secrets.NPM_TOKEN_REMOTE_CONFIG}}
52+
NPM_TOKEN_REMOTE_CONFIG_TYPES: ${{secrets.NPM_TOKEN_REMOTE_CONFIG_TYPES}}
53+
NPM_TOKEN_RULES_UNIT_TESTING: ${{secrets.NPM_TOKEN_RULES_UNIT_TESTING}}
54+
NPM_TOKEN_STORAGE: ${{secrets.NPM_TOKEN_STORAGE}}
55+
NPM_TOKEN_STORAGE_TYPES: ${{secrets.NPM_TOKEN_STORAGE_TYPES}}
56+
NPM_TOKEN_TESTING: ${{secrets.NPM_TOKEN_TESTING}}
57+
NPM_TOKEN_UTIL: ${{secrets.NPM_TOKEN_UTIL}}
58+
NPM_TOKEN_WEBCHANNEL_WRAPPER: ${{secrets.NPM_TOKEN_WEBCHANNEL_WRAPPER}}
59+
NPM_TOKEN_FIREBASE: ${{secrets.NPM_TOKEN_FIREBASE}}
60+
NPM_TOKEN_RXFIRE: ${{secrets.NPM_TOKEN_RXFIRE}}
61+
CI: true

‎.github/workflows/check-changeset.yml

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
uses: actions/checkout@master
1313
with:
1414
# This makes Actions fetch all Git history so check_changeset script can diff properly.
15+
fetch-depth: 0
1516
- name: Set up Node (10)
1617
uses: actions/setup-node@v1
1718
with:

‎.github/workflows/health-metrics-test.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ jobs:
2222
- run: cp config/ci.config.json config/project.json
2323
- run: yarn install
2424
- run: yarn build
25-
2625
- name: Run health-metrics/binary-size test
2726
run: yarn size-report
27+
- name: Run health-metrics/modular-exports-binary-size test
28+
run: yarn modular-export-size-report
2829

2930
# TODO(yifany): Enable startup times testing on CI.

‎.github/workflows/lint.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Lint All Packages
2+
3+
on: push
4+
5+
jobs:
6+
test:
7+
name: Lint
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- uses: actions/checkout@v2
12+
- name: Set up Node (10)
13+
uses: actions/setup-node@v1
14+
with:
15+
node-version: 10.x
16+
- name: yarn install
17+
run: yarn
18+
- name: yarn lint
19+
run: yarn lint

‎.github/workflows/test-all.yml

+5-54
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,12 @@ jobs:
2323
yarn
2424
- name: yarn build
2525
run: yarn build
26+
- name: Set start timestamp env var
27+
run: echo "::set-env name=FIREBASE_CI_TEST_START_TIME::$(date +%s)"
2628
- name: Run unit tests
27-
run: xvfb-run yarn test:ci
29+
run: |
30+
xvfb-run yarn test:ci
31+
node scripts/print_test_logs.js
2832
- name: Generate coverage file
2933
run: yarn ci:coverage
3034
- name: Run coverage
@@ -33,56 +37,3 @@ jobs:
3337
github-token: ${{ secrets.GITHUB_TOKEN }}
3438
path-to-lcov: ./lcov-all.info
3539
continue-on-error: true
36-
deploy:
37-
name: Canary Deploy
38-
runs-on: ubuntu-latest
39-
if: github.ref == 'refs/heads/master'
40-
needs: test
41-
42-
steps:
43-
- uses: actions/checkout@v2
44-
- name: Checkout
45-
# Canary release script requires git history and tags.
46-
run: git fetch --prune --unshallow
47-
- name: Set up Node (10)
48-
uses: actions/setup-node@v1
49-
with:
50-
node-version: 10.x
51-
- name: Yarn install
52-
run: yarn
53-
- name: Deploy canary
54-
run: yarn release --canary
55-
env:
56-
NPM_TOKEN_ANALYTICS: ${{secrets.NPM_TOKEN_ANALYTICS}}
57-
NPM_TOKEN_ANALYTICS_INTEROP_TYPES: ${{secrets.NPM_TOKEN_ANALYTICS_INTEROP_TYPES}}
58-
NPM_TOKEN_ANALYTICS_TYPES: ${{secrets.NPM_TOKEN_ANALYTICS_TYPES}}
59-
NPM_TOKEN_APP: ${{secrets.NPM_TOKEN_APP}}
60-
NPM_TOKEN_APP_TYPES: ${{secrets.NPM_TOKEN_APP_TYPES}}
61-
NPM_TOKEN_AUTH: ${{secrets.NPM_TOKEN_AUTH}}
62-
NPM_TOKEN_AUTH_INTEROP_TYPES: ${{secrets.NPM_TOKEN_AUTH_INTEROP_TYPES}}
63-
NPM_TOKEN_AUTH_TYPES: ${{secrets.NPM_TOKEN_AUTH_TYPES}}
64-
NPM_TOKEN_COMPONENT: ${{secrets.NPM_TOKEN_COMPONENT}}
65-
NPM_TOKEN_DATABASE: ${{secrets.NPM_TOKEN_DATABASE}}
66-
NPM_TOKEN_DATABASE_TYPES: ${{secrets.NPM_TOKEN_DATABASE_TYPES}}
67-
NPM_TOKEN_FIRESTORE: ${{secrets.NPM_TOKEN_FIRESTORE}}
68-
NPM_TOKEN_FIRESTORE_TYPES: ${{secrets.NPM_TOKEN_FIRESTORE_TYPES}}
69-
NPM_TOKEN_FUNCTIONS: ${{secrets.NPM_TOKEN_FUNCTIONS}}
70-
NPM_TOKEN_FUNCTIONS_TYPES: ${{secrets.NPM_TOKEN_FUNCTIONS_TYPES}}
71-
NPM_TOKEN_INSTALLATIONS: ${{secrets.NPM_TOKEN_INSTALLATIONS}}
72-
NPM_TOKEN_INSTALLATIONS_TYPES: ${{secrets.NPM_TOKEN_INSTALLATIONS_TYPES}}
73-
NPM_TOKEN_LOGGER: ${{secrets.NPM_TOKEN_LOGGER}}
74-
NPM_TOKEN_MESSAGING: ${{secrets.NPM_TOKEN_MESSAGING}}
75-
NPM_TOKEN_MESSAGING_TYPES: ${{secrets.NPM_TOKEN_MESSAGING_TYPES}}
76-
NPM_TOKEN_PERFORMANCE: ${{secrets.NPM_TOKEN_PERFORMANCE}}
77-
NPM_TOKEN_PERFORMANCE_TYPES: ${{secrets.NPM_TOKEN_PERFORMANCE_TYPES}}
78-
NPM_TOKEN_POLYFILL: ${{secrets.NPM_TOKEN_POLYFILL}}
79-
NPM_TOKEN_REMOTE_CONFIG: ${{secrets.NPM_TOKEN_REMOTE_CONFIG}}
80-
NPM_TOKEN_REMOTE_CONFIG_TYPES: ${{secrets.NPM_TOKEN_REMOTE_CONFIG_TYPES}}
81-
NPM_TOKEN_STORAGE: ${{secrets.NPM_TOKEN_STORAGE}}
82-
NPM_TOKEN_STORAGE_TYPES: ${{secrets.NPM_TOKEN_STORAGE_TYPES}}
83-
NPM_TOKEN_TESTING: ${{secrets.NPM_TOKEN_TESTING}}
84-
NPM_TOKEN_UTIL: ${{secrets.NPM_TOKEN_UTIL}}
85-
NPM_TOKEN_WEBCHANNEL_WRAPPER: ${{secrets.NPM_TOKEN_WEBCHANNEL_WRAPPER}}
86-
NPM_TOKEN_FIREBASE: ${{secrets.NPM_TOKEN_FIREBASE}}
87-
NPM_TOKEN_RXFIRE: ${{secrets.NPM_TOKEN_RXFIRE}}
88-
CI: true

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

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Test Auth
2+
3+
on: pull_request
4+
5+
jobs:
6+
test:
7+
name: If Changed
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- name: Checkout Repo
12+
uses: actions/checkout@master
13+
with:
14+
# This makes Actions fetch all Git history so run-changed script can diff properly.
15+
fetch-depth: 0
16+
- name: Set up Node (10)
17+
uses: actions/setup-node@v1
18+
with:
19+
node-version: 10.x
20+
- name: install Chrome stable
21+
run: |
22+
sudo apt-get update
23+
sudo apt-get install google-chrome-stable
24+
- name: Test setup and yarn install
25+
run: |
26+
cp config/ci.config.json config/project.json
27+
yarn
28+
- name: build
29+
run: yarn build
30+
- name: Run tests on changed packages
31+
run: xvfb-run yarn test:changed auth

‎.github/workflows/test-changed-fcm-integration.yml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Test FCM integration
2+
3+
on: pull_request
4+
5+
jobs:
6+
test:
7+
name: If Changed
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- name: Checkout Repo
12+
uses: actions/checkout@master
13+
with:
14+
# This makes Actions fetch all Git history so run-changed script can diff properly.
15+
fetch-depth: 0
16+
- name: Set up Node (10)
17+
uses: actions/setup-node@v1
18+
with:
19+
node-version: 10.x
20+
- name: install Chrome stable
21+
run: |
22+
sudo apt-get update
23+
sudo apt-get install google-chrome-stable
24+
- name: Test setup and yarn install
25+
run: |
26+
cp config/ci.config.json config/project.json
27+
yarn
28+
- name: build
29+
run: yarn build:changed fcm-integration --buildAppExp
30+
- name: Run tests if FCM or its dependencies has changed
31+
run: xvfb-run yarn test:changed fcm-integration

‎.github/workflows/test-changed-firestore-integration.yml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Test Firestore Integration
2+
3+
on: pull_request
4+
5+
jobs:
6+
test:
7+
name: If Changed
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- name: Checkout Repo
12+
uses: actions/checkout@master
13+
with:
14+
# This makes Actions fetch all Git history so run-changed script can diff properly.
15+
fetch-depth: 0
16+
- name: Set up Node (10)
17+
uses: actions/setup-node@v1
18+
with:
19+
node-version: 10.x
20+
- name: install Chrome stable
21+
run: |
22+
sudo apt-get update
23+
sudo apt-get install google-chrome-stable
24+
- name: Test setup and yarn install
25+
run: |
26+
cp config/ci.config.json config/project.json
27+
yarn
28+
- name: build
29+
run: yarn build:changed firestore-integration --buildAppExp
30+
- name: Run tests if firestore or its dependencies has changed
31+
run: yarn test:changed firestore-integration

‎.github/workflows/test-changed-firestore.yml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Test Firestore
2+
3+
on: pull_request
4+
5+
jobs:
6+
test:
7+
name: If Changed
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- name: Checkout Repo
12+
uses: actions/checkout@master
13+
with:
14+
# This makes Actions fetch all Git history so run-changed script can diff properly.
15+
fetch-depth: 0
16+
- name: Set up Node (10)
17+
uses: actions/setup-node@v1
18+
with:
19+
node-version: 10.x
20+
- name: install Chrome stable
21+
run: |
22+
sudo apt-get update
23+
sudo apt-get install google-chrome-stable
24+
- name: Test setup and yarn install
25+
run: |
26+
cp config/ci.config.json config/project.json
27+
yarn
28+
- name: build
29+
run: yarn build:changed firestore --buildAppExp
30+
- name: Run tests if firestore or its dependencies has changed
31+
run: yarn test:changed firestore

‎.github/workflows/test-changed-misc.yml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Test rxFire, @firebase/testing and @firebase/rules-unit-testing
2+
3+
on: pull_request
4+
5+
jobs:
6+
test:
7+
name: If Changed
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- name: Checkout Repo
12+
uses: actions/checkout@master
13+
with:
14+
# This makes Actions fetch all Git history so run-changed script can diff properly.
15+
fetch-depth: 0
16+
- name: Set up Node (10)
17+
uses: actions/setup-node@v1
18+
with:
19+
node-version: 10.x
20+
- name: install Chrome stable
21+
run: |
22+
sudo apt-get update
23+
sudo apt-get install google-chrome-stable
24+
- name: Test setup and yarn install
25+
run: |
26+
cp config/ci.config.json config/project.json
27+
yarn
28+
- name: build
29+
run: yarn build:changed misc --buildAppExp
30+
- name: Run tests
31+
run: yarn test:changed misc

‎.github/workflows/test-changed.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
run: |
2626
cp config/ci.config.json config/project.json
2727
yarn
28-
- name: yarn build
29-
run: yarn build
28+
- name: build
29+
run: yarn build:changed core
3030
- name: Run tests on changed packages
31-
run: xvfb-run yarn test:changed
31+
run: xvfb-run yarn test:changed core

0 commit comments

Comments
 (0)