Merge remote-tracking branch 'origin/main' into mtewani/add-more-integration-tests

maneesht · maneesht · commit cc4da5586012 · 2025-05-23T11:03:11.000-07:00
diff --git a/.changeset/dirty-crews-cross.md b/.changeset/dirty-crews-cross.md
diff --git a/.changeset/spotty-ghosts-kneel.md b/.changeset/spotty-ghosts-kneel.md
@@ -0,0 +1,5 @@
+---
+"@firebase/firestore": patch
+---
+
+Clean up leaked WebChannel instances when the Firestore instance is terminated.
diff --git a/config/karma.base.js b/config/karma.base.js
@@ -68,7 +68,7 @@ const config = {
   // test results reporter to use
   // possible values: 'dots', 'progress'
   // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-  reporters: ['mocha', 'coverage-istanbul'],
+  reporters: ['coverage-istanbul', 'mocha'],
 
   // web server port
   port: 8089,
diff --git a/integration/compat-interop/package.json b/integration/compat-interop/package.json
@@ -12,10 +12,10 @@
     "@firebase/app-compat": "0.4.0",
     "@firebase/analytics": "0.10.16",
     "@firebase/analytics-compat": "0.2.22",
-    "@firebase/auth": "1.10.5",
-    "@firebase/auth-compat": "0.5.25",
-    "@firebase/functions": "0.12.7",
-    "@firebase/functions-compat": "0.3.24",
+    "@firebase/auth": "1.10.6",
+    "@firebase/auth-compat": "0.5.26",
+    "@firebase/functions": "0.12.8",
+    "@firebase/functions-compat": "0.3.25",
     "@firebase/messaging": "0.12.21",
     "@firebase/messaging-compat": "0.2.21",
     "@firebase/performance": "0.7.6",
diff --git a/integration/firestore/package.json b/integration/firestore/package.json
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@firebase/app": "0.13.0",
-    "@firebase/firestore": "4.7.15"
+    "@firebase/firestore": "4.7.16"
   },
   "devDependencies": {
     "@types/mocha": "9.1.1",
diff --git a/integration/messaging/package.json b/integration/messaging/package.json
@@ -9,7 +9,7 @@
     "test:manual": "mocha --exit"
   },
   "devDependencies": {
-    "firebase": "11.8.0",
+    "firebase": "11.8.1",
     "chai": "4.5.0",
     "chromedriver": "119.0.1",
     "express": "4.21.2",
diff --git a/packages/auth-compat/CHANGELOG.md b/packages/auth-compat/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @firebase/auth-compat
 
+## 0.5.26
+
+### Patch Changes
+
+- Updated dependencies [[`35ad526`](https://github.com/firebase/firebase-js-sdk/commit/35ad5266304e14425988fcf5ad06d028b37588ac), [`b5df4ae`](https://github.com/firebase/firebase-js-sdk/commit/b5df4ae71c1b5b54d9237e7929d0f793189b82c9)]:
+  - @firebase/auth@1.10.6
+
 ## 0.5.25
 
 ### Patch Changes
diff --git a/packages/auth-compat/package.json b/packages/auth-compat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firebase/auth-compat",
-  "version": "0.5.25",
+  "version": "0.5.26",
   "description": "FirebaseAuth compatibility package that uses API style compatible with Firebase@8 and prior versions",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "main": "dist/index.node.cjs.js",
@@ -49,7 +49,7 @@
     "@firebase/app-compat": "0.x"
   },
   "dependencies": {
-    "@firebase/auth": "1.10.5",
+    "@firebase/auth": "1.10.6",
     "@firebase/auth-types": "0.13.0",
     "@firebase/component": "0.6.17",
     "@firebase/util": "1.12.0",
diff --git a/packages/auth/CHANGELOG.md b/packages/auth/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @firebase/auth
 
+## 1.10.6
+
+### Patch Changes
+
+- [`35ad526`](https://github.com/firebase/firebase-js-sdk/commit/35ad5266304e14425988fcf5ad06d028b37588ac) [#9053](https://github.com/firebase/firebase-js-sdk/pull/9053) - Revert "Fixed scroll behavior (#9043)"
+
+- [`b5df4ae`](https://github.com/firebase/firebase-js-sdk/commit/b5df4ae71c1b5b54d9237e7929d0f793189b82c9) [#9055](https://github.com/firebase/firebase-js-sdk/pull/9055) - Updated to only show banner when calling connect\*Emulator
+
 ## 1.10.5
 
 ### Patch Changes
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firebase/auth",
-  "version": "1.10.5",
+  "version": "1.10.6",
   "description": "The Firebase Authenticaton component of the Firebase JS SDK.",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "main": "dist/node/index.js",
diff --git a/packages/auth/src/core/auth/emulator.ts b/packages/auth/src/core/auth/emulator.ts
@@ -18,7 +18,12 @@ import { Auth } from '../../model/public_types';
 import { AuthErrorCode } from '../errors';
 import { _assert } from '../util/assert';
 import { _castAuth } from './auth_impl';
-import { deepEqual, isCloudWorkstation, pingServer } from '@firebase/util';
+import {
+  deepEqual,
+  isCloudWorkstation,
+  pingServer,
+  updateEmulatorBanner
+} from '@firebase/util';
 
 /**
  * Changes the {@link Auth} instance to communicate with the Firebase Auth Emulator, instead of production
@@ -97,13 +102,12 @@ export function connectAuthEmulator(
   authInternal.emulatorConfig = emulatorConfig;
   authInternal.settings.appVerificationDisabledForTesting = true;
 
-  if (!disableWarnings) {
-    emitEmulatorWarning();
-  }
-
   // Workaround to get cookies in Firebase Studio
   if (isCloudWorkstation(host)) {
     void pingServer(`${protocol}//${host}${portStr}`);
+    updateEmulatorBanner('Auth', true);
+  } else if (!disableWarnings) {
+    emitEmulatorWarning();
   }
 }
 
diff --git a/packages/data-connect/CHANGELOG.md b/packages/data-connect/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## Unreleased
 
+## 0.3.9
+
+### Patch Changes
+
+- [`b5df4ae`](https://github.com/firebase/firebase-js-sdk/commit/b5df4ae71c1b5b54d9237e7929d0f793189b82c9) [#9055](https://github.com/firebase/firebase-js-sdk/pull/9055) - Updated to only show banner when calling connect\*Emulator
+
 ## 0.3.8
 
 ### Patch Changes
diff --git a/packages/data-connect/package.json b/packages/data-connect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firebase/data-connect",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "description": "",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "main": "dist/index.node.cjs.js",
diff --git a/packages/data-connect/src/api/DataConnect.ts b/packages/data-connect/src/api/DataConnect.ts
@@ -24,7 +24,11 @@ import {
 import { AppCheckInternalComponentName } from '@firebase/app-check-interop-types';
 import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
 import { Provider } from '@firebase/component';
-import { isCloudWorkstation, pingServer } from '@firebase/util';
+import {
+  isCloudWorkstation,
+  pingServer,
+  updateEmulatorBanner
+} from '@firebase/util';
 
 import { AppCheckTokenProvider } from '../core/AppCheckTokenProvider';
 import { Code, DataConnectError } from '../core/error';
@@ -241,6 +245,7 @@ export function connectDataConnectEmulator(
   // Workaround to get cookies in Firebase Studio
   if (isCloudWorkstation(host)) {
     void pingServer(`https://${host}${port ? `:${port}` : ''}`);
+    updateEmulatorBanner('Data Connect', true);
   }
   dc.enableEmulator({ host, port, sslEnabled });
 }
diff --git a/packages/database-compat/CHANGELOG.md b/packages/database-compat/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @firebase/database-compat
 
+## 2.0.10
+
+### Patch Changes
+
+- Updated dependencies [[`35ad526`](https://github.com/firebase/firebase-js-sdk/commit/35ad5266304e14425988fcf5ad06d028b37588ac), [`b5df4ae`](https://github.com/firebase/firebase-js-sdk/commit/b5df4ae71c1b5b54d9237e7929d0f793189b82c9)]:
+  - @firebase/database@1.0.19
+
 ## 2.0.9
 
 ### Patch Changes
diff --git a/packages/database-compat/package.json b/packages/database-compat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firebase/database-compat",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "description": "The Realtime Database component of the Firebase JS SDK.",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "main": "dist/index.js",
@@ -49,7 +49,7 @@
     "add-compat-overloads": "ts-node-script ../../scripts/build/create-overloads.ts -i ../database/dist/public.d.ts -o dist/database-compat/src/index.d.ts -a -r Database:types.FirebaseDatabase -r Query:types.Query -r DatabaseReference:types.Reference -r FirebaseApp:FirebaseAppCompat --moduleToEnhance @firebase/database"
   },
   "dependencies": {
-    "@firebase/database": "1.0.18",
+    "@firebase/database": "1.0.19",
     "@firebase/database-types": "1.0.14",
     "@firebase/logger": "0.4.4",
     "@firebase/util": "1.12.0",
diff --git a/packages/database/CHANGELOG.md b/packages/database/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Unreleased
 
+## 1.0.19
+
+### Patch Changes
+
+- [`35ad526`](https://github.com/firebase/firebase-js-sdk/commit/35ad5266304e14425988fcf5ad06d028b37588ac) [#9053](https://github.com/firebase/firebase-js-sdk/pull/9053) - Revert "Fixed scroll behavior (#9043)"
+
+- [`b5df4ae`](https://github.com/firebase/firebase-js-sdk/commit/b5df4ae71c1b5b54d9237e7929d0f793189b82c9) [#9055](https://github.com/firebase/firebase-js-sdk/pull/9055) - Updated to only show banner when calling connect\*Emulator
+
 ## 1.0.18
 
 ### Patch Changes
diff --git a/packages/database/package.json b/packages/database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firebase/database",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "description": "",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "main": "dist/index.node.cjs.js",
diff --git a/packages/database/src/api/Database.ts b/packages/database/src/api/Database.ts
@@ -31,7 +31,8 @@ import {
   EmulatorMockTokenOptions,
   getDefaultEmulatorHostnameAndPort,
   isCloudWorkstation,
-  pingServer
+  pingServer,
+  updateEmulatorBanner
 } from '@firebase/util';
 
 import { AppCheckTokenProvider } from '../core/AppCheckTokenProvider';
@@ -393,6 +394,7 @@ export function connectDatabaseEmulator(
   // Workaround to get cookies in Firebase Studio
   if (isCloudWorkstation(host)) {
     void pingServer(host);
+    updateEmulatorBanner('Database', true);
   }
 
   // Modify the repo to apply emulator settings
diff --git a/packages/firebase/CHANGELOG.md b/packages/firebase/CHANGELOG.md
@@ -1,5 +1,22 @@
 # firebase
 
+## 11.8.1
+
+### Patch Changes
+
+- Updated dependencies [[`35ad526`](https://github.com/firebase/firebase-js-sdk/commit/35ad5266304e14425988fcf5ad06d028b37588ac), [`b5df4ae`](https://github.com/firebase/firebase-js-sdk/commit/b5df4ae71c1b5b54d9237e7929d0f793189b82c9)]:
+  - @firebase/auth@1.10.6
+  - @firebase/database@1.0.19
+  - @firebase/firestore@4.7.16
+  - @firebase/functions@0.12.8
+  - @firebase/storage@0.13.12
+  - @firebase/data-connect@0.3.9
+  - @firebase/auth-compat@0.5.26
+  - @firebase/database-compat@2.0.10
+  - @firebase/firestore-compat@0.3.51
+  - @firebase/functions-compat@0.3.25
+  - @firebase/storage-compat@0.3.22
+
 ## 11.8.0
 
 ### Minor Changes
diff --git a/packages/firebase/package.json b/packages/firebase/package.json
@@ -1,6 +1,6 @@
 {
   "name": "firebase",
-  "version": "11.8.0",
+  "version": "11.8.1",
   "description": "Firebase JavaScript library for web and Node.js",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "license": "Apache-2.0",
@@ -415,21 +415,21 @@
     "@firebase/app": "0.13.0",
     "@firebase/app-compat": "0.4.0",
     "@firebase/app-types": "0.9.3",
-    "@firebase/auth": "1.10.5",
-    "@firebase/auth-compat": "0.5.25",
-    "@firebase/data-connect": "0.3.8",
-    "@firebase/database": "1.0.18",
-    "@firebase/database-compat": "2.0.9",
-    "@firebase/firestore": "4.7.15",
-    "@firebase/firestore-compat": "0.3.50",
-    "@firebase/functions": "0.12.7",
-    "@firebase/functions-compat": "0.3.24",
+    "@firebase/auth": "1.10.6",
+    "@firebase/auth-compat": "0.5.26",
+    "@firebase/data-connect": "0.3.9",
+    "@firebase/database": "1.0.19",
+    "@firebase/database-compat": "2.0.10",
+    "@firebase/firestore": "4.7.16",
+    "@firebase/firestore-compat": "0.3.51",
+    "@firebase/functions": "0.12.8",
+    "@firebase/functions-compat": "0.3.25",
     "@firebase/installations": "0.6.17",
     "@firebase/installations-compat": "0.2.17",
     "@firebase/messaging": "0.12.21",
     "@firebase/messaging-compat": "0.2.21",
-    "@firebase/storage": "0.13.11",
-    "@firebase/storage-compat": "0.3.21",
+    "@firebase/storage": "0.13.12",
+    "@firebase/storage-compat": "0.3.22",
     "@firebase/performance": "0.7.6",
     "@firebase/performance-compat": "0.2.19",
     "@firebase/remote-config": "0.6.4",
diff --git a/packages/firestore-compat/CHANGELOG.md b/packages/firestore-compat/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @firebase/firestore-compat
 
+## 0.3.51
+
+### Patch Changes
+
+- Updated dependencies [[`35ad526`](https://github.com/firebase/firebase-js-sdk/commit/35ad5266304e14425988fcf5ad06d028b37588ac), [`b5df4ae`](https://github.com/firebase/firebase-js-sdk/commit/b5df4ae71c1b5b54d9237e7929d0f793189b82c9)]:
+  - @firebase/firestore@4.7.16
+
 ## 0.3.50
 
 ### Patch Changes
diff --git a/packages/firestore-compat/package.json b/packages/firestore-compat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firebase/firestore-compat",
-  "version": "0.3.50",
+  "version": "0.3.51",
   "description": "The Cloud Firestore component of the Firebase JS SDK.",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "main": "dist/index.node.cjs.js",
@@ -47,7 +47,7 @@
   },
   "dependencies": {
     "@firebase/component": "0.6.17",
-    "@firebase/firestore": "4.7.15",
+    "@firebase/firestore": "4.7.16",
     "@firebase/util": "1.12.0",
     "@firebase/firestore-types": "3.0.3",
     "tslib": "^2.1.0"
diff --git a/packages/firestore/CHANGELOG.md b/packages/firestore/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @firebase/firestore
 
+## 4.7.16
+
+### Patch Changes
+
+- [`35ad526`](https://github.com/firebase/firebase-js-sdk/commit/35ad5266304e14425988fcf5ad06d028b37588ac) [#9053](https://github.com/firebase/firebase-js-sdk/pull/9053) - Revert "Fixed scroll behavior (#9043)"
+
+- [`b5df4ae`](https://github.com/firebase/firebase-js-sdk/commit/b5df4ae71c1b5b54d9237e7929d0f793189b82c9) [#9055](https://github.com/firebase/firebase-js-sdk/pull/9055) - Updated to only show banner when calling connect\*Emulator
+
 ## 4.7.15
 
 ### Patch Changes
diff --git a/packages/firestore/package.json b/packages/firestore/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firebase/firestore",
-  "version": "4.7.15",
+  "version": "4.7.16",
   "engines": {
     "node": ">=18.0.0"
   },
@@ -114,7 +114,7 @@
   "devDependencies": {
     "@firebase/app": "0.13.0",
     "@firebase/app-compat": "0.4.0",
-    "@firebase/auth": "1.10.5",
+    "@firebase/auth": "1.10.6",
     "@rollup/plugin-alias": "5.1.1",
     "@rollup/plugin-json": "6.1.0",
     "@types/eslint": "7.29.0",
diff --git a/packages/firestore/src/lite-api/database.ts b/packages/firestore/src/lite-api/database.ts
@@ -28,7 +28,8 @@ import {
   EmulatorMockTokenOptions,
   getDefaultEmulatorHostnameAndPort,
   isCloudWorkstation,
-  pingServer
+  pingServer,
+  updateEmulatorBanner
 } from '@firebase/util';
 
 import {
@@ -336,6 +337,7 @@ export function connectFirestoreEmulator(
   const newHostSetting = `${host}:${port}`;
   if (useSsl) {
     void pingServer(`https://${newHostSetting}`);
+    updateEmulatorBanner('Firestore', true);
   }
   if (settings.host !== DEFAULT_HOST && settings.host !== newHostSetting) {
     logWarn(
diff --git a/packages/firestore/src/platform/browser/webchannel_connection.ts b/packages/firestore/src/platform/browser/webchannel_connection.ts
diff --git a/packages/functions-compat/CHANGELOG.md b/packages/functions-compat/CHANGELOG.md
diff --git a/packages/functions-compat/package.json b/packages/functions-compat/package.json
diff --git a/packages/functions/CHANGELOG.md b/packages/functions/CHANGELOG.md
diff --git a/packages/functions/package.json b/packages/functions/package.json
diff --git a/packages/functions/src/service.ts b/packages/functions/src/service.ts
diff --git a/packages/storage-compat/CHANGELOG.md b/packages/storage-compat/CHANGELOG.md
diff --git a/packages/storage-compat/package.json b/packages/storage-compat/package.json
diff --git a/packages/storage/CHANGELOG.md b/packages/storage/CHANGELOG.md
diff --git a/packages/storage/package.json b/packages/storage/package.json
diff --git a/packages/storage/src/service.ts b/packages/storage/src/service.ts

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@firebase/firestore": patch
 +---
++
 +Clean up leaked WebChannel instances when the Firestore instance is terminated.
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@firebase/auth",`
`3`		`- "version": "1.10.5",`
	`3`	`+ "version": "1.10.6",`
`4`	`4`	`"description": "The Firebase Authenticaton component of the Firebase JS SDK.",`
`5`	`5`	`"author": "Firebase <[email protected]> (https://firebase.google.com/)",`
`6`	`6`	`"main": "dist/node/index.js",`