Merge remote-tracking branch 'origin/markduckworth/or-queries' into markduckworth/or-queries-pr-3

Author: MarkDuckworth

.changeset/kind-pots-admire.md

@@ -0,0 +1,7 @@
+---
+'@firebase/database': patch
+'@firebase/database-compat': patch
+'@firebase/database-types': patch
+---
+
+Updated type of action parameter for DataSnapshot#forEach

.changeset/nervous-starfishes-crash.md

@@ -16,6 +16,7 @@
 #   - @lahirumaramba
 #   - @hsubox76
 #   - @allspain
+#   - @dwyfrequency
 
 
 # ===========================================================
@@ -32,7 +33,7 @@
 
 
 # These owners will be the default owners for everything in the repo.
-*       @allspain @hsubox76 @firebase/jssdk-global-approvers
+*       @dwyfrequency @hsubox76 @firebase/jssdk-global-approvers
 
 # Database Code
 packages/database @maneesht @jsdt @firebase/jssdk-global-approvers

.changeset/rotten-tables-brush.md

@@ -1,6 +1,9 @@
 name: Health Metrics
 
-on: [push, pull_request]
+on:
+  push:
+    branches: ['**']
+  pull_request:
 
 env:
   GITHUB_PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }}

.changeset/sharp-rules-enjoy.md

@@ -33,4 +33,9 @@ jobs:
       if: ${{steps.check-doc-changes.outputs.DOC_CHANGED == 'true'}}
       with:
         labels: doc-changes
-        github_token: ${{ secrets.OSS_BOT_GITHUB_TOKEN }}
+        github_token: ${{ github.token }}
+    - name: assign techwriters to PR
+      if: ${{steps.check-doc-changes.outputs.DOC_CHANGED == 'true'}}
+      uses: kentaro-m/[email protected]
+      with:
+        configuration-path: ".github/auto_assign.yml"

.changeset/tame-rice-peel.md

@@ -10,6 +10,7 @@ jobs:
   release:
     name: Create Release PR
     runs-on: ubuntu-latest
+    if: ${{ !startsWith(github.event.head_commit.message, 'Version Packages (#') }}
     steps:
       - name: Checkout Repo
         uses: actions/checkout@master

.changeset/tiny-donuts-draw.md

@@ -1,6 +1,13 @@
 name: Production Release
 
-on: workflow_dispatch
+on:
+  workflow_dispatch:
+    inputs:
+      release-branch:
+        description: 'Release branch'
+        type: string
+        default: 'release'
+        required: true
 
 jobs:
   deploy:
@@ -20,7 +27,8 @@ jobs:
       with:
         # Release script requires git history and tags.
         fetch-depth: 0
-        ref: release
+        ref: ${{ github.event.inputs.release-branch }}
+        token: ${{ secrets.OSS_BOT_GITHUB_TOKEN }}
     - name: Yarn install
       run: yarn
     - name: Publish to NPM
@@ -31,7 +39,6 @@ jobs:
       # TODO: Make these flags defaults in the release script.
       run: yarn release --releaseType Production --ci --skipTests --skipReinstall --ignoreUnstaged
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         NPM_TOKEN_ANALYTICS: ${{secrets.NPM_TOKEN_ANALYTICS}}
         NPM_TOKEN_ANALYTICS_INTEROP_TYPES: ${{secrets.NPM_TOKEN_ANALYTICS_INTEROP_TYPES}}
         NPM_TOKEN_ANALYTICS_TYPES: ${{secrets.NPM_TOKEN_ANALYTICS_TYPES}}

.changeset/witty-windows-unite.md

@@ -1,6 +1,9 @@
 name: Test All Packages
 
-on: push
+on:
+  push:
+    branches: ['**']
+
 env:
   # make chromedriver detect installed Chrome version and download the corresponding driver
   DETECT_CHROMEDRIVER_VERSION: true
@@ -17,10 +20,10 @@ jobs:
         sudo apt-get update
         sudo apt-get install google-chrome-stable
     - uses: actions/checkout@v2
-    - name: Set up Node (14)
+    - name: Set up Node (16)
       uses: actions/setup-node@v2
       with:
-        node-version: 14.x
+        node-version: 16.x
     - name: Bump Node memory limit
       run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
     - name: Test setup and yarn install
