Skip to content

Commit d72b97c

Browse files
author
chuanr
committed
Merge branch 'master' into recaptcha
2 parents d7f5991 + b5a1a60 commit d72b97c

File tree

610 files changed

+50835
-5201
lines changed

Some content is hidden

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

610 files changed

+50835
-5201
lines changed

.changeset/config.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
"firebase-repo-scripts-prune-dts"
2222
],
2323
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
24-
"onlyUpdatePeerDependentsWhenOutOfRange": true,
25-
"useCalculatedVersionForSnapshots": true
24+
"onlyUpdatePeerDependentsWhenOutOfRange": true
25+
},
26+
"snapshot": {
27+
"useCalculatedVersion": true
2628
}
2729
}

.changeset/cool-grapes-attend.md

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

.changeset/cool-seas-confess.md

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

.changeset/large-lamps-reflect.md

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

.changeset/large-lemons-relax.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@firebase/firestore': patch
3+
'firebase': patch
4+
---
5+
6+
Internal refactor of platform-specific logic to create TextEncoder and TextDecoder objects.

.changeset/metal-goats-unite.md

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

.changeset/moody-icons-repeat.md

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

.changeset/popular-apples-peel.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@firebase/firestore': patch
3+
'@firebase/util': patch
4+
'firebase': patch
5+
---
6+
7+
Modify base64 decoding logic to throw on invalid input, rather than silently truncating it.

.changeset/popular-items-hide.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@firebase/firestore": patch
3+
---
4+
5+
Refactoring the aggregation implementation to support future aggregate functions.

.changeset/shy-dragons-fly.md

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

.changeset/slow-forks-tease.md

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

.changeset/strong-squids-dress.md

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

.github/CODEOWNERS

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,14 @@ packages/storage-types @maneesht @tonyjhuang @firebase/jssdk-global-approvers
5555
# Messaging Code
5656
packages/messaging @zwu52 @firebase/jssdk-global-approvers
5757
packages/messaging-compat @zwu52 @firebase/jssdk-global-approvers
58-
packages/messaging-types @zwu52 @firebase/jssdk-global-approvers
5958
packages/messaging-interop-types @zwu52 @firebase/jssdk-global-approvers
6059
integration/messaging @zwu52 @firebase/jssdk-global-approvers
6160

6261
# Auth Code
63-
packages/auth @avolkovi @lisajian @sam-gc @yuchenshi @firebase/jssdk-global-approvers
64-
packages/auth-compat @avolkovi @lisajian @sam-gc @yuchenshi @firebase/jssdk-global-approvers
65-
packages/auth-types @avolkovi @lisajian @sam-gc @yuchenshi @firebase/jssdk-global-approvers
66-
packages/auth-interop-types @avolkovi @lisajian @sam-gc @yuchenshi @firebase/jssdk-global-approvers
62+
packages/auth @lisajian @prameshj @renkelvin @sam-gc @firebase/jssdk-global-approvers
63+
packages/auth-compat @lisajian @prameshj @renkelvin @sam-gc @firebase/jssdk-global-approvers
64+
packages/auth-types @lisajian @prameshj @renkelvin @sam-gc @firebase/jssdk-global-approvers
65+
packages/auth-interop-types @lisajian @prameshj @renkelvin @sam-gc @firebase/jssdk-global-approvers
6766

6867
# Testing Code
6968
packages/rules-unit-testing @avolkovi @sam-gc @yuchenshi @firebase/jssdk-global-approvers

.github/workflows/e2e-test.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ jobs:
4747
working-directory: ./config
4848
env:
4949
FIREBASE_CLI_TOKEN: ${{ secrets.FIREBASE_CLI_TOKEN }}
50+
- name: Do modular build
51+
run: yarn build:modular
52+
- name: Do compat build
53+
run: yarn build:compat
5054
- name: Run modular tests
5155
env:
5256
APP_CHECK_DEBUG_TOKEN: ${{ secrets.APP_CHECK_DEBUG_TOKEN }}

