Merge branch 'master' of github.com:firebase/firebase-js-sdk into markduckworth/or-queries-pr-2

Author: MarkDuckworth

.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

@@ -21,6 +21,7 @@ jobs:
         # Release script requires git history and tags.
         fetch-depth: 0
         ref: release
+        token: ${{ secrets.OSS_BOT_GITHUB_TOKEN }}
     - name: Yarn install
       run: yarn
     - name: Publish to NPM
@@ -31,7 +32,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

.github/CODEOWNERS

@@ -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/assign-tech-writers.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/health-metrics-pull-request.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/label-doc-changes.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.28",
+    "@firebase/app-compat": "0.1.29",
+    "@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/release-pr.yml

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

.github/workflows/release-prod.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.28",
+    "@firebase/firestore": "3.4.12"
   },
   "devDependencies": {
     "@types/mocha": "9.1.1",

.github/workflows/test-all.yml

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

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

@@ -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",

common/api-review/analytics.api.md

@@ -1,5 +1,23 @@
 # @firebase/analytics-compat
 
+## 0.1.13
+
+### Patch Changes
+
+- Updated dependencies [[`b12af44a5`](https://github.com/firebase/firebase-js-sdk/commit/b12af44a5c7500e1192d6cc1a4afc4d77efadbaf), [`1d3a34d7d`](https://github.com/firebase/firebase-js-sdk/commit/1d3a34d7da5bf3c267d014efb587e03c46ff3064), [`69e2ee064`](https://github.com/firebase/firebase-js-sdk/commit/69e2ee064e0729d8da823f1e60f6fb7f3bbe5700)]:
+  - @firebase/util@1.6.3
+  - @firebase/analytics@0.8.0
+  - @firebase/component@0.5.17
+
+## 0.1.12
+
+### Patch Changes
+
+- Updated dependencies [[`835f1d46a`](https://github.com/firebase/firebase-js-sdk/commit/835f1d46a6780535bc660ef7dc23293350d5fe43), [`efe2000fc`](https://github.com/firebase/firebase-js-sdk/commit/efe2000fc499e2c85c4e5e0fef6741ff3bad2eb0)]:
+  - @firebase/analytics@0.7.11
+  - @firebase/util@1.6.2
+  - @firebase/component@0.5.16
+
 ## 0.1.11
 
 ### Patch Changes

common/api-review/util.api.md

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/analytics-compat",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
@@ -24,7 +24,7 @@
     "@firebase/app-compat": "0.x"
   },
   "devDependencies": {
-    "@firebase/app-compat": "0.1.27",
+    "@firebase/app-compat": "0.1.29",
     "rollup": "2.72.1",
     "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-typescript2": "0.31.2",
@@ -53,10 +53,10 @@
   },
   "typings": "dist/src/index.d.ts",
   "dependencies": {
-    "@firebase/component": "0.5.15",
-    "@firebase/analytics": "0.7.10",
+    "@firebase/component": "0.5.17",
+    "@firebase/analytics": "0.8.0",
     "@firebase/analytics-types": "0.7.0",
-    "@firebase/util": "1.6.1",
+    "@firebase/util": "1.6.3",
     "tslib": "^2.1.0"
   },
   "nyc": {

integration/compat-interop/package.json

@@ -1,5 +1,31 @@
 # @firebase/analytics
 
+## 0.8.0
+
+### Minor Changes
+
+- [`1d3a34d7d`](https://github.com/firebase/firebase-js-sdk/commit/1d3a34d7da5bf3c267d014efb587e03c46ff3064) [#6376](https://github.com/firebase/firebase-js-sdk/pull/6376) - Add function `setConsent()` to set the applicable end user "consent" state.
+
+* [`69e2ee064`](https://github.com/firebase/firebase-js-sdk/commit/69e2ee064e0729d8da823f1e60f6fb7f3bbe5700) [#6367](https://github.com/firebase/firebase-js-sdk/pull/6367) - Add function `setDefaultEventParameters()` to set data that will be logged on every Analytics SDK event
+
+### Patch Changes
+
+- Updated dependencies [[`b12af44a5`](https://github.com/firebase/firebase-js-sdk/commit/b12af44a5c7500e1192d6cc1a4afc4d77efadbaf)]:
+  - @firebase/util@1.6.3
+  - @firebase/component@0.5.17
+  - @firebase/installations@0.5.12
+
+## 0.7.11
+
+### Patch Changes
+
+- [`835f1d46a`](https://github.com/firebase/firebase-js-sdk/commit/835f1d46a6780535bc660ef7dc23293350d5fe43) [#6357](https://github.com/firebase/firebase-js-sdk/pull/6357) - Fix typo in GtagConfigParams
+
+- Updated dependencies [[`efe2000fc`](https://github.com/firebase/firebase-js-sdk/commit/efe2000fc499e2c85c4e5e0fef6741ff3bad2eb0)]:
+  - @firebase/util@1.6.2
+  - @firebase/component@0.5.16
+  - @firebase/installations@0.5.11
+
 ## 0.7.10
 
 ### Patch Changes

integration/firebase/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/analytics",
-  "version": "0.7.10",
+  "version": "0.8.0",
   "description": "A analytics package for new firebase packages",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
@@ -40,15 +40,15 @@
     "@firebase/app": "0.x"
   },
   "dependencies": {
-    "@firebase/installations": "0.5.10",
+    "@firebase/installations": "0.5.12",
     "@firebase/logger": "0.3.3",
-    "@firebase/util": "1.6.1",
-    "@firebase/component": "0.5.15",
+    "@firebase/util": "1.6.3",
+    "@firebase/component": "0.5.17",
     "tslib": "^2.1.0"
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app": "0.7.26",
+    "@firebase/app": "0.7.28",
     "rollup": "2.72.1",
     "@rollup/plugin-commonjs": "21.1.0",
     "@rollup/plugin-json": "4.1.0",