@@ -35,6 +38,8 @@ jobs:
       run: |
         xvfb-run yarn test:ci
         node scripts/print_test_logs.js
+      env:
+        FIREBASE_TOKEN: ${{ secrets.FIREBASE_CLI_TOKEN }}
     - name: Generate coverage file
       run: yarn ci:coverage
     - name: Run coverage

.github/CODEOWNERS

@@ -13,10 +13,10 @@ jobs:
       with:
         # This makes Actions fetch all Git history so run-changed script can diff properly.
         fetch-depth: 0
-    - name: Set up Node (14)
+    - name: Set up Node (16)
       uses: actions/setup-node@v2
       with:
-        node-version: 14.x
+        node-version: 16.x
     - name: install Chrome stable
       run: |
         sudo apt-get update
@@ -30,4 +30,6 @@ jobs:
     - name: build
       run: yarn build:changed misc
     - name: Run tests
-      run: yarn test:changed misc
+      run: yarn test:changed misc
+      env:
+        FIREBASE_TOKEN: ${{ secrets.FIREBASE_CLI_TOKEN }}

.github/workflows/assign-tech-writers.yml

@@ -7,13 +7,15 @@ jobs:
     name: Update API reports
     runs-on: ubuntu-latest
 
+    permissions:
+      contents: write
     steps:
     - name: Checkout Repo
       uses: actions/checkout@master
       with:
         # checkout HEAD commit instead of merge commit
         ref: ${{ github.event.pull_request.head.sha }}
-        token: ${{ secrets.OSS_BOT_GITHUB_TOKEN }}
+        token: ${{ github.token }}
     - name: Set up Node (14)
       uses: actions/setup-node@v2
       with:

.github/workflows/health-metrics-pull-request.yml

@@ -21,6 +21,20 @@ export interface AnalyticsSettings {
     config?: GtagConfigParams | EventParams;
 }
 
