Merge master into release

Author: google-oss-bot

.changeset/nervous-starfishes-crash.md

@@ -0,0 +1,5 @@
+---
+'@firebase/rules-unit-testing': patch
+---
+
+Add Node ESM build to rules-unit-testing.

.changeset/rotten-tables-brush.md

@@ -0,0 +1,5 @@
+---
+"@firebase/database": patch
+---
+
+Fixed issue where `get()` saved results incorrectly for non-default queries.

.changeset/sharp-rules-enjoy.md

@@ -0,0 +1,5 @@
+---
+'@firebase/analytics': patch
+---
+
+Fix typo in GtagConfigParams

.changeset/tame-rice-peel.md

@@ -0,0 +1,7 @@
+---
+"@firebase/app-check": patch
+"@firebase/database": patch
+"@firebase/util": patch
+---
+
+Extract uuid function into @firebase/util

.github/workflows/e2e-test.yml

@@ -61,6 +61,7 @@ jobs:
         env:
           WEBHOOK_URL: ${{ secrets.JSCORE_CHAT_WEBHOOK_URL }}
           RELEASE_TRACKER_URL: ${{ secrets.RELEASE_TRACKER_URL }}
+          VERSION_OR_TAG: ${{ github.event.client_payload.versionOrTag }}
         # run in root
         working-directory: '.'
       - name: Tests failed
@@ -69,5 +70,6 @@ jobs:
         env:
           WEBHOOK_URL: ${{ secrets.JSCORE_CHAT_WEBHOOK_URL }}
           RELEASE_TRACKER_URL: ${{ secrets.RELEASE_TRACKER_URL }}
+          VERSION_OR_TAG: ${{ github.event.client_payload.versionOrTag }}
         # run in root
         working-directory: '.'

.vscode/launch.json

@@ -8,14 +8,15 @@
       "type": "node",
       "request": "launch",
       "name": "RTDB Unit Tests (Node)",
-      "program": "${workspaceRoot}/packages/firebase/node_modules/.bin/_mocha",
+      "program": "${workspaceRoot}/node_modules/.bin/_mocha",
       "cwd": "${workspaceRoot}/packages/database",
       "args": [
         "test/{,!(browser)/**/}*.test.ts",
-        "--file", "index.node.ts",
-        "--config", "../../config/mocharc.node.js"
+        "--file", "src/index.node.ts",
+        "--config", "../../config/mocharc.node.js",
       ],
       "env": {
+        "TS_NODE_FILES":true,
         "TS_NODE_CACHE": "NO",
         "TS_NODE_COMPILER_OPTIONS" : "{\"module\":\"commonjs\"}"
       },
@@ -30,7 +31,7 @@
       "cwd": "${workspaceRoot}/packages/firestore",
       "args": [
         "--require", "babel-register.js",
-        "--require", "index.node.ts",
+        "--require", "src/index.node.ts",
         "--timeout", "5000",
         "test/{,!(browser|integration)/**/}*.test.ts",
         "--exit"

common/api-review/analytics.api.md

@@ -121,10 +121,10 @@ export function getAnalytics(app?: FirebaseApp): Analytics;
 
 // @public
 export interface GtagConfigParams {
-    'allow_google_signals?': boolean;
     // (undocumented)
     [key: string]: unknown;
     'allow_ad_personalization_signals'?: boolean;
+    'allow_google_signals'?: boolean;
     'cookie_domain'?: string;
     'cookie_expires'?: number;
     'cookie_flags'?: string;

common/api-review/util.api.md

@@ -422,6 +422,9 @@ export interface Subscribe<T> {
 // @public (undocumented)
 export type Unsubscribe = () => void;
 
+// @public
+export const uuidv4: () => string;
+
 // Warning: (ae-missing-release-tag) "validateArgCount" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public

packages/analytics/src/get-config.ts

@@ -188,7 +188,9 @@ async function attemptFetchDynamicConfigWithRetry(
       logger.warn(
         `Timed out fetching this Firebase app's measurement ID from the server.` +
           ` Falling back to the measurement ID ${measurementId}` +
-          ` provided in the "measurementId" field in the local Firebase config. [${e.message}]`
+          ` provided in the "measurementId" field in the local Firebase config. [${
+            (e as Error)?.message
+          }]`
       );
       return { appId, measurementId };
     }
@@ -203,13 +205,14 @@ async function attemptFetchDynamicConfigWithRetry(
 
     return response;
   } catch (e) {
-    if (!isRetriableError(e)) {
+    const error = e as Error;
+    if (!isRetriableError(error)) {
       retryData.deleteThrottleMetadata(appId);
       if (measurementId) {
         logger.warn(
           `Failed to fetch this Firebase app's measurement ID from the server.` +
             ` Falling back to the measurement ID ${measurementId}` +
-            ` provided in the "measurementId" field in the local Firebase config. [${e.message}]`
+            ` provided in the "measurementId" field in the local Firebase config. [${error?.message}]`
         );
         return { appId, measurementId };
       } else {
@@ -218,7 +221,7 @@ async function attemptFetchDynamicConfigWithRetry(
     }
 
     const backoffMillis =
-      Number(e.customData.httpStatus) === 503
+      Number(error?.customData?.httpStatus) === 503
         ? calculateBackoffMillis(
             backoffCount,
             retryData.intervalMillis,

packages/analytics/src/initialize-analytics.ts

@@ -43,7 +43,7 @@ async function validateIndexedDB(): Promise<boolean> {
     } catch (e) {
       logger.warn(
         ERROR_FACTORY.create(AnalyticsError.INDEXEDDB_UNAVAILABLE, {
-          errorInfo: e
+          errorInfo: (e as Error)?.toString()
         }).message
       );
       return false;