.github/workflows/merge-release-branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
run: |
1919
export VERSION_SCRIPT="const pkg = require('./packages/firebase/package.json'); console.log(pkg.version);"
2020
export VERSION=`node -e "${VERSION_SCRIPT}"`
21-
echo "::set-output name=RELEASE_VERSION::$VERSION"
21+
echo "RELEASE_VERSION=$VERSION" >> $GITHUB_OUTPUT
2222
- name: Echo version in shell
2323
run: |
2424
echo "Merging release ${{ steps.get-version.outputs.RELEASE_VERSION }}"

.github/workflows/release-prod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
run: |
9696
VERSION_SCRIPT="const pkg = require('./packages/firebase/package.json'); console.log(pkg.version);"
9797
VERSION=`node -e "${VERSION_SCRIPT}"`
98-
echo "::set-output name=BASE_VERSION::$VERSION"
98+
echo "BASE_VERSION=$VERSION" >> $GITHUB_OUTPUT
9999
- name: Echo version in shell
100100
run: |
101101
echo "Base version: ${{ steps.get-version.outputs.BASE_VERSION }}"

.github/workflows/release-staging.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ jobs:
114114
run: |
115115
VERSION_SCRIPT="const pkg = require('./packages/firebase/package.json'); console.log(pkg.version);"
116116
VERSION=`node -e "${VERSION_SCRIPT}"`
117-
echo "::set-output name=STAGING_VERSION::$VERSION"
117+
echo "STAGING_VERSION=$VERSION" >> $GITHUB_OUTPUT
118118
BASE_VERSION=$(echo $VERSION | cut -d "-" -f 1)
119-
echo "::set-output name=BASE_VERSION::$BASE_VERSION"
119+
echo "BASE_VERSION=$BASE_VERSION" >> $GITHUB_OUTPUT
120120
- name: Echo versions in shell
121121
run: |
122122
echo "Staging release ${{ steps.get-version.outputs.STAGING_VERSION }}"

.github/workflows/release-tweet.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Send Release Tweet
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
version:
7+
description: 'Version number'
8+
type: string
9+
required: true
10+
force:
11+
description: 'Force publish'
12+
type: boolean
13+
default: false
14+
required: true
15+
16+
jobs:
17+
tweet:
18+
name: Send Release Tweet
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Checkout Repo
22+
uses: actions/checkout@master
23+
- name: Setup Node.js 14.x
24+
uses: actions/setup-node@master
25+
with:
26+
node-version: 14.x
27+
- name: Poll release notes page on devsite
28+
run: node scripts/ci/poll_release_notes.js
29+
env:
30+
VERSION: ${{ github.event.inputs.version }}
31+
FORCE_PUBLISH: ${{ github.event.inputs.force }}
32+
- name: Post to Twitter
33+
uses: firebase/firebase-admin-node/.github/actions/send-tweet@master
34+
with:
35+
status: >
36+
v${{github.event.inputs.version}} of @Firebase JavaScript client for Web / Node.js is available.
37+
Release notes: https://firebase.google.com/support/release-notes/js#${{github.event.inputs.version}}
38+
consumer-key: ${{ secrets.TWITTER_CONSUMER_KEY }}
39+
consumer-secret: ${{ secrets.TWITTER_CONSUMER_SECRET }}
40+
access-token: ${{ secrets.TWITTER_ACCESS_TOKEN }}
41+
access-token-secret: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ jobs:
3838
run: xvfb-run yarn test:changed auth
3939
test-firefox:
4040
name: Test Auth on Firefox If Changed
41-
runs-on: ubuntu-latest
41+
# Whatever version of Firefox comes with 22.04 is causing Firefox
42+
# startup to hang when launched by karma. Need to look further into
43+
# why.
44+
runs-on: ubuntu-20.04
4245

