Skip to content

Commit f24b0f6

Browse files
tom-andersentom-andersen
committed
Merge branch 'master' of https://github.com/firebase/firebase-js-sdk into tomandersen/index-backfiller
2 parents 00dd2f7 + db0dd9f commit f24b0f6

File tree

50 files changed

+384
-180
lines changed

Some content is hidden

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

50 files changed

+384
-180
lines changed

‎.changeset/cool-elephants-leave.md

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

‎.changeset/polite-fireants-mate.md

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

‎.github/CODEOWNERS

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
* @allspain @hsubox76 @firebase/jssdk-global-approvers
3636

3737
# Database Code
38-
packages/database @schmidt-sebastian @jsdt @firebase/jssdk-global-approvers
39-
packages/database-compat @schmidt-sebastian @jsdt @firebase/jssdk-global-approvers
40-
packages/database-types @schmidt-sebastian @jsdt @firebase/jssdk-global-approvers
38+
packages/database @maneesht @jsdt @firebase/jssdk-global-approvers
39+
packages/database-compat @maneesht @jsdt @firebase/jssdk-global-approvers
40+
packages/database-types @maneesht @jsdt @firebase/jssdk-global-approvers
4141

4242
# Firestore Code
4343
packages/firestore @firebase/firestore-js-team @firebase/jssdk-global-approvers
@@ -47,9 +47,9 @@ packages/firestore-types @firebase/firestore-js-team @firebase/jssdk-global-app
4747
integration/firestore @firebase/firestore-js-team @firebase/jssdk-global-approvers
4848

4949
# Storage Code
50-
packages/storage @schmidt-sebastian @firebase/jssdk-global-approvers
51-
packages/storage-compat @schmidt-sebastian @firebase/jssdk-global-approvers
52-
packages/storage-types @schmidt-sebastian @firebase/jssdk-global-approvers
50+
packages/storage @maneesht @tonyjhuang @firebase/jssdk-global-approvers
51+
packages/storage-compat @maneesht @tonyjhuang @firebase/jssdk-global-approvers
52+
packages/storage-types @maneesht @tonyjhuang @firebase/jssdk-global-approvers
5353

5454
# Messaging Code
5555
packages/messaging @zwu52 @firebase/jssdk-global-approvers

‎.github/workflows/e2e-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
steps:
1818
- name: Checkout Repo
1919
uses: actions/checkout@master
20-
- name: Set up Node (12)
20+
- name: Set up Node (14)
2121
uses: actions/setup-node@v2
2222
with:
23-
node-version: 12.x
23+
node-version: 14.x
2424
- name: install Chrome stable
2525
run: |
2626
sudo apt-get update

