Skip to content

Commit cc4da55

Browse files
maneeshtmaneesht
committed
Merge remote-tracking branch 'origin/main' into mtewani/add-more-integration-tests
2 parents c6be8d9 + d5e5795 commit cc4da55

File tree

37 files changed

+204
-57
lines changed

37 files changed

+204
-57
lines changed

‎.changeset/dirty-crews-cross.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎.changeset/spotty-ghosts-kneel.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@firebase/firestore": patch
3+
---
4+
5+
Clean up leaked WebChannel instances when the Firestore instance is terminated.

‎config/karma.base.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ const config = {
6868
// test results reporter to use
6969
// possible values: 'dots', 'progress'
7070
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
71-
reporters: ['mocha', 'coverage-istanbul'],
71+
reporters: ['coverage-istanbul', 'mocha'],
7272

7373
// web server port
7474
port: 8089,

‎integration/compat-interop/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"@firebase/app-compat": "0.4.0",
1313
"@firebase/analytics": "0.10.16",
1414
"@firebase/analytics-compat": "0.2.22",
15-
"@firebase/auth": "1.10.5",
16-
"@firebase/auth-compat": "0.5.25",
17-
"@firebase/functions": "0.12.7",
18-
"@firebase/functions-compat": "0.3.24",
15+
"@firebase/auth": "1.10.6",
16+
"@firebase/auth-compat": "0.5.26",
17+
"@firebase/functions": "0.12.8",
18+
"@firebase/functions-compat": "0.3.25",
1919
"@firebase/messaging": "0.12.21",
2020
"@firebase/messaging-compat": "0.2.21",
2121
"@firebase/performance": "0.7.6",

‎integration/firestore/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"dependencies": {
1717
"@firebase/app": "0.13.0",
18-
"@firebase/firestore": "4.7.15"
18+
"@firebase/firestore": "4.7.16"
1919
},
2020
"devDependencies": {
2121
"@types/mocha": "9.1.1",

‎integration/messaging/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"test:manual": "mocha --exit"
1010
},
1111
"devDependencies": {
12-
"firebase": "11.8.0",
12+
"firebase": "11.8.1",
1313
"chai": "4.5.0",
1414
"chromedriver": "119.0.1",
1515
"express": "4.21.2",

‎packages/auth-compat/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# @firebase/auth-compat
22

3+
## 0.5.26
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`35ad526`](https://github.com/firebase/firebase-js-sdk/commit/35ad5266304e14425988fcf5ad06d028b37588ac), [`b5df4ae`](https://github.com/firebase/firebase-js-sdk/commit/b5df4ae71c1b5b54d9237e7929d0f793189b82c9)]:
8+
- @firebase/auth@1.10.6
9+
310
## 0.5.25
411

512
### Patch Changes

‎packages/auth-compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/auth-compat",
3-
"version": "0.5.25",
3+
"version": "0.5.26",
44
"description": "FirebaseAuth compatibility package that uses API style compatible with Firebase@8 and prior versions",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.node.cjs.js",
@@ -49,7 +49,7 @@
4949
"@firebase/app-compat": "0.x"
5050
},
5151
"dependencies": {
52-
"@firebase/auth": "1.10.5",
52+
"@firebase/auth": "1.10.6",
5353
"@firebase/auth-types": "0.13.0",
5454
"@firebase/component": "0.6.17",
5555
"@firebase/util": "1.12.0",

‎packages/auth/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# @firebase/auth
22

3+
## 1.10.6
4+
5+
### Patch Changes
6+
7+
- [`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)"
8+
9+
- [`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
10+
311
## 1.10.5
412

513
### Patch Changes

‎packages/auth/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/auth",
3-
"version": "1.10.5",
3+
"version": "1.10.6",
44
"description": "The Firebase Authenticaton component of the Firebase JS SDK.",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/node/index.js",

‎packages/auth/src/core/auth/emulator.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ import { Auth } from '../../model/public_types';
1818
import { AuthErrorCode } from '../errors';
1919
import { _assert } from '../util/assert';
2020
import { _castAuth } from './auth_impl';
21-
import { deepEqual, isCloudWorkstation, pingServer } from '@firebase/util';
21+
import {
22+
deepEqual,
23+
isCloudWorkstation,
24+
pingServer,
25+
updateEmulatorBanner
26+
} from '@firebase/util';
2227

2328
/**
2429
* Changes the {@link Auth} instance to communicate with the Firebase Auth Emulator, instead of production
@@ -97,13 +102,12 @@ export function connectAuthEmulator(
97102
authInternal.emulatorConfig = emulatorConfig;
98103
authInternal.settings.appVerificationDisabledForTesting = true;
99104

100-
if (!disableWarnings) {
101-
emitEmulatorWarning();
102-
}
103-
104105
// Workaround to get cookies in Firebase Studio
105106
if (isCloudWorkstation(host)) {
106107
void pingServer(`${protocol}//${host}${portStr}`);
108+
updateEmulatorBanner('Auth', true);
109+
} else if (!disableWarnings) {
110+
emitEmulatorWarning();
107111
}
108112
}
109113

‎packages/data-connect/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
## Unreleased
22

3+
## 0.3.9
4+
5+
### Patch Changes
6+
7+
- [`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
8+
39
## 0.3.8
410

511
### Patch Changes

‎packages/data-connect/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/data-connect",
3-
"version": "0.3.8",
3+
"version": "0.3.9",
44
"description": "",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.node.cjs.js",

‎packages/data-connect/src/api/DataConnect.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ import {
2424
import { AppCheckInternalComponentName } from '@firebase/app-check-interop-types';
2525
import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
2626
import { Provider } from '@firebase/component';
27-
import { isCloudWorkstation, pingServer } from '@firebase/util';
27+
import {
28+
isCloudWorkstation,
29+
pingServer,
30+
updateEmulatorBanner
31+
} from '@firebase/util';
2832

2933
import { AppCheckTokenProvider } from '../core/AppCheckTokenProvider';
3034
import { Code, DataConnectError } from '../core/error';
@@ -241,6 +245,7 @@ export function connectDataConnectEmulator(
241245
// Workaround to get cookies in Firebase Studio
242246
if (isCloudWorkstation(host)) {
243247
void pingServer(`https://${host}${port ? `:${port}` : ''}`);
248+
updateEmulatorBanner('Data Connect', true);
244249
}
245250
dc.enableEmulator({ host, port, sslEnabled });
246251
}

‎packages/database-compat/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# @firebase/database-compat
22

3+
## 2.0.10
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`35ad526`](https://github.com/firebase/firebase-js-sdk/commit/35ad5266304e14425988fcf5ad06d028b37588ac), [`b5df4ae`](https://github.com/firebase/firebase-js-sdk/commit/b5df4ae71c1b5b54d9237e7929d0f793189b82c9)]:
8+
- @firebase/database@1.0.19
9+
310
## 2.0.9
411

512
### Patch Changes

‎packages/database-compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/database-compat",
3-
"version": "2.0.9",
3+
"version": "2.0.10",
44
"description": "The Realtime Database component of the Firebase JS SDK.",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.js",
@@ -49,7 +49,7 @@
4949
"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"
5050
},
5151
"dependencies": {
52-
"@firebase/database": "1.0.18",
52+
"@firebase/database": "1.0.19",
5353
"@firebase/database-types": "1.0.14",
5454
"@firebase/logger": "0.4.4",
5555
"@firebase/util": "1.12.0",

‎packages/database/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Unreleased
22

3+
## 1.0.19
4+
5+
### Patch Changes
6+
7+
- [`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)"
8+
9+
- [`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
10+
311
## 1.0.18
412

513
### Patch Changes

‎packages/database/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/database",
3-
"version": "1.0.18",
3+
"version": "1.0.19",
44
"description": "",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.node.cjs.js",

‎packages/database/src/api/Database.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ import {
3131
EmulatorMockTokenOptions,
3232
getDefaultEmulatorHostnameAndPort,
3333
isCloudWorkstation,
34-
pingServer
34+
pingServer,
35+
updateEmulatorBanner
3536
} from '@firebase/util';
3637

3738
import { AppCheckTokenProvider } from '../core/AppCheckTokenProvider';
@@ -393,6 +394,7 @@ export function connectDatabaseEmulator(
393394
// Workaround to get cookies in Firebase Studio
394395
if (isCloudWorkstation(host)) {
395396
void pingServer(host);
397+
updateEmulatorBanner('Database', true);
396398
}
397399

398400
// Modify the repo to apply emulator settings

‎packages/firebase/CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
# firebase
22

3+
## 11.8.1
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`35ad526`](https://github.com/firebase/firebase-js-sdk/commit/35ad5266304e14425988fcf5ad06d028b37588ac), [`b5df4ae`](https://github.com/firebase/firebase-js-sdk/commit/b5df4ae71c1b5b54d9237e7929d0f793189b82c9)]:
8+
- @firebase/auth@1.10.6
9+
- @firebase/database@1.0.19
10+
- @firebase/firestore@4.7.16
11+
- @firebase/functions@0.12.8
12+
- @firebase/storage@0.13.12
13+
- @firebase/data-connect@0.3.9
14+
- @firebase/auth-compat@0.5.26
15+
- @firebase/database-compat@2.0.10
16+
- @firebase/firestore-compat@0.3.51
17+
- @firebase/functions-compat@0.3.25
18+
- @firebase/storage-compat@0.3.22
19+
320
## 11.8.0
421

522
### Minor Changes

‎packages/firebase/package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "firebase",
3-
"version": "11.8.0",
3+
"version": "11.8.1",
44
"description": "Firebase JavaScript library for web and Node.js",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",
@@ -415,21 +415,21 @@
415415
"@firebase/app": "0.13.0",
416416
"@firebase/app-compat": "0.4.0",
417417
"@firebase/app-types": "0.9.3",
418-
"@firebase/auth": "1.10.5",
419-
"@firebase/auth-compat": "0.5.25",
420-
"@firebase/data-connect": "0.3.8",
421-
"@firebase/database": "1.0.18",
422-
"@firebase/database-compat": "2.0.9",
423-
"@firebase/firestore": "4.7.15",
424-
"@firebase/firestore-compat": "0.3.50",
425-
"@firebase/functions": "0.12.7",
426-
"@firebase/functions-compat": "0.3.24",
418+
"@firebase/auth": "1.10.6",
419+
"@firebase/auth-compat": "0.5.26",
420+
"@firebase/data-connect": "0.3.9",
421+
"@firebase/database": "1.0.19",
422+
"@firebase/database-compat": "2.0.10",
423+
"@firebase/firestore": "4.7.16",
424+
"@firebase/firestore-compat": "0.3.51",
425+
"@firebase/functions": "0.12.8",
426+
"@firebase/functions-compat": "0.3.25",
427427
"@firebase/installations": "0.6.17",
428428
"@firebase/installations-compat": "0.2.17",
429429
"@firebase/messaging": "0.12.21",
430430
"@firebase/messaging-compat": "0.2.21",
431-
"@firebase/storage": "0.13.11",
432-
"@firebase/storage-compat": "0.3.21",
431+
"@firebase/storage": "0.13.12",
432+
"@firebase/storage-compat": "0.3.22",
433433
"@firebase/performance": "0.7.6",
434434
"@firebase/performance-compat": "0.2.19",
435435
"@firebase/remote-config": "0.6.4",

‎packages/firestore-compat/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# @firebase/firestore-compat
22

3+
## 0.3.51
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`35ad526`](https://github.com/firebase/firebase-js-sdk/commit/35ad5266304e14425988fcf5ad06d028b37588ac), [`b5df4ae`](https://github.com/firebase/firebase-js-sdk/commit/b5df4ae71c1b5b54d9237e7929d0f793189b82c9)]:
8+
- @firebase/firestore@4.7.16
9+
310
## 0.3.50
411

512
### Patch Changes

‎packages/firestore-compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/firestore-compat",
3-
"version": "0.3.50",
3+
"version": "0.3.51",
44
"description": "The Cloud Firestore component of the Firebase JS SDK.",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.node.cjs.js",
@@ -47,7 +47,7 @@
4747
},
4848
"dependencies": {
4949
"@firebase/component": "0.6.17",
50-
"@firebase/firestore": "4.7.15",
50+
"@firebase/firestore": "4.7.16",
5151
"@firebase/util": "1.12.0",
5252
"@firebase/firestore-types": "3.0.3",
5353
"tslib": "^2.1.0"

‎packages/firestore/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# @firebase/firestore
22

3+
## 4.7.16
4+
5+
### Patch Changes
6+
7+
- [`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)"
8+
9+
- [`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
10+
311
## 4.7.15
412

513
### Patch Changes

‎packages/firestore/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/firestore",
3-
"version": "4.7.15",
3+
"version": "4.7.16",
44
"engines": {
55
"node": ">=18.0.0"
66
},
@@ -114,7 +114,7 @@
114114
"devDependencies": {
115115
"@firebase/app": "0.13.0",
116116
"@firebase/app-compat": "0.4.0",
117-
"@firebase/auth": "1.10.5",
117+
"@firebase/auth": "1.10.6",
118118
"@rollup/plugin-alias": "5.1.1",
119119
"@rollup/plugin-json": "6.1.0",
120120
"@types/eslint": "7.29.0",

‎packages/firestore/src/lite-api/database.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ import {
2828
EmulatorMockTokenOptions,
2929
getDefaultEmulatorHostnameAndPort,
3030
isCloudWorkstation,
31-
pingServer
31+
pingServer,
32+
updateEmulatorBanner
3233
} from '@firebase/util';
3334

3435
import {
@@ -336,6 +337,7 @@ export function connectFirestoreEmulator(
336337
const newHostSetting = `${host}:${port}`;
337338
if (useSsl) {
338339
void pingServer(`https://${newHostSetting}`);
340+
updateEmulatorBanner('Firestore', true);
339341
}
340342
if (settings.host !== DEFAULT_HOST && settings.host !== newHostSetting) {
341343
logWarn(

0 commit comments

Comments
 (0)