Merge branch 'master' into markduckworth/or-queries-relaxing-in-restrictions

Author: MarkDuckworth

.changeset/config.json

@@ -21,7 +21,9 @@
     "firebase-repo-scripts-prune-dts"
   ],
   "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
-    "onlyUpdatePeerDependentsWhenOutOfRange": true,
-    "useCalculatedVersionForSnapshots": true
+    "onlyUpdatePeerDependentsWhenOutOfRange": true
+  },
+  "snapshot": {
+    "useCalculatedVersion": true
   }
 }

.changeset/hot-insects-wink.md

@@ -55,15 +55,14 @@ packages/storage-types @maneesht @tonyjhuang @firebase/jssdk-global-approvers
 # Messaging Code
 packages/messaging  @zwu52 @firebase/jssdk-global-approvers
 packages/messaging-compat  @zwu52 @firebase/jssdk-global-approvers
-packages/messaging-types @zwu52 @firebase/jssdk-global-approvers
 packages/messaging-interop-types @zwu52 @firebase/jssdk-global-approvers
 integration/messaging @zwu52 @firebase/jssdk-global-approvers
 
 # Auth Code
-packages/auth  @avolkovi @lisajian @sam-gc @yuchenshi @firebase/jssdk-global-approvers
-packages/auth-compat @avolkovi @lisajian @sam-gc @yuchenshi @firebase/jssdk-global-approvers
-packages/auth-types @avolkovi @lisajian @sam-gc @yuchenshi @firebase/jssdk-global-approvers
-packages/auth-interop-types @avolkovi @lisajian @sam-gc @yuchenshi @firebase/jssdk-global-approvers
+packages/auth @lisajian @prameshj @renkelvin @sam-gc @firebase/jssdk-global-approvers
+packages/auth-compat @lisajian @prameshj @renkelvin @sam-gc @firebase/jssdk-global-approvers
+packages/auth-types @lisajian @prameshj @renkelvin @sam-gc @firebase/jssdk-global-approvers
+packages/auth-interop-types @lisajian @prameshj @renkelvin @sam-gc @firebase/jssdk-global-approvers
 
 # Testing Code
 packages/rules-unit-testing  @avolkovi @sam-gc @yuchenshi @firebase/jssdk-global-approvers

.changeset/selfish-worms-glow.md

@@ -18,7 +18,7 @@ jobs:
         run: |
           export VERSION_SCRIPT="const pkg = require('./packages/firebase/package.json'); console.log(pkg.version);"
           export VERSION=`node -e "${VERSION_SCRIPT}"`
-          echo "::set-output name=RELEASE_VERSION::$VERSION"
+          echo "RELEASE_VERSION=$VERSION" >> $GITHUB_OUTPUT
       - name: Echo version in shell
         run: |
           echo "Merging release ${{ steps.get-version.outputs.RELEASE_VERSION }}"

.github/CODEOWNERS

@@ -95,7 +95,7 @@ jobs:
       run: |
         VERSION_SCRIPT="const pkg = require('./packages/firebase/package.json'); console.log(pkg.version);"
         VERSION=`node -e "${VERSION_SCRIPT}"`
-        echo "::set-output name=BASE_VERSION::$VERSION"
+        echo "BASE_VERSION=$VERSION" >> $GITHUB_OUTPUT
     - name: Echo version in shell
       run: |
         echo "Base version: ${{ steps.get-version.outputs.BASE_VERSION }}"

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

@@ -114,9 +114,9 @@ jobs:
       run: |
         VERSION_SCRIPT="const pkg = require('./packages/firebase/package.json'); console.log(pkg.version);"
         VERSION=`node -e "${VERSION_SCRIPT}"`
-        echo "::set-output name=STAGING_VERSION::$VERSION"
+        echo "STAGING_VERSION=$VERSION" >> $GITHUB_OUTPUT
         BASE_VERSION=$(echo $VERSION | cut -d "-" -f 1)
-        echo "::set-output name=BASE_VERSION::$BASE_VERSION"
+        echo "BASE_VERSION=$BASE_VERSION" >> $GITHUB_OUTPUT
     - name: Echo versions in shell
       run: |
         echo "Staging release ${{ steps.get-version.outputs.STAGING_VERSION }}"

.github/workflows/release-prod.yml