‎.github/workflows/release-prod.yml

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
name: Production Release
2+
3+
on: workflow_dispatch
4+
5+
jobs:
6+
deploy:
7+
name: Production Release
8+
runs-on: ubuntu-latest
9+
# Allow GITHUB_TOKEN to have write permissions
10+
permissions:
11+
contents: write
12+
13+
steps:
14+
- name: Set up Node (14)
15+
uses: actions/setup-node@v2
16+
with:
17+
node-version: 14.x
18+
- name: Checkout release branch (with history)
19+
uses: actions/checkout@master
20+
with:
21+
# Release script requires git history and tags.
22+
fetch-depth: 0
23+
ref: release
24+
- name: Yarn install
25+
run: yarn
26+
- name: Publish to NPM
27+
# --skipTests No need to run tests
28+
# --skipReinstall Yarn install has already been run
29+
# --ignoreUnstaged Adding the @firebase/app changeset file means
30+
# there's unstaged changes. Ignore.
31+
# TODO: Make these flags defaults in the release script.
32+
run: yarn release --releaseType Production --ci --skipTests --skipReinstall --ignoreUnstaged
33+
env:
34+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
35+
NPM_TOKEN_ANALYTICS: ${{secrets.NPM_TOKEN_ANALYTICS}}
36+
NPM_TOKEN_ANALYTICS_INTEROP_TYPES: ${{secrets.NPM_TOKEN_ANALYTICS_INTEROP_TYPES}}
37+
NPM_TOKEN_ANALYTICS_TYPES: ${{secrets.NPM_TOKEN_ANALYTICS_TYPES}}
38+
NPM_TOKEN_APP: ${{secrets.NPM_TOKEN_APP}}
39+
NPM_TOKEN_APP_TYPES: ${{secrets.NPM_TOKEN_APP_TYPES}}
40+
NPM_TOKEN_APP_CHECK: ${{secrets.NPM_TOKEN_APP_CHECK}}
41+
NPM_TOKEN_APP_CHECK_INTEROP_TYPES: ${{secrets.NPM_TOKEN_APP_CHECK_INTEROP_TYPES}}
42+
NPM_TOKEN_APP_CHECK_TYPES: ${{secrets.NPM_TOKEN_APP_CHECK_TYPES}}
43+
NPM_TOKEN_AUTH: ${{secrets.NPM_TOKEN_AUTH}}
44+
NPM_TOKEN_AUTH_INTEROP_TYPES: ${{secrets.NPM_TOKEN_AUTH_INTEROP_TYPES}}
45+
NPM_TOKEN_AUTH_TYPES: ${{secrets.NPM_TOKEN_AUTH_TYPES}}
46+
NPM_TOKEN_COMPONENT: ${{secrets.NPM_TOKEN_COMPONENT}}
47+
NPM_TOKEN_DATABASE: ${{secrets.NPM_TOKEN_DATABASE}}
48+
NPM_TOKEN_DATABASE_TYPES: ${{secrets.NPM_TOKEN_DATABASE_TYPES}}
49+
NPM_TOKEN_FIRESTORE: ${{secrets.NPM_TOKEN_FIRESTORE}}
50+
NPM_TOKEN_FIRESTORE_TYPES: ${{secrets.NPM_TOKEN_FIRESTORE_TYPES}}
51+
NPM_TOKEN_FUNCTIONS: ${{secrets.NPM_TOKEN_FUNCTIONS}}
52+
NPM_TOKEN_FUNCTIONS_TYPES: ${{secrets.NPM_TOKEN_FUNCTIONS_TYPES}}
53+
NPM_TOKEN_INSTALLATIONS: ${{secrets.NPM_TOKEN_INSTALLATIONS}}
54+
NPM_TOKEN_INSTALLATIONS_TYPES: ${{secrets.NPM_TOKEN_INSTALLATIONS_TYPES}}
55+
NPM_TOKEN_LOGGER: ${{secrets.NPM_TOKEN_LOGGER}}
56+
NPM_TOKEN_MESSAGING: ${{secrets.NPM_TOKEN_MESSAGING}}
57+
NPM_TOKEN_MESSAGING_TYPES: ${{secrets.NPM_TOKEN_MESSAGING_TYPES}}
58+
NPM_TOKEN_PERFORMANCE: ${{secrets.NPM_TOKEN_PERFORMANCE}}
59+
NPM_TOKEN_PERFORMANCE_TYPES: ${{secrets.NPM_TOKEN_PERFORMANCE_TYPES}}
60+
NPM_TOKEN_POLYFILL: ${{secrets.NPM_TOKEN_POLYFILL}}
61+
NPM_TOKEN_REMOTE_CONFIG: ${{secrets.NPM_TOKEN_REMOTE_CONFIG}}
62+
NPM_TOKEN_REMOTE_CONFIG_TYPES: ${{secrets.NPM_TOKEN_REMOTE_CONFIG_TYPES}}
63+
NPM_TOKEN_RULES_UNIT_TESTING: ${{secrets.NPM_TOKEN_RULES_UNIT_TESTING}}
64+
NPM_TOKEN_STORAGE: ${{secrets.NPM_TOKEN_STORAGE}}
65+
NPM_TOKEN_STORAGE_TYPES: ${{secrets.NPM_TOKEN_STORAGE_TYPES}}
66+
NPM_TOKEN_TESTING: ${{secrets.NPM_TOKEN_TESTING}}
67+
NPM_TOKEN_UTIL: ${{secrets.NPM_TOKEN_UTIL}}
68+
NPM_TOKEN_WEBCHANNEL_WRAPPER: ${{secrets.NPM_TOKEN_WEBCHANNEL_WRAPPER}}
69+
NPM_TOKEN_FIREBASE: ${{secrets.NPM_TOKEN_FIREBASE}}
70+
NPM_TOKEN_APP_COMPAT: ${{ secrets.NPM_TOKEN_APP_COMPAT }}
71+
NPM_TOKEN_INSTALLATIONS_COMPAT: ${{ secrets.NPM_TOKEN_INSTALLATIONS_COMPAT }}
72+
NPM_TOKEN_ANALYTICS_COMPAT: ${{ secrets.NPM_TOKEN_ANALYTICS_COMPAT }}
73+
NPM_TOKEN_AUTH_COMPAT: ${{ secrets.NPM_TOKEN_AUTH_COMPAT }}
74+
NPM_TOKEN_MESSAGING_INTEROP_TYPES: ${{ secrets.NPM_TOKEN_MESSAGING_INTEROP_TYPES }}
75+
NPM_TOKEN_FUNCTIONS_COMPAT: ${{ secrets.NPM_TOKEN_FUNCTIONS_COMPAT }}
76+
NPM_TOKEN_MESSAGING_COMPAT: ${{ secrets.NPM_TOKEN_MESSAGING_COMPAT }}
77+
NPM_TOKEN_PERFORMANCE_COMPAT: ${{ secrets.NPM_TOKEN_PERFORMANCE_COMPAT }}
78+
NPM_TOKEN_REMOTE_CONFIG_COMPAT: ${{ secrets.NPM_TOKEN_REMOTE_CONFIG_COMPAT }}
79+
NPM_TOKEN_DATABASE_COMPAT: ${{ secrets.NPM_TOKEN_DATABASE_COMPAT }}
80+
NPM_TOKEN_FIRESTORE_COMPAT: ${{ secrets.NPM_TOKEN_FIRESTORE_COMPAT }}
81+
NPM_TOKEN_STORAGE_COMPAT: ${{ secrets.NPM_TOKEN_STORAGE_COMPAT }}
82+
NPM_TOKEN_APP_CHECK_COMPAT: ${{ secrets.NPM_TOKEN_APP_CHECK_COMPAT }}
83+
NPM_TOKEN_API_DOCUMENTER: ${{ secrets.NPM_TOKEN_API_DOCUMENTER }}
84+
CI: true
85+
- name: Get release version
86+
id: get-version
87+
# In production, there is only one version number
88+
run: |
89+
VERSION_SCRIPT="const pkg = require('./packages/firebase/package.json'); console.log(pkg.version);"
90+
VERSION=`node -e "${VERSION_SCRIPT}"`
91+
echo "::set-output name=BASE_VERSION::$VERSION"
92+
- name: Echo version in shell
93+
run: |
94+
echo "Base version: ${{ steps.get-version.outputs.BASE_VERSION }}"
95+
- name: Log to release tracker
96+
# Sends release information to cloud functions endpoint of release tracker.
97+
run: |
98+
DATE=$(date +'%m/%d/%Y')
99+
BASE_VERSION=${{ steps.get-version.outputs.BASE_VERSION }}
100+
RELEASE_TRACKER_URL=${{ secrets.RELEASE_TRACKER_URL }}
101+
curl -X POST -H "Content-Type:application/json" \
102+
-d "{\"version\":\"$BASE_VERSION\",\"date\":\"$DATE\"}" \
103+
$RELEASE_TRACKER_URL/logProduction