4346
steps:
4447
- name: install Firefox stable

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ jobs:
3434

3535
test-firefox:
3636
name: Test Firestore on Firefox If Changed
37-
runs-on: ubuntu-latest
37+
# Whatever version of Firefox comes with 22.04 is causing Firefox
38+
# startup to hang when launched by karma. Need to look further into
39+
# why.
40+
runs-on: ubuntu-20.04
3841

3942
steps:
4043
- name: install Firefox stable

.github/workflows/test-changed.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ jobs:
3434

3535
test-firefox:
3636
name: Test Packages With Changed Files in Firefox
37-
runs-on: ubuntu-latest
37+
# Whatever version of Firefox comes with 22.04 is causing Firefox
38+
# startup to hang when launched by karma. Need to look further into
39+
# why.
40+
runs-on: ubuntu-20.04
3841

3942
steps:
4043
- name: Checkout Repo

.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ coverage
3939
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
4040
.grunt
4141

42-
# Bower dependency directory (https://bower.io/)
43-
bower_components
44-
4542
# node-waf configuration
4643
.lock-wscript
4744

@@ -92,6 +89,6 @@ packages/**/docs
9289
tsdoc-metadata.json
9390

9491
# generated html docs
95-
docs-*/
92+
docs-rut/
9693
docs/
9794
toc/

.vscode/launch.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@
7373
"--exit"
7474
],
7575
"env": {
76-
"FIRESTORE_EMULATOR_PORT" : "8080",
77-
"FIRESTORE_EMULATOR_PROJECT_ID" : "test-emulator"
76+
"FIRESTORE_TARGET_BACKEND" : "emulator",
7877
},
7978
"sourceMaps": true,
8079
"protocol": "inspector"
@@ -95,8 +94,7 @@
9594
],
9695
"env": {
9796
"USE_MOCK_PERSISTENCE": "YES",
98-
"FIRESTORE_EMULATOR_PORT" : "8080",
99-
"FIRESTORE_EMULATOR_PROJECT_ID" : "test-emulator"
97+
"FIRESTORE_TARGET_BACKEND" : "emulator",
10098
},
10199
"sourceMaps": true,
102100
"protocol": "inspector"

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ applications using Firebase services. This SDK is distributed via:
1111

1212
- [CDN](https://firebase.google.com/docs/web/setup/#add-sdks-initialize)
1313
- [npm package](https://www.npmjs.com/package/firebase)
14-
- [Bower package](https://github.com/firebase/firebase-bower)
1514

1615
To get started using Firebase, see
1716
[Add Firebase to your JavaScript Project](https://firebase.google.com/docs/web/setup).
@@ -191,14 +190,16 @@ scope](https://www.npmjs.com/search?q=scope%3Afirebase) on NPM.
191190

192191
### Testing the SDK Locally
193192

194-
Please be sure to build your repo before proceeding any further.
193+
Please be sure your product's package has been built before proceeding any further. (If you haven't built this repo before, make sure to run `yarn build` at the root)
195194
In order to manually test your SDK changes locally, you must use [yarn link](https://classic.yarnpkg.com/en/docs/cli/link):
196195

197196
```shell
198197
$ cd packages/firebase
199198
$ yarn link # initialize the linking to the other folder
200-
$ cd ../<my-test-app-dir> # cd into your personal project directory
201-
$ yarn link firebase # tell yarn to use the locally built firebase SDK instead
199+
$ cd ../packages/<my-product> # Example: $ cd packages/database
200+
$ yarn link # link your product to make it available elsewhere
201+
$ cd <my-test-app-dir> # cd into your personal project directory
202+
$ yarn link firebase @firebase/<my-product> # tell yarn to use the locally built firebase SDK instead
202203
```
203204

204205
This will create a symlink and point your `<my-test-app-dir>` to the locally built version of the firebase SDK.

0 commit comments

Comments
 (0)