+// @public
+export interface ConsentSettings {
+    // (undocumented)
+    [key: string]: unknown;
+    ad_storage?: ConsentStatusString;
+    analytics_storage?: ConsentStatusString;
+    functionality_storage?: ConsentStatusString;
+    personalization_storage?: ConsentStatusString;
+    security_storage?: ConsentStatusString;
+}
+
+// @public
+export type ConsentStatusString = 'granted' | 'denied';
+
 // @public
 export interface ControlParams {
     // (undocumented)
@@ -388,9 +402,15 @@ export interface Promotion {
 // @public
 export function setAnalyticsCollectionEnabled(analyticsInstance: Analytics, enabled: boolean): void;
 
+// @public
+export function setConsent(consentSettings: ConsentSettings): void;
+
 // @public @deprecated
 export function setCurrentScreen(analyticsInstance: Analytics, screenName: string, options?: AnalyticsCallOptions): void;
 
+// @public
+export function setDefaultEventParameters(customParams: CustomParams): void;
+
 // @public
 export function settings(options: SettingsOptions): void;
 

.github/workflows/label-doc-changes.yml

@@ -33,7 +33,9 @@ export class DataSnapshot {
     child(path: string): DataSnapshot;
     exists(): boolean;
     exportVal(): any;
-    forEach(action: (child: DataSnapshot) => boolean | void): boolean;
+    forEach(action: (child: DataSnapshot & {
+        key: string;
+    }) => boolean | void): boolean;
     hasChild(path: string): boolean;
     hasChildren(): boolean;
     get key(): string | null;

.github/workflows/release-pr.yml

@@ -346,6 +346,11 @@ export function ordinal(i: number): string;
 // @public (undocumented)
 export type PartialObserver<T> = Partial<Observer<T>>;
 
+// Warning: (ae-internal-missing-underscore) The name "promiseWithTimeout" should be prefixed with an underscore because the declaration is marked as @internal
+//
+// @internal
+export function promiseWithTimeout<T>(promise: Promise<T>, timeInMS?: number): Promise<T>;
+
 // Warning: (ae-missing-release-tag) "querystring" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public

.github/workflows/release-prod.yml

@@ -3,11 +3,11 @@
   "description": "Cloud Functions for Firebase",
   "dependencies": {
     "cors": "2.8.5",
-    "firebase-admin": "10.2.0",
-    "firebase-functions": "3.21.0"
+    "firebase-admin": "11.0.0",
+    "firebase-functions": "3.22.0"
   },
   "private": true,
   "engines": {
-    "node": "10"
+    "node": "16"
   }
 }

.github/workflows/test-all.yml

@@ -8,20 +8,20 @@
     "test:debug": "karma start --browsers Chrome --auto-watch"
   },
   "dependencies": {
-    "@firebase/app": "0.7.26",
-    "@firebase/app-compat": "0.1.27",
-    "@firebase/analytics": "0.7.10",
-    "@firebase/analytics-compat": "0.1.11",
-    "@firebase/auth": "0.20.3",
-    "@firebase/auth-compat": "0.2.16",
-    "@firebase/functions": "0.8.2",
-    "@firebase/functions-compat": "0.2.2",
-    "@firebase/messaging": "0.9.14",
-    "@firebase/messaging-compat": "0.1.14",
-    "@firebase/performance": "0.5.10",
-    "@firebase/performance-compat": "0.1.10",
-    "@firebase/remote-config": "0.3.9",
-    "@firebase/remote-config-compat": "0.1.10"
+    "@firebase/app": "0.7.29",
+    "@firebase/app-compat": "0.1.30",
+    "@firebase/analytics": "0.8.0",
+    "@firebase/analytics-compat": "0.1.13",
+    "@firebase/auth": "0.20.5",
+    "@firebase/auth-compat": "0.2.18",
+    "@firebase/functions": "0.8.4",
+    "@firebase/functions-compat": "0.2.4",
+    "@firebase/messaging": "0.9.16",
+    "@firebase/messaging-compat": "0.1.16",
+    "@firebase/performance": "0.5.12",
+    "@firebase/performance-compat": "0.1.12",
+    "@firebase/remote-config": "0.3.11",
+    "@firebase/remote-config-compat": "0.1.12"
   },
   "devDependencies": {
     "typescript": "4.2.2"

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

@@ -7,7 +7,7 @@
     "test:ci": "node ../../scripts/run_tests_in_ci.js -s test"
   },
   "devDependencies": {
-    "firebase": "9.8.3",
+    "firebase": "9.9.1",
     "@types/chai": "4.3.1",
     "@types/mocha": "9.1.1",
     "chai": "4.3.6",

.github/workflows/update-api-reports.yml

@@ -15,8 +15,8 @@
     "test:memory:debug": "yarn build:memory; karma start --auto-watch --browsers Chrome"
   },
   "dependencies": {
-    "@firebase/app": "0.7.26",
-    "@firebase/firestore": "3.4.10"
+    "@firebase/app": "0.7.29",
+    "@firebase/firestore": "3.4.13"
   },
   "devDependencies": {
     "@types/mocha": "9.1.1",

common/api-review/analytics.api.md

@@ -9,7 +9,7 @@
     "test:manual": "mocha --exit"
   },
   "devDependencies": {
-    "firebase": "9.8.3",
+    "firebase": "9.9.1",
     "chai": "4.3.6",
     "chromedriver": "98.0.1",
     "express": "4.18.1",

common/api-review/database.api.md

@@ -106,8 +106,8 @@
     "eslint-plugin-unused-imports": "2.0.0",
     "express": "4.18.1",
     "find-free-port": "2.0.0",
-    "firebase-functions": "3.21.0",
-    "firebase-tools": "9.23.3",
+    "firebase-functions": "3.22.0",
+    "firebase-tools": "11.2.2",
     "glob": "7.2.0",
     "http-server": "14.1.0",
     "indexeddbshim": "8.0.0",
@@ -136,7 +136,6 @@
     "mocha": "9.2.2",
     "mz": "2.7.0",
     "npm-run-all": "4.1.5",
-    "npm-run-path": "4.0.1",
     "nyc": "15.1.0",
     "ora": "5.4.1",
     "prettier": "2.6.2",
@@ -147,7 +146,7 @@
     "sinon": "9.2.4",
     "sinon-chai": "3.7.0",
     "source-map-loader": "1.1.3",
-    "terser": "5.13.1",
+    "terser": "5.14.2",
     "ts-loader": "8.4.0",
     "ts-node": "10.7.0",
     "tslint": "6.1.3",