‎.github/workflows/release-staging.yml

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
name: Staging Release
22

3-
on:
4-
push:
5-
branches:
6-
- master
7-
workflow_dispatch:
3+
on: workflow_dispatch
84

95
jobs:
106
deploy:
117
name: Staging Release
128
runs-on: ubuntu-latest
9+
# Allow GITHUB_TOKEN to have write permissions
10+
permissions:
11+
contents: write
1312

1413
steps:
1514
- name: Set up Node (14)
@@ -21,7 +20,7 @@ jobs:
2120
with:
2221
github-token: ${{ secrets.GITHUB_TOKEN }}
2322
script: |
24-
github.repos.merge({
23+
await github.rest.repos.merge({
2524
owner: context.repo.owner,
2625
repo: context.repo.repo,
2726
base: 'release',
@@ -46,27 +45,19 @@ jobs:
4645
uses: changesets/action@v1
4746
env:
4847
GITHUB_TOKEN: ${{ secrets.OSS_BOT_GITHUB_TOKEN }}
49-
- name: Get release version
50-
id: get-version
51-
# STAGING_VERSION = version with staging hash, e.g. 1.2.3-20430523
52-
# BASE_VERSION = version without staging hash, e.g. 1.2.3
53-
run: |
54-
VERSION_SCRIPT="const pkg = require('./packages/firebase/package.json'); console.log(pkg.version);"
55-
VERSION=`node -e "${VERSION_SCRIPT}"`
56-
echo "::set-output name=STAGING_VERSION::$VERSION"
57-
BASE_VERSION=$(echo ${{ steps.get-version.outputs.STAGING_VERSION }} | cut -d "-" -f 1)
58-
echo "::set-output name=BASE_VERSION::$BASE_VERSION"
59-
- name: Echo version in shell
60-
run: |
61-
echo "Staging release ${{ steps.get-version.outputs.STAGING_VERSION }}"
48+
- name: Go back to release branch
49+
# changesets/action created and checked out a new branch
50+
# return to `release` branch.
51+
run: git checkout release
6252
- name: Publish to NPM
6353
# --skipTests No need to run tests
6454
# --skipReinstall Yarn install has already been run
6555
# --ignoreUnstaged Adding the @firebase/app changeset file means
6656
# there's unstaged changes. Ignore.
6757
# TODO: Make these flags defaults in the release script.
68-
run: yarn release --releaseType staging --skipTests --skipReinstall --ignoreUnstaged
58+
run: yarn release --releaseType Staging --ci --skipTests --skipReinstall --ignoreUnstaged
6959
env:
60+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7061
NPM_TOKEN_ANALYTICS: ${{secrets.NPM_TOKEN_ANALYTICS}}
7162
NPM_TOKEN_ANALYTICS_INTEROP_TYPES: ${{secrets.NPM_TOKEN_ANALYTICS_INTEROP_TYPES}}
7263
NPM_TOKEN_ANALYTICS_TYPES: ${{secrets.NPM_TOKEN_ANALYTICS_TYPES}}
@@ -117,6 +108,20 @@ jobs:
117108
NPM_TOKEN_APP_CHECK_COMPAT: ${{ secrets.NPM_TOKEN_APP_CHECK_COMPAT }}
118109
NPM_TOKEN_API_DOCUMENTER: ${{ secrets.NPM_TOKEN_API_DOCUMENTER }}
119110
CI: true
111+
- name: Get release version
112+
id: get-version
113+
# STAGING_VERSION = version with staging hash, e.g. 1.2.3-20430523
114+
# BASE_VERSION = version without staging hash, e.g. 1.2.3
115+
run: |
116+
VERSION_SCRIPT="const pkg = require('./packages/firebase/package.json'); console.log(pkg.version);"
117+
VERSION=`node -e "${VERSION_SCRIPT}"`
118+
echo "::set-output name=STAGING_VERSION::$VERSION"
119+
BASE_VERSION=$(echo $VERSION | cut -d "-" -f 1)
120+
echo "::set-output name=BASE_VERSION::$BASE_VERSION"
121+
- name: Echo versions in shell
122+
run: |
123+
echo "Staging release ${{ steps.get-version.outputs.STAGING_VERSION }}"
124+
echo "Base version: ${{ steps.get-version.outputs.BASE_VERSION }}"
120125
- name: Launch E2E tests workflow
121126
# Trigger e2e-test.yml
122127
run: |

‎.github/workflows/release.yml

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

‎integration/compat-interop/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
"test:debug": "karma start --browsers Chrome --auto-watch"
99
},
1010
"dependencies": {
11-
"@firebase/app": "0.7.24",
12-
"@firebase/app-compat": "0.1.25",
11+
"@firebase/app": "0.7.25",
12+
"@firebase/app-compat": "0.1.26",
1313
"@firebase/analytics": "0.7.9",
1414
"@firebase/analytics-compat": "0.1.10",
15-
"@firebase/auth": "0.20.1",
16-
"@firebase/auth-compat": "0.2.14",
15+
"@firebase/auth": "0.20.2",
16+
"@firebase/auth-compat": "0.2.15",
1717
"@firebase/functions": "0.8.1",
1818
"@firebase/functions-compat": "0.2.1",
1919
"@firebase/messaging": "0.9.13",

‎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": "9.8.1",
10+
"firebase": "9.8.2",
1111
"@types/chai": "4.3.1",
1212
"@types/mocha": "9.1.1",
1313
"chai": "4.3.6",

‎integration/firestore/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"test:memory:debug": "yarn build:memory; karma start --auto-watch --browsers Chrome"
1616
},
1717
"dependencies": {
18-
"@firebase/app": "0.7.24",
18+
"@firebase/app": "0.7.25",
1919
"@firebase/firestore": "3.4.9"
2020
},
2121
"devDependencies": {

‎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": "9.8.1",
12+
"firebase": "9.8.2",
1313
"chai": "4.3.6",
1414
"chromedriver": "98.0.1",
1515
"express": "4.18.1",

‎packages/analytics-compat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@firebase/app-compat": "0.x"
2424
},
2525
"devDependencies": {
26-
"@firebase/app-compat": "0.1.25",
26+
"@firebase/app-compat": "0.1.26",
2727
"rollup": "2.72.1",
2828
"@rollup/plugin-json": "4.1.0",
2929
"rollup-plugin-typescript2": "0.31.2",

‎packages/analytics/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
},
4848
"license": "Apache-2.0",
4949
"devDependencies": {
50-
"@firebase/app": "0.7.24",
50+
"@firebase/app": "0.7.25",
5151
"rollup": "2.72.1",
5252
"@rollup/plugin-commonjs": "21.1.0",
5353
"@rollup/plugin-json": "4.1.0",

‎packages/app-check-compat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
},
4444
"license": "Apache-2.0",
4545
"devDependencies": {
46-
"@firebase/app-compat": "0.1.25",
46+
"@firebase/app-compat": "0.1.26",
4747
"rollup": "2.72.1",
4848
"@rollup/plugin-commonjs": "21.1.0",
4949
"@rollup/plugin-json": "4.1.0",

‎packages/app-check/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
},
4545
"license": "Apache-2.0",
4646
"devDependencies": {
47-
"@firebase/app": "0.7.24",
47+
"@firebase/app": "0.7.25",
4848
"rollup": "2.72.1",
4949
"@rollup/plugin-commonjs": "21.1.0",
5050
"@rollup/plugin-json": "4.1.0",

‎packages/app-compat/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# @firebase/app-compat
22

3+
## 0.1.26
4+
5+
### Patch Changes
6+
7+
- Updated dependencies []:
8+
- @firebase/app@0.7.25
9+
310
## 0.1.25
411

512
### Patch Changes

‎packages/app-compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/app-compat",
3-
"version": "0.1.25",
3+
"version": "0.1.26",
44
"description": "The primary entrypoint to the Firebase JS SDK",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",
@@ -39,7 +39,7 @@
3939
},
4040
"license": "Apache-2.0",
4141
"dependencies": {
42-
"@firebase/app": "0.7.24",
42+
"@firebase/app": "0.7.25",
4343
"@firebase/util": "1.6.0",
4444
"@firebase/logger": "0.3.2",
4545
"@firebase/component": "0.5.14",

‎packages/app/CHANGELOG.md

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

3+
## 0.7.25
4+
5+
### Patch Changes
6+
7+
- Update SDK_VERSION.
8+
39
## 0.7.24
410

511
### Patch Changes

0 commit comments

Comments
 (0)