Skip to content

Commit ee3e2a1

Browse files
dlarocquedlarocque
committed
Merge branch 'main' into dl/genai
2 parents 1d3b922 + ea1f913 commit ee3e2a1

File tree

67 files changed

+364
-109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+364
-109
lines changed

‎.changeset/cyan-frogs-relate.md

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

‎.changeset/gentle-rocks-repeat.md

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

‎.changeset/hungry-snails-drive.md

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

‎.changeset/nice-plants-thank.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
"@firebase/database-compat": patch
3+
"@firebase/database": patch
4+
"@firebase/firestore": patch
5+
"@firebase/functions": patch
6+
"@firebase/storage": patch
7+
"@firebase/util": patch
8+
---
9+
10+
Auto Enable SSL for Firebase Studio

‎.changeset/odd-wolves-sit.md

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

‎.changeset/slow-students-fry.md

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

‎common/api-review/util.api.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,9 @@ export function isBrowserExtension(): boolean;
269269
// @public
270270
export function isCloudflareWorker(): boolean;
271271

272+
// @public
273+
export function isCloudWorkstation(host: string): boolean;
274+
272275
// Warning: (ae-missing-release-tag) "isElectron" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
273276
//
274277
// @public

‎integration/compat-interop/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
"test:debug": "karma start --browsers Chrome --auto-watch"
99
},
1010
"dependencies": {
11-
"@firebase/app": "0.11.4",
12-
"@firebase/app-compat": "0.2.53",
11+
"@firebase/app": "0.11.5",
12+
"@firebase/app-compat": "0.2.54",
1313
"@firebase/analytics": "0.10.12",
1414
"@firebase/analytics-compat": "0.2.18",
15-
"@firebase/auth": "1.10.0",
16-
"@firebase/auth-compat": "0.5.20",
15+
"@firebase/auth": "1.10.1",
16+
"@firebase/auth-compat": "0.5.21",
1717
"@firebase/functions": "0.12.3",
1818
"@firebase/functions-compat": "0.3.20",
1919
"@firebase/messaging": "0.12.17",

‎integration/firestore/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"test:memory:debug": "yarn build:memory; karma start --auto-watch --browsers Chrome"
1515
},
1616
"dependencies": {
17-
"@firebase/app": "0.11.4",
18-
"@firebase/firestore": "4.7.10"
17+
"@firebase/app": "0.11.5",
18+
"@firebase/firestore": "4.7.11"
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.6.0",
12+
"firebase": "11.6.1",
1313
"chai": "4.5.0",
1414
"chromedriver": "119.0.1",
1515
"express": "4.21.2",

‎packages/analytics-compat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@firebase/app-compat": "0.x"
2323
},
2424
"devDependencies": {
25-
"@firebase/app-compat": "0.2.53",
25+
"@firebase/app-compat": "0.2.54",
2626
"rollup": "2.79.2",
2727
"@rollup/plugin-json": "6.1.0",
2828
"rollup-plugin-typescript2": "0.36.0",

‎packages/analytics/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
},
4848
"license": "Apache-2.0",
4949
"devDependencies": {
50-
"@firebase/app": "0.11.4",
50+
"@firebase/app": "0.11.5",
5151
"rollup": "2.79.2",
5252
"@rollup/plugin-commonjs": "21.1.0",
5353
"@rollup/plugin-json": "6.1.0",

‎packages/app-check-compat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
},
4444
"license": "Apache-2.0",
4545
"devDependencies": {
46-
"@firebase/app-compat": "0.2.53",
46+
"@firebase/app-compat": "0.2.54",
4747
"rollup": "2.79.2",
4848
"@rollup/plugin-commonjs": "21.1.0",
4949
"@rollup/plugin-json": "6.1.0",

‎packages/app-check/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
},
4545
"license": "Apache-2.0",
4646
"devDependencies": {
47-
"@firebase/app": "0.11.4",
47+
"@firebase/app": "0.11.5",
4848
"rollup": "2.79.2",
4949
"@rollup/plugin-commonjs": "21.1.0",
5050
"@rollup/plugin-json": "6.1.0",

‎packages/app-compat/CHANGELOG.md

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

3+
## 0.2.54
4+
5+
### Patch Changes
6+
7+
- Updated dependencies []:
8+
- @firebase/app@0.11.5
9+
310
## 0.2.53
411

512
### Patch Changes

‎packages/app-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/app-compat",
3-
"version": "0.2.53",
3+
"version": "0.2.54",
44
"description": "The primary entrypoint to the Firebase JS SDK",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",
@@ -37,7 +37,7 @@
3737
},
3838
"license": "Apache-2.0",
3939
"dependencies": {
40-
"@firebase/app": "0.11.4",
40+
"@firebase/app": "0.11.5",
4141
"@firebase/util": "1.11.0",
4242
"@firebase/logger": "0.4.4",
4343
"@firebase/component": "0.6.13",

‎packages/app/CHANGELOG.md

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

3+
## 0.11.5
4+
5+
### Patch Changes
6+
7+
- Update SDK_VERSION.
8+
39
## 0.11.4
410

511
### Patch Changes

‎packages/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/app",
3-
"version": "0.11.4",
3+
"version": "0.11.5",
44
"description": "The primary entrypoint to the Firebase JS SDK",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",

‎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.21
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`1363ecc`](https://github.com/firebase/firebase-js-sdk/commit/1363ecc533de0ba5bfcae206a831acc33f9020a6)]:
8+
- @firebase/auth@1.10.1
9+
310
## 0.5.20
411

512
### Patch Changes

‎packages/auth-compat/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/auth-compat",
3-
"version": "0.5.20",
3+
"version": "0.5.21",
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,15 +49,15 @@
4949
"@firebase/app-compat": "0.x"
5050
},
5151
"dependencies": {
52-
"@firebase/auth": "1.10.0",
52+
"@firebase/auth": "1.10.1",
5353
"@firebase/auth-types": "0.13.0",
5454
"@firebase/component": "0.6.13",
5555
"@firebase/util": "1.11.0",
5656
"tslib": "^2.1.0"
5757
},
5858
"license": "Apache-2.0",
5959
"devDependencies": {
60-
"@firebase/app-compat": "0.2.53",
60+
"@firebase/app-compat": "0.2.54",
6161
"@rollup/plugin-json": "6.1.0",
6262
"rollup": "2.79.2",
6363
"rollup-plugin-replace": "2.2.0",

‎packages/auth/CHANGELOG.md

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

3+
## 1.10.1
4+
5+
### Patch Changes
6+
7+
- [`1363ecc`](https://github.com/firebase/firebase-js-sdk/commit/1363ecc533de0ba5bfcae206a831acc33f9020a6) [#8912](https://github.com/firebase/firebase-js-sdk/pull/8912) - Fixed: `ActionCodeURL` not populating `languageCode` from the url.
8+
39
## 1.10.0
410

511
### Minor Changes

‎packages/auth/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",
3-
"version": "1.10.0",
3+
"version": "1.10.1",
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",
@@ -131,7 +131,7 @@
131131
},
132132
"license": "Apache-2.0",
133133
"devDependencies": {
134-
"@firebase/app": "0.11.4",
134+
"@firebase/app": "0.11.5",
135135
"@rollup/plugin-json": "6.1.0",
136136
"@rollup/plugin-strip": "2.1.0",
137137
"@types/express": "4.17.21",

‎packages/auth/src/core/action_code_url.test.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ describe('core/action_code_url', () => {
3030
'oobCode=CODE&mode=signIn&apiKey=API_KEY&' +
3131
'continueUrl=' +
3232
encodeURIComponent(continueUrl) +
33-
'&languageCode=en&tenantId=TENANT_ID&state=bla';
33+
'&lang=en&tenantId=TENANT_ID&state=bla';
3434
const actionCodeUrl = ActionCodeURL.parseLink(actionLink);
3535
expect(actionCodeUrl!.operation).to.eq(ActionCodeOperation.EMAIL_SIGNIN);
3636
expect(actionCodeUrl!.code).to.eq('CODE');
@@ -46,7 +46,7 @@ describe('core/action_code_url', () => {
4646
const actionLink =
4747
'https://www.example.com/finishSignIn?' +
4848
'oobCode=CODE&mode=signIn&apiKey=API_KEY&' +
49-
'languageCode=en';
49+
'lang=en';
5050
const actionCodeUrl = ActionCodeURL.parseLink(actionLink);
5151
expect(actionCodeUrl!.operation).to.eq(
5252
ActionCodeOperation.EMAIL_SIGNIN
@@ -57,7 +57,7 @@ describe('core/action_code_url', () => {
5757
const actionLink =
5858
'https://www.example.com/finishSignIn?' +
5959
'oobCode=CODE&mode=verifyAndChangeEmail&apiKey=API_KEY&' +
60-
'languageCode=en';
60+
'lang=en';
6161
const actionCodeUrl = ActionCodeURL.parseLink(actionLink);
6262
expect(actionCodeUrl!.operation).to.eq(
6363
ActionCodeOperation.VERIFY_AND_CHANGE_EMAIL
@@ -68,7 +68,7 @@ describe('core/action_code_url', () => {
6868
const actionLink =
6969
'https://www.example.com/finishSignIn?' +
7070
'oobCode=CODE&mode=verifyEmail&apiKey=API_KEY&' +
71-
'languageCode=en';
71+
'lang=en';
7272
const actionCodeUrl = ActionCodeURL.parseLink(actionLink);
7373
expect(actionCodeUrl!.operation).to.eq(
7474
ActionCodeOperation.VERIFY_EMAIL
@@ -79,7 +79,7 @@ describe('core/action_code_url', () => {
7979
const actionLink =
8080
'https://www.example.com/finishSignIn?' +
8181
'oobCode=CODE&mode=recoverEmail&apiKey=API_KEY&' +
82-
'languageCode=en';
82+
'lang=en';
8383
const actionCodeUrl = ActionCodeURL.parseLink(actionLink);
8484
expect(actionCodeUrl!.operation).to.eq(
8585
ActionCodeOperation.RECOVER_EMAIL
@@ -90,7 +90,7 @@ describe('core/action_code_url', () => {
9090
const actionLink =
9191
'https://www.example.com/finishSignIn?' +
9292
'oobCode=CODE&mode=resetPassword&apiKey=API_KEY&' +
93-
'languageCode=en';
93+
'lang=en';
9494
const actionCodeUrl = ActionCodeURL.parseLink(actionLink);
9595
expect(actionCodeUrl!.operation).to.eq(
9696
ActionCodeOperation.PASSWORD_RESET
@@ -101,7 +101,7 @@ describe('core/action_code_url', () => {
101101
const actionLink =
102102
'https://www.example.com/finishSignIn?' +
103103
'oobCode=CODE&mode=revertSecondFactorAddition&apiKey=API_KEY&' +
104-
'languageCode=en';
104+
'lang=en';
105105
const actionCodeUrl = ActionCodeURL.parseLink(actionLink);
106106
expect(actionCodeUrl!.operation).to.eq(
107107
ActionCodeOperation.REVERT_SECOND_FACTOR_ADDITION

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const enum QueryField {
2929
API_KEY = 'apiKey',
3030
CODE = 'oobCode',
3131
CONTINUE_URL = 'continueUrl',
32-
LANGUAGE_CODE = 'languageCode',
32+
LANGUAGE_CODE = 'lang',
3333
MODE = 'mode',
3434
TENANT_ID = 'tenantId'
3535
}

‎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.4
4+
5+
### Patch Changes
6+
7+
- [`1df3d26`](https://github.com/firebase/firebase-js-sdk/commit/1df3d26fbfb4db24b74d5d779825017e9ec40eaa) [#8898](https://github.com/firebase/firebase-js-sdk/pull/8898) - Fix DataConnectOperationError.
8+
39
## 0.3.3
410

511
### Patch Changes

‎packages/data-connect/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/data-connect",
3-
"version": "0.3.3",
3+
"version": "0.3.4",
44
"description": "",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.node.cjs.js",
@@ -55,7 +55,7 @@
5555
"tslib": "^2.1.0"
5656
},
5757
"devDependencies": {
58-
"@firebase/app": "0.11.4",
58+
"@firebase/app": "0.11.5",
5959
"rollup": "2.79.2",
6060
"rollup-plugin-typescript2": "0.36.0",
6161
"typescript": "5.5.4"

‎packages/database-compat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"tslib": "^2.1.0"
5858
},
5959
"devDependencies": {
60-
"@firebase/app-compat": "0.2.53",
60+
"@firebase/app-compat": "0.2.54",
6161
"typescript": "5.5.4"
6262
},
6363
"repository": {

‎packages/database-compat/test/database.test.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,17 @@ describe('Database Tests', () => {
292292
expect((db as any)._delegate._repo.repoInfo_.isUsingEmulator).to.be.false;
293293
});
294294

295+
it('uses ssl when useEmulator is called with ssl specified', () => {
296+
const db = firebase.database();
297+
const cloudWorkstation = 'abc.cloudworkstations.dev';
298+
db.useEmulator(cloudWorkstation, 80);
299+
expect((db as any)._delegate._repo.repoInfo_.isUsingEmulator).to.be.true;
300+
expect((db as any)._delegate._repo.repoInfo_.host).to.equal(
301+
`${cloudWorkstation}:80`
302+
);
303+
expect((db as any)._delegate._repo.repoInfo_.secure).to.be.true;
304+
});
305+
295306
it('cannot call useEmulator after use', () => {
296307
const db = (firebase as any).database();
297308

‎packages/database/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"tslib": "^2.1.0"
5858
},
5959
"devDependencies": {
60-
"@firebase/app": "0.11.4",
60+
"@firebase/app": "0.11.5",
6161
"rollup": "2.79.2",
6262
"rollup-plugin-typescript2": "0.36.0",
6363
"typescript": "5.5.4"

0 commit comments

Comments
 (0)