@@ -0,0 +1,41 @@
+name: Send Release Tweet
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version number'
+        type: string
+        required: true
+      force:
+        description: 'Force publish'
+        type: boolean
+        default: false
+        required: true
+
+jobs:
+  tweet:
+    name: Send Release Tweet
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@master
+      - name: Setup Node.js 14.x
+        uses: actions/setup-node@master
+        with:
+          node-version: 14.x
+      - name: Poll release notes page on devsite
+        run: node scripts/ci/poll_release_notes.js
+        env:
+          VERSION: ${{ github.event.inputs.version }}
+          FORCE_PUBLISH: ${{ github.event.inputs.force }}
+      - name: Post to Twitter
+        uses: firebase/firebase-admin-node/.github/actions/send-tweet@master
+        with:
+          status: >
+            v${{github.event.inputs.version}} of @Firebase JavaScript client for Web / Node.js is available.
+            Release notes: https://firebase.google.com/support/release-notes/js#${{github.event.inputs.version}}
+          consumer-key: ${{ secrets.TWITTER_CONSUMER_KEY }}
+          consumer-secret: ${{ secrets.TWITTER_CONSUMER_SECRET }}
+          access-token: ${{ secrets.TWITTER_ACCESS_TOKEN }}
+          access-token-secret: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}

.github/workflows/release-staging.yml

@@ -38,7 +38,10 @@ jobs:
         run: xvfb-run yarn test:changed auth
   test-firefox:
     name: Test Auth on Firefox If Changed
-    runs-on: ubuntu-latest
+    # Whatever version of Firefox comes with 22.04 is causing Firefox
+    # startup to hang when launched by karma. Need to look further into
+    # why.
+    runs-on: ubuntu-20.04
 
     steps:
       - name: install Firefox stable

.github/workflows/release-tweet.yml

@@ -34,7 +34,10 @@ jobs:
 
   test-firefox:
     name: Test Firestore on Firefox If Changed
-    runs-on: ubuntu-latest
+    # Whatever version of Firefox comes with 22.04 is causing Firefox
+    # startup to hang when launched by karma. Need to look further into
+    # why.
+    runs-on: ubuntu-20.04
 
     steps:
       - name: install Firefox stable

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

@@ -34,7 +34,10 @@ jobs:
 
   test-firefox:
     name: Test Packages With Changed Files in Firefox
-    runs-on: ubuntu-latest
+    # Whatever version of Firefox comes with 22.04 is causing Firefox
+    # startup to hang when launched by karma. Need to look further into
+    # why.
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checkout Repo

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

@@ -39,9 +39,6 @@ coverage
 # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
 
-# Bower dependency directory (https://bower.io/)
-bower_components
-
 # node-waf configuration
 .lock-wscript
 

.github/workflows/test-changed.yml

@@ -73,8 +73,7 @@
         "--exit"
       ],
       "env": {
-        "FIRESTORE_EMULATOR_PORT" : "8080",
-        "FIRESTORE_EMULATOR_PROJECT_ID" :  "test-emulator"
+        "FIRESTORE_TARGET_BACKEND" : "emulator",
       },
       "sourceMaps": true,
       "protocol": "inspector"
@@ -95,8 +94,7 @@
       ],
       "env": {
         "USE_MOCK_PERSISTENCE": "YES",
-        "FIRESTORE_EMULATOR_PORT" : "8080",
-        "FIRESTORE_EMULATOR_PROJECT_ID" :  "test-emulator"
+        "FIRESTORE_TARGET_BACKEND" : "emulator",
       },
       "sourceMaps": true,
       "protocol": "inspector"

.gitignore

