Merge branch 'master' into feature-firebaseserverapp

Author: DellaBitta

.changeset/purple-cooks-explode.md

@@ -11,9 +11,9 @@
 *       @firebase/jssdk-global-approvers
 
 # Database Code
-packages/database @maneesht @jsdt @jmwski @firebase/jssdk-global-approvers
-packages/database-compat @maneesht @jsdt @jmwski @firebase/jssdk-global-approvers
-packages/database-types @maneesht @jsdt @jmwski @firebase/jssdk-global-approvers
+packages/database @maneesht @aashishpatil-g @firebase/jssdk-global-approvers
+packages/database-compat @maneesht @aashishpatil-g @firebase/jssdk-global-approvers
+packages/database-types @maneesht @aashishpatil-g @firebase/jssdk-global-approvers
 
 # Firestore Code
 packages/firestore  @firebase/firestore-js-team @firebase/jssdk-global-approvers

.github/CODEOWNERS

@@ -25,7 +25,9 @@ export interface AnalyticsSettings {
 export interface ConsentSettings {
     // (undocumented)
     [key: string]: unknown;
+    ad_personalization?: ConsentStatusString;
     ad_storage?: ConsentStatusString;
+    ad_user_data?: ConsentStatusString;
     analytics_storage?: ConsentStatusString;
     functionality_storage?: ConsentStatusString;
     personalization_storage?: ConsentStatusString;

common/api-review/analytics.api.md

@@ -22,12 +22,24 @@ export interface ConsentSettings
 
 |  Property | Type | Description |
 |  --- | --- | --- |
+|  [ad\_personalization](./analytics.consentsettings.md#consentsettingsad_personalization) | [ConsentStatusString](./analytics.md#consentstatusstring) | Sets consent for personalized advertising. |
 |  [ad\_storage](./analytics.consentsettings.md#consentsettingsad_storage) | [ConsentStatusString](./analytics.md#consentstatusstring) | Enables storage, such as cookies, related to advertising |
+|  [ad\_user\_data](./analytics.consentsettings.md#consentsettingsad_user_data) | [ConsentStatusString](./analytics.md#consentstatusstring) | Sets consent for sending user data to Google for advertising purposes. |
 |  [analytics\_storage](./analytics.consentsettings.md#consentsettingsanalytics_storage) | [ConsentStatusString](./analytics.md#consentstatusstring) | Enables storage, such as cookies, related to analytics (for example, visit duration) |
 |  [functionality\_storage](./analytics.consentsettings.md#consentsettingsfunctionality_storage) | [ConsentStatusString](./analytics.md#consentstatusstring) | Enables storage that supports the functionality of the website or app such as language settings |
 |  [personalization\_storage](./analytics.consentsettings.md#consentsettingspersonalization_storage) | [ConsentStatusString](./analytics.md#consentstatusstring) | Enables storage related to personalization such as video recommendations |
 |  [security\_storage](./analytics.consentsettings.md#consentsettingssecurity_storage) | [ConsentStatusString](./analytics.md#consentstatusstring) | Enables storage related to security such as authentication functionality, fraud prevention, and other user protection. |
 
+## ConsentSettings.ad\_personalization
+
+Sets consent for personalized advertising.
+
+<b>Signature:</b>
+
+```typescript
+ad_personalization?: ConsentStatusString;
+```
+
 ## ConsentSettings.ad\_storage
 
 Enables storage, such as cookies, related to advertising
@@ -38,6 +50,16 @@ Enables storage, such as cookies, related to advertising
 ad_storage?: ConsentStatusString;
 ```
 
+## ConsentSettings.ad\_user\_data
+
+Sets consent for sending user data to Google for advertising purposes.
+
+<b>Signature:</b>
+
+```typescript
+ad_user_data?: ConsentStatusString;
+```
+
 ## ConsentSettings.analytics\_storage
 
 Enables storage, such as cookies, related to analytics (for example, visit duration)

docs-devsite/analytics.consentsettings.md

@@ -29,9 +29,9 @@ export interface GtagConfigParams
 |  [cookie\_flags](./analytics.gtagconfigparams.md#gtagconfigparamscookie_flags) | string | Appends additional flags to the cookie when set. See [Cookies and user identification](https://developers.google.com/analytics/devguides/collection/ga4/cookies-user-id) |
 |  [cookie\_prefix](./analytics.gtagconfigparams.md#gtagconfigparamscookie_prefix) | string | Defaults to <code>_ga</code>. See [Cookies and user identification](https://developers.google.com/analytics/devguides/collection/ga4/cookies-user-id) |
 |  [cookie\_update](./analytics.gtagconfigparams.md#gtagconfigparamscookie_update) | boolean | If set to true, will update cookies on each page load. Defaults to true. See [Cookies and user identification](https://developers.google.com/analytics/devguides/collection/ga4/cookies-user-id) |
-|  [page\_location](./analytics.gtagconfigparams.md#gtagconfigparamspage_location) | string | The URL of the page. See [Page views](https://developers.google.com/analytics/devguides/collection/ga4/page-view) |
-|  [page\_title](./analytics.gtagconfigparams.md#gtagconfigparamspage_title) | string | The title of the page. See [Page views](https://developers.google.com/analytics/devguides/collection/ga4/page-view) |
-|  [send\_page\_view](./analytics.gtagconfigparams.md#gtagconfigparamssend_page_view) | boolean | Whether or not a page view should be sent. If set to true (default), a page view is automatically sent upon initialization of analytics. See [Page views](https://developers.google.com/analytics/devguides/collection/ga4/page-view) |
+|  [page\_location](./analytics.gtagconfigparams.md#gtagconfigparamspage_location) | string | The URL of the page. See [Page views](https://developers.google.com/analytics/devguides/collection/ga4/views) |
+|  [page\_title](./analytics.gtagconfigparams.md#gtagconfigparamspage_title) | string | The title of the page. See [Page views](https://developers.google.com/analytics/devguides/collection/ga4/views) |
+|  [send\_page\_view](./analytics.gtagconfigparams.md#gtagconfigparamssend_page_view) | boolean | Whether or not a page view should be sent. If set to true (default), a page view is automatically sent upon initialization of analytics. See [Page views](https://developers.google.com/analytics/devguides/collection/ga4/views) |
 
 ## GtagConfigParams.allow\_ad\_personalization\_signals
 
@@ -105,7 +105,7 @@ If set to true, will update cookies on each page load. Defaults to true. See [Co
 
 ## GtagConfigParams.page\_location
 
-The URL of the page. See [Page views](https://developers.google.com/analytics/devguides/collection/ga4/page-view)
+The URL of the page. See [Page views](https://developers.google.com/analytics/devguides/collection/ga4/views)
 
 <b>Signature:</b>
 
@@ -115,7 +115,7 @@ The URL of the page. See [Page views](https://developers.google.com/analytics/de
 
 ## GtagConfigParams.page\_title
 
-The title of the page. See [Page views](https://developers.google.com/analytics/devguides/collection/ga4/page-view)
+The title of the page. See [Page views](https://developers.google.com/analytics/devguides/collection/ga4/views)
 
 <b>Signature:</b>
 
@@ -125,7 +125,7 @@ The title of the page. See [Page views](https://developers.google.com/analytics/
 
 ## GtagConfigParams.send\_page\_view
 
-Whether or not a page view should be sent. If set to true (default), a page view is automatically sent upon initialization of analytics. See [Page views](https://developers.google.com/analytics/devguides/collection/ga4/page-view)
+Whether or not a page view should be sent. If set to true (default), a page view is automatically sent upon initialization of analytics. See [Page views](https://developers.google.com/analytics/devguides/collection/ga4/views)
 
 <b>Signature:</b>
 

docs-devsite/analytics.gtagconfigparams.md

@@ -42,7 +42,7 @@ The Firebase Analytics Web SDK. This SDK does not work in a Node.js environment.
 |  [logEvent(analyticsInstance, eventName, eventParams, options)](./analytics.md#logevent_800159e) | Sends a Google Analytics event with given <code>eventParams</code>. This method automatically associates this logged event with this Firebase web app instance on this device.<!-- -->See [Measure exceptions](https://developers.google.com/analytics/devguides/collection/ga4/exceptions)<!-- -->. |
 |  [logEvent(analyticsInstance, eventName, eventParams, options)](./analytics.md#logevent_9c11aa9) | Sends a Google Analytics event with given <code>eventParams</code>. This method automatically associates this logged event with this Firebase web app instance on this device.<!-- -->List of recommended event parameters can be found in [the GA4 reference documentation](https://developers.google.com/gtagjs/reference/ga4-events)<!-- -->. |
 |  [logEvent(analyticsInstance, eventName, eventParams, options)](./analytics.md#logevent_1f3f282) | Sends a Google Analytics event with given <code>eventParams</code>. This method automatically associates this logged event with this Firebase web app instance on this device.<!-- -->List of recommended event parameters can be found in [the GA4 reference documentation](https://developers.google.com/gtagjs/reference/ga4-events)<!-- -->. |
-|  [logEvent(analyticsInstance, eventName, eventParams, options)](./analytics.md#logevent_0792e28) | Sends a Google Analytics event with given <code>eventParams</code>. This method automatically associates this logged event with this Firebase web app instance on this device.<!-- -->See [Page views](https://developers.google.com/analytics/devguides/collection/ga4/page-view)<!-- -->. |
+|  [logEvent(analyticsInstance, eventName, eventParams, options)](./analytics.md#logevent_0792e28) | Sends a Google Analytics event with given <code>eventParams</code>. This method automatically associates this logged event with this Firebase web app instance on this device.<!-- -->See [Page views](https://developers.google.com/analytics/devguides/collection/ga4/views)<!-- -->. |
 |  [setAnalyticsCollectionEnabled(analyticsInstance, enabled)](./analytics.md#setanalyticscollectionenabled_494179c) | Sets whether Google Analytics collection is enabled for this app on this device. Sets global <code>window['ga-disable-analyticsId'] = true;</code> |
 |  [setCurrentScreen(analyticsInstance, screenName, options)](./analytics.md#setcurrentscreen_a6168fa) | Use gtag <code>config</code> command to set <code>screen_name</code>. |
 |  [setUserId(analyticsInstance, id, options)](./analytics.md#setuserid_86d82f6) | Use gtag <code>config</code> command to set <code>user_id</code>. |
@@ -780,7 +780,7 @@ void
 
 Sends a Google Analytics event with given `eventParams`<!-- -->. This method automatically associates this logged event with this Firebase web app instance on this device.
 
-See [Page views](https://developers.google.com/analytics/devguides/collection/ga4/page-view)<!-- -->.
+See [Page views](https://developers.google.com/analytics/devguides/collection/ga4/views)<!-- -->.
 
 <b>Signature:</b>
 

docs-devsite/analytics.md

@@ -10,7 +10,7 @@ https://github.com/firebase/firebase-js-sdk
 {% endcomment %}
 
 # GoogleAuthProvider class
-Provider for generating an an [OAuthCredential](./auth.oauthcredential.md#oauthcredential_class) for [ProviderId](./auth.md#providerid)<!-- -->.GOOGLE.
+Provider for generating an [OAuthCredential](./auth.oauthcredential.md#oauthcredential_class) for [ProviderId](./auth.md#providerid)<!-- -->.GOOGLE.
 
 <b>Signature:</b>
 

docs-devsite/auth.googleauthprovider.md

@@ -88,7 +88,7 @@ Firebase Authentication
 |  [EmailAuthProvider](./auth.emailauthprovider.md#emailauthprovider_class) | Provider for generating [EmailAuthCredential](./auth.emailauthcredential.md#emailauthcredential_class)<!-- -->. |
 |  [FacebookAuthProvider](./auth.facebookauthprovider.md#facebookauthprovider_class) | Provider for generating an [OAuthCredential](./auth.oauthcredential.md#oauthcredential_class) for [ProviderId](./auth.md#providerid)<!-- -->.FACEBOOK. |
 |  [GithubAuthProvider](./auth.githubauthprovider.md#githubauthprovider_class) | Provider for generating an [OAuthCredential](./auth.oauthcredential.md#oauthcredential_class) for [ProviderId](./auth.md#providerid)<!-- -->.GITHUB. |
-|  [GoogleAuthProvider](./auth.googleauthprovider.md#googleauthprovider_class) | Provider for generating an an [OAuthCredential](./auth.oauthcredential.md#oauthcredential_class) for [ProviderId](./auth.md#providerid)<!-- -->.GOOGLE. |
+|  [GoogleAuthProvider](./auth.googleauthprovider.md#googleauthprovider_class) | Provider for generating an [OAuthCredential](./auth.oauthcredential.md#oauthcredential_class) for [ProviderId](./auth.md#providerid)<!-- -->.GOOGLE. |
 |  [OAuthCredential](./auth.oauthcredential.md#oauthcredential_class) | Represents the OAuth credentials returned by an [OAuthProvider](./auth.oauthprovider.md#oauthprovider_class)<!-- -->. |
 |  [OAuthProvider](./auth.oauthprovider.md#oauthprovider_class) | Provider for generating generic [OAuthCredential](./auth.oauthcredential.md#oauthcredential_class)<!-- -->. |
 |  [PhoneAuthCredential](./auth.phoneauthcredential.md#phoneauthcredential_class) | Represents the credentials returned by [PhoneAuthProvider](./auth.phoneauthprovider.md#phoneauthprovider_class)<!-- -->. |

docs-devsite/auth.md

@@ -8,20 +8,20 @@
     "test:debug": "karma start --browsers Chrome --auto-watch"
   },
   "dependencies": {
-    "@firebase/app": "0.9.26",
-    "@firebase/app-compat": "0.2.26",
-    "@firebase/analytics": "0.10.0",
-    "@firebase/analytics-compat": "0.2.6",
-    "@firebase/auth": "1.5.1",
-    "@firebase/auth-compat": "0.5.1",
-    "@firebase/functions": "0.11.0",
-    "@firebase/functions-compat": "0.3.6",
-    "@firebase/messaging": "0.12.5",
-    "@firebase/messaging-compat": "0.2.5",
-    "@firebase/performance": "0.6.4",
-    "@firebase/performance-compat": "0.2.4",
-    "@firebase/remote-config": "0.4.4",
-    "@firebase/remote-config-compat": "0.2.4"
+    "@firebase/app": "0.9.27",
+    "@firebase/app-compat": "0.2.27",
+    "@firebase/analytics": "0.10.1",
+    "@firebase/analytics-compat": "0.2.7",
+    "@firebase/auth": "1.6.0",
+    "@firebase/auth-compat": "0.5.2",
+    "@firebase/functions": "0.11.1",
+    "@firebase/functions-compat": "0.3.7",
+    "@firebase/messaging": "0.12.6",
+    "@firebase/messaging-compat": "0.2.6",
+    "@firebase/performance": "0.6.5",
+    "@firebase/performance-compat": "0.2.5",
+    "@firebase/remote-config": "0.4.5",
+    "@firebase/remote-config-compat": "0.2.5"
   },
   "devDependencies": {
     "typescript": "4.7.4"

integration/compat-interop/package.json

@@ -7,7 +7,7 @@
     "test:ci": "node ../../scripts/run_tests_in_ci.js -s test"
   },
   "devDependencies": {
-    "firebase": "10.7.2",
+    "firebase": "10.8.0",
     "@types/chai": "4.3.5",
     "@types/mocha": "9.1.1",
     "chai": "4.3.7",

integration/firebase/package.json

@@ -14,8 +14,8 @@
     "test:memory:debug": "yarn build:memory; karma start --auto-watch --browsers Chrome"
   },
   "dependencies": {
-    "@firebase/app": "0.9.26",
-    "@firebase/firestore": "4.4.1"
+    "@firebase/app": "0.9.27",
+    "@firebase/firestore": "4.4.2"
   },
   "devDependencies": {
     "@types/mocha": "9.1.1",

integration/firestore/package.json

@@ -9,7 +9,7 @@
     "test:manual": "mocha --exit"
   },
   "devDependencies": {
-    "firebase": "10.7.2",
+    "firebase": "10.8.0",
     "chai": "4.3.7",
     "chromedriver": "114.0.2",
     "express": "4.18.2",

integration/messaging/package.json

@@ -1,5 +1,14 @@
 # @firebase/analytics-compat
 
+## 0.2.7
+
+### Patch Changes
+
+- Updated dependencies [[`bf59c0aed`](https://github.com/firebase/firebase-js-sdk/commit/bf59c0aedefabae9bff4d777e1591fe496259293), [`434f8418c`](https://github.com/firebase/firebase-js-sdk/commit/434f8418c3db3ae98489a8461c437c248c039070)]:
+  - @firebase/analytics@0.10.1
+  - @firebase/util@1.9.4
+  - @firebase/component@0.6.5
+
 ## 0.2.6
 
 ### Patch Changes

packages/analytics-compat/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/analytics-compat",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "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.2.26",
+    "@firebase/app-compat": "0.2.27",
     "rollup": "2.79.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.6.4",
-    "@firebase/analytics": "0.10.0",
+    "@firebase/component": "0.6.5",
+    "@firebase/analytics": "0.10.1",
     "@firebase/analytics-types": "0.8.0",
-    "@firebase/util": "1.9.3",
+    "@firebase/util": "1.9.4",
     "tslib": "^2.1.0"
   },
   "nyc": {

packages/analytics-compat/package.json

@@ -197,7 +197,7 @@ export interface FirebaseAnalytics {
    * automatically associates this logged event with this Firebase web
    * app instance on this device.
    * See
-   * {@link https://developers.google.com/analytics/devguides/collection/ga4/page-view
+   * {@link https://developers.google.com/analytics/devguides/collection/ga4/views
    * | Page views}.
    */
   logEvent(

packages/analytics-types/index.d.ts

@@ -1,5 +1,16 @@
 # @firebase/analytics
 
+## 0.10.1
+
+### Patch Changes
+
+- [`bf59c0aed`](https://github.com/firebase/firebase-js-sdk/commit/bf59c0aedefabae9bff4d777e1591fe496259293) - Analytics - added two new consent options to the ConsentSettings interface: ad_personalization and ad_user_data.
+
+- Updated dependencies [[`434f8418c`](https://github.com/firebase/firebase-js-sdk/commit/434f8418c3db3ae98489a8461c437c248c039070)]:
+  - @firebase/util@1.9.4
+  - @firebase/installations@0.6.5
+  - @firebase/component@0.6.5
+
 ## 0.10.0
 
 ### Minor Changes

packages/analytics/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/analytics",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "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.6.4",
+    "@firebase/installations": "0.6.5",
     "@firebase/logger": "0.4.0",
-    "@firebase/util": "1.9.3",
-    "@firebase/component": "0.6.4",
+    "@firebase/util": "1.9.4",
+    "@firebase/component": "0.6.5",
     "tslib": "^2.1.0"
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app": "0.9.26",
+    "@firebase/app": "0.9.27",
     "rollup": "2.79.1",
     "@rollup/plugin-commonjs": "21.1.0",
     "@rollup/plugin-json": "4.1.0",

packages/analytics/package.json

@@ -441,7 +441,7 @@ export function logEvent(
  * app instance on this device.
  * @public
  * See
- * {@link https://developers.google.com/analytics/devguides/collection/ga4/page-view
+ * {@link https://developers.google.com/analytics/devguides/collection/ga4/views
  * | Page views}.
  */
 export function logEvent(

packages/analytics/src/api.ts

@@ -27,17 +27,17 @@ export interface GtagConfigParams {
    * Whether or not a page view should be sent.
    * If set to true (default), a page view is automatically sent upon initialization
    * of analytics.
-   * See {@link https://developers.google.com/analytics/devguides/collection/ga4/page-view | Page views }
+   * See {@link https://developers.google.com/analytics/devguides/collection/ga4/views | Page views }
    */
   'send_page_view'?: boolean;
   /**
    * The title of the page.
-   * See {@link https://developers.google.com/analytics/devguides/collection/ga4/page-view | Page views }
+   * See {@link https://developers.google.com/analytics/devguides/collection/ga4/views | Page views }
    */
   'page_title'?: string;
   /**
    * The URL of the page.
-   * See {@link https://developers.google.com/analytics/devguides/collection/ga4/page-view | Page views }
+   * See {@link https://developers.google.com/analytics/devguides/collection/ga4/views | Page views }
    */
   'page_location'?: string;
   /**
@@ -299,6 +299,10 @@ export interface EventParams {
 export interface ConsentSettings {
   /** Enables storage, such as cookies, related to advertising */
   ad_storage?: ConsentStatusString;
+  /** Sets consent for sending user data to Google for advertising purposes. */
+  ad_user_data?: ConsentStatusString;
+  /** Sets consent for personalized advertising. */
+  ad_personalization?: ConsentStatusString;
   /** Enables storage, such as cookies, related to analytics (for example, visit duration) */
   analytics_storage?: ConsentStatusString;
   /**

packages/analytics/src/public-types.ts

@@ -1,5 +1,14 @@
 # @firebase/app-check-compat
 
+## 0.3.9
+
+### Patch Changes
+
+- Updated dependencies [[`434f8418c`](https://github.com/firebase/firebase-js-sdk/commit/434f8418c3db3ae98489a8461c437c248c039070)]:
+  - @firebase/util@1.9.4
+  - @firebase/app-check@0.8.2
+  - @firebase/component@0.6.5
+
 ## 0.3.8
 
 ### Patch Changes