@@ -11,7 +11,6 @@ applications using Firebase services. This SDK is distributed via:
 
 - [CDN](https://firebase.google.com/docs/web/setup/#add-sdks-initialize)
 - [npm package](https://www.npmjs.com/package/firebase)
-- [Bower package](https://github.com/firebase/firebase-bower)
 
 To get started using Firebase, see
 [Add Firebase to your JavaScript Project](https://firebase.google.com/docs/web/setup).
@@ -113,6 +112,26 @@ database. When prompted to select the set of initial security rules, select
 any option (e.g. "Start in Production Mode") since these permission settings
 will be overwritten below.
 
+#### Storage Setup
+
+Visit the "Storage" section of the console and create a storage bucket. In 
+order to run the tests, you will need to update your bucket's CORS rules.
+
+1. Create a new file called `cors.json` with the contents:
+```json
+[
+    {
+        "origin": ["http://localhost:8089"],
+        "method": ["GET"],
+        "maxAgeSeconds": 3600
+    }
+]
+```
+2. Install `gsutil` from https://cloud.google.com/storage/docs/gsutil_install
+3. Run `gsutil cors set cors.json gs://<your-cloud-storage-bucket>`
+
+For more information, visit https://firebase.google.com/docs/storage/web/download-files#cors_configuration
+
 #### Authentication Support
 
 Visit the authentication config in your project and enable the `Anonymous`
@@ -171,14 +190,16 @@ scope](https://www.npmjs.com/search?q=scope%3Afirebase) on NPM.
 
 ### Testing the SDK Locally
 
-Please be sure to build your repo before proceeding any further.
+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)
 In order to manually test your SDK changes locally, you must use [yarn link](https://classic.yarnpkg.com/en/docs/cli/link):
 
 ```shell
 $ cd packages/firebase
 $ yarn link # initialize the linking to the other folder
-$ cd ../<my-test-app-dir> # cd into your personal project directory
-$ yarn link firebase # tell yarn to use the locally built firebase SDK instead
+$ cd ../packages/<my-product> # Example: $ cd packages/database
+$ yarn link # link your product to make it available elsewhere
+$ cd <my-test-app-dir> # cd into your personal project directory
+$ yarn link firebase @firebase/<my-product> # tell yarn to use the locally built firebase SDK instead
 ```
 
 This will create a symlink and point your `<my-test-app-dir>` to the locally built version of the firebase SDK.

.vscode/launch.json

@@ -421,7 +421,7 @@ export interface SettingsOptions {
 }
 
 // @public
-export function setUserId(analyticsInstance: Analytics, id: string, options?: AnalyticsCallOptions): void;
+export function setUserId(analyticsInstance: Analytics, id: string | null, options?: AnalyticsCallOptions): void;
 
 // @public
 export function setUserProperties(analyticsInstance: Analytics, properties: CustomParams, options?: AnalyticsCallOptions): void;

README.md

@@ -93,6 +93,9 @@ export function initializeApp(options: FirebaseOptions, name?: string): Firebase
 // @public
 export function initializeApp(options: FirebaseOptions, config?: FirebaseAppSettings): FirebaseApp;
 
+// @public
+export function initializeApp(): FirebaseApp;
+
 // @public
 export function onLog(logCallback: LogCallback | null, options?: LogOptions): void;
 

common/api-review/analytics.api.md

@@ -18,7 +18,33 @@ export type AddPrefixToKeys<Prefix extends string, T extends Record<string, unkn
 };
 
 // @public
-export function and(...queryConstraints: QueryFilterConstraint[]): QueryCompositeFilterConstraint;
+export class AggregateField<T> {
+    type: string;
+}
+
+// @public
+export type AggregateFieldType = AggregateField<number>;
+
+// @public
+export class AggregateQuerySnapshot<T extends AggregateSpec> {
+    data(): AggregateSpecData<T>;
+    readonly query: Query<unknown>;
+    readonly type = "AggregateQuerySnapshot";
+}
+
+// @public
+export function aggregateQuerySnapshotEqual<T extends AggregateSpec>(left: AggregateQuerySnapshot<T>, right: AggregateQuerySnapshot<T>): boolean;
+
+// @public
+export interface AggregateSpec {
+    // (undocumented)
+    [field: string]: AggregateFieldType;
+}
+
+// @public
+export type AggregateSpecData<T extends AggregateSpec> = {
+    [P in keyof T]: T[P] extends AggregateField<infer U> ? U : never;
+};
 
 // @public
 export function arrayRemove(...elements: unknown[]): FieldValue;
@@ -172,6 +198,11 @@ export class GeoPoint {
     };
 }
 
+// @public
+export function getCount(query: Query<unknown>): Promise<AggregateQuerySnapshot<{
+    count: AggregateField<number>;
+}>>;
+
 // @public
 export function getDoc<T>(reference: DocumentReference<T>): Promise<DocumentSnapshot<T>>;
 
@@ -203,9 +234,6 @@ export type NestedUpdateFields<T extends Record<string, unknown>> = UnionToInter
     [K in keyof T & string]: ChildUpdateFields<K, T[K]>;
 }[keyof T & string]>;
 
-// @public
-export function or(...queryConstraints: QueryFilterConstraint[]): QueryCompositeFilterConstraint;
-
 // @public
 export function orderBy(fieldPath: string | FieldPath, directionStr?: OrderByDirection): QueryOrderByConstraint;
 
@@ -230,17 +258,9 @@ export class Query<T = DocumentData> {
     withConverter<U>(converter: FirestoreDataConverter<U>): Query<U>;
 }
 
-// @public
-export function query<T>(query: Query<T>, compositeFilter: QueryCompositeFilterConstraint, ...queryConstraints: QueryNonFilterConstraint[]): Query<T>;
-
 // @public
 export function query<T>(query: Query<T>, ...queryConstraints: QueryConstraint[]): Query<T>;
 
-// @public
-export class QueryCompositeFilterConstraint {
-    readonly type: 'or' | 'and';
-}
-
 // @public
 export abstract class QueryConstraint {
     abstract readonly type: QueryConstraintType;
@@ -268,9 +288,6 @@ export class QueryFieldFilterConstraint extends QueryConstraint {
     readonly type = "where";
 }
 
-// @public
-export type QueryFilterConstraint = QueryFieldFilterConstraint | QueryCompositeFilterConstraint;
-
 // @public
 export class QueryLimitConstraint extends QueryConstraint {
     readonly type: 'limit' | 'limitToLast';