Skip to content

Commit 62dab2b

Browse files
dlarocquedlarocque
committed
Merge branch 'main' into dl/vertex-integration
2 parents 681b4bd + 880110b commit 62dab2b

Some content is hidden

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

71 files changed

+1879
-1273
lines changed

‎.changeset/three-singers-wonder.md

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

‎e2e/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"author": "",
1818
"license": "ISC",
1919
"dependencies": {
20-
"firebase": "11.3.0"
20+
"firebase": "^11.8.0-20250512211235"
2121
},
2222
"devDependencies": {
2323
"@babel/core": "7.26.8",

‎e2e/sample-apps/modular.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ import {
5858
onValue,
5959
off
6060
} from 'firebase/database';
61-
import { getGenerativeModel, getVertexAI, VertexAI } from 'firebase/vertexai';
61+
import { getGenerativeModel, getAI, VertexAIBackend } from 'firebase/ai';
6262
import { getDataConnect, DataConnect } from 'firebase/data-connect';
6363

6464
/**
@@ -307,15 +307,15 @@ function callPerformance(app) {
307307
}
308308

309309
/**
310-
* VertexAI smoke test.
310+
* AI smoke test.
311311
* Just make sure some functions can be called without obvious errors.
312312
*/
313-
async function callVertexAI(app) {
314-
console.log('[VERTEXAI] start');
315-
const vertexAI = getVertexAI(app);
316-
const model = getGenerativeModel(vertexAI, { model: 'gemini-1.5-flash' });
313+
async function callAI(app) {
314+
console.log('[AI] start');
315+
const ai = getAI(app, { backend: new VertexAIBackend() });
316+
const model = getGenerativeModel(ai, { model: 'gemini-1.5-flash' });
317317
const result = await model.countTokens('abcdefg');
318-
console.log(`[VERTEXAI] counted tokens: ${result.totalTokens}`);
318+
console.log(`[AI] counted tokens: ${result.totalTokens}`);
319319
}
320320

321321
/**
@@ -350,7 +350,7 @@ async function main() {
350350
callAnalytics(app);
351351
callPerformance(app);
352352
await callFunctions(app);
353-
await callVertexAI(app);
353+
await callAI(app);
354354
callDataConnect(app);
355355
await authLogout(app);
356356
console.log('DONE');

‎e2e/tests/modular.test.ts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,12 @@ import {
8686
StorageReference,
8787
deleteObject
8888
} from 'firebase/storage';
89-
import { getGenerativeModel, getVertexAI, VertexAI } from 'firebase/vertexai';
89+
import {
90+
getGenerativeModel,
91+
getAI,
92+
AI,
93+
VertexAIBackend
94+
} from 'firebase/vertexai';
9095
import { getDataConnect, DataConnect } from 'firebase/data-connect';
9196
import { config, testAccount } from '../firebase-config';
9297
import 'jest';
@@ -307,13 +312,13 @@ describe('MODULAR', () => {
307312
});
308313
});
309314

310-
describe('VERTEXAI', () => {
311-
let vertexAI: VertexAI;
315+
describe('AI', () => {
316+
let ai: AI;
312317
it('getVertexAI()', () => {
313-
vertexAI = getVertexAI(app);
318+
ai = getAI(app, { backend: new VertexAIBackend() });
314319
});
315320
it('getGenerativeModel() and countTokens()', async () => {
316-
const model = getGenerativeModel(vertexAI, { model: 'gemini-1.5-flash' });
321+
const model = getGenerativeModel(ai, { model: 'gemini-1.5-flash' });
317322
expect(model.model).toMatch(/gemini-1.5-flash$/);
318323
const result = await model.countTokens('abcdefg');
319324
expect(result.totalTokens).toBeTruthy;

‎e2e/yarn.lock

Lines changed: 1117 additions & 1072 deletions
Large diffs are not rendered by default.

‎integration/compat-interop/package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
"test:debug": "karma start --browsers Chrome --auto-watch"
99
},
1010
"dependencies": {
11-
"@firebase/app": "0.12.1",
12-
"@firebase/app-compat": "0.3.1",
13-
"@firebase/analytics": "0.10.13",
14-
"@firebase/analytics-compat": "0.2.19",
15-
"@firebase/auth": "1.10.2",
16-
"@firebase/auth-compat": "0.5.22",
17-
"@firebase/functions": "0.12.4",
18-
"@firebase/functions-compat": "0.3.21",
19-
"@firebase/messaging": "0.12.18",
20-
"@firebase/messaging-compat": "0.2.18",
21-
"@firebase/performance": "0.7.3",
22-
"@firebase/performance-compat": "0.2.16",
23-
"@firebase/remote-config": "0.6.1",
24-
"@firebase/remote-config-compat": "0.2.14"
11+
"@firebase/app": "0.12.3",
12+
"@firebase/app-compat": "0.3.3",
13+
"@firebase/analytics": "0.10.15",
14+
"@firebase/analytics-compat": "0.2.21",
15+
"@firebase/auth": "1.10.4",
16+
"@firebase/auth-compat": "0.5.24",
17+
"@firebase/functions": "0.12.6",
18+
"@firebase/functions-compat": "0.3.23",
19+
"@firebase/messaging": "0.12.20",
20+
"@firebase/messaging-compat": "0.2.20",
21+
"@firebase/performance": "0.7.5",
22+
"@firebase/performance-compat": "0.2.18",
23+
"@firebase/remote-config": "0.6.3",
24+
"@firebase/remote-config-compat": "0.2.16"
2525
},
2626
"devDependencies": {
2727
"typescript": "5.5.4"

‎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.12.1",
18-
"@firebase/firestore": "4.7.12"
17+
"@firebase/app": "0.12.3",
18+
"@firebase/firestore": "4.7.14"
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.7.1",
12+
"firebase": "11.7.3",
1313
"chai": "4.5.0",
1414
"chromedriver": "119.0.1",
1515
"express": "4.21.2",

‎packages/ai/CHANGELOG.md

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

3+
## 1.2.4
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`9bcd1ea`](https://github.com/firebase/firebase-js-sdk/commit/9bcd1ea9b8cc5b55692765d40df000da8ddef02b)]:
8+
- @firebase/util@1.11.3
9+
- @firebase/component@0.6.16
10+
11+
## 1.2.3
12+
13+
### Patch Changes
14+
15+
- Updated dependencies [[`8593fa0`](https://github.com/firebase/firebase-js-sdk/commit/8593fa05bd884c2f1f6f3b4ae062efa48af93d24)]:
16+
- @firebase/util@1.11.2
17+
- @firebase/component@0.6.15
18+
319
## 1.2.2
420

521
### Patch Changes

‎packages/ai/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/ai",
3-
"version": "1.2.2",
3+
"version": "1.2.4",
44
"description": "The Firebase AI SDK",
55
"author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
66
"engines": {
@@ -50,14 +50,14 @@
5050
},
5151
"dependencies": {
5252
"@firebase/app-check-interop-types": "0.3.3",
53-
"@firebase/component": "0.6.14",
53+
"@firebase/component": "0.6.16",
5454
"@firebase/logger": "0.4.4",
55-
"@firebase/util": "1.11.1",
55+
"@firebase/util": "1.11.3",
5656
"tslib": "^2.1.0"
5757
},
5858
"license": "Apache-2.0",
5959
"devDependencies": {
60-
"@firebase/app": "0.12.1",
60+
"@firebase/app": "0.12.3",
6161
"@rollup/plugin-json": "6.1.0",
6262
"rollup": "2.79.2",
6363
"rollup-plugin-replace": "2.2.0",

‎packages/analytics-compat/CHANGELOG.md

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

3+
## 0.2.21
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`9bcd1ea`](https://github.com/firebase/firebase-js-sdk/commit/9bcd1ea9b8cc5b55692765d40df000da8ddef02b)]:
8+
- @firebase/util@1.11.3
9+
- @firebase/analytics@0.10.15
10+
- @firebase/component@0.6.16
11+
12+
## 0.2.20
13+
14+
### Patch Changes
15+
16+
- Updated dependencies [[`8593fa0`](https://github.com/firebase/firebase-js-sdk/commit/8593fa05bd884c2f1f6f3b4ae062efa48af93d24)]:
17+
- @firebase/util@1.11.2
18+
- @firebase/analytics@0.10.14
19+
- @firebase/component@0.6.15
20+
321
## 0.2.19
422

523
### Patch Changes

‎packages/analytics-compat/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/analytics-compat",
3-
"version": "0.2.19",
3+
"version": "0.2.21",
44
"description": "",
55
"author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",
@@ -22,7 +22,7 @@
2222
"@firebase/app-compat": "0.x"
2323
},
2424
"devDependencies": {
25-
"@firebase/app-compat": "0.3.1",
25+
"@firebase/app-compat": "0.3.3",
2626
"rollup": "2.79.2",
2727
"@rollup/plugin-json": "6.1.0",
2828
"rollup-plugin-typescript2": "0.36.0",
@@ -52,10 +52,10 @@
5252
},
5353
"typings": "dist/src/index.d.ts",
5454
"dependencies": {
55-
"@firebase/component": "0.6.14",
56-
"@firebase/analytics": "0.10.13",
55+
"@firebase/component": "0.6.16",
56+
"@firebase/analytics": "0.10.15",
5757
"@firebase/analytics-types": "0.8.3",
58-
"@firebase/util": "1.11.1",
58+
"@firebase/util": "1.11.3",
5959
"tslib": "^2.1.0"
6060
},
6161
"nyc": {

‎packages/analytics/CHANGELOG.md

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

3+
## 0.10.15
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`9bcd1ea`](https://github.com/firebase/firebase-js-sdk/commit/9bcd1ea9b8cc5b55692765d40df000da8ddef02b)]:
8+
- @firebase/util@1.11.3
9+
- @firebase/component@0.6.16
10+
- @firebase/installations@0.6.16
11+
12+
## 0.10.14
13+
14+
### Patch Changes
15+
16+
- Updated dependencies [[`8593fa0`](https://github.com/firebase/firebase-js-sdk/commit/8593fa05bd884c2f1f6f3b4ae062efa48af93d24)]:
17+
- @firebase/util@1.11.2
18+
- @firebase/component@0.6.15
19+
- @firebase/installations@0.6.15
20+
321
## 0.10.13
422

523
### Patch Changes

‎packages/analytics/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/analytics",
3-
"version": "0.10.13",
3+
"version": "0.10.15",
44
"description": "A analytics package for new firebase packages",
55
"author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",
@@ -39,15 +39,15 @@
3939
"@firebase/app": "0.x"
4040
},
4141
"dependencies": {
42-
"@firebase/installations": "0.6.14",
42+
"@firebase/installations": "0.6.16",
4343
"@firebase/logger": "0.4.4",
44-
"@firebase/util": "1.11.1",
45-
"@firebase/component": "0.6.14",
44+
"@firebase/util": "1.11.3",
45+
"@firebase/component": "0.6.16",
4646
"tslib": "^2.1.0"
4747
},
4848
"license": "Apache-2.0",
4949
"devDependencies": {
50-
"@firebase/app": "0.12.1",
50+
"@firebase/app": "0.12.3",
5151
"rollup": "2.79.2",
5252
"@rollup/plugin-commonjs": "21.1.0",
5353
"@rollup/plugin-json": "6.1.0",

‎packages/app-check-compat/CHANGELOG.md

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

3+
## 0.3.24
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`9bcd1ea`](https://github.com/firebase/firebase-js-sdk/commit/9bcd1ea9b8cc5b55692765d40df000da8ddef02b)]:
8+
- @firebase/util@1.11.3
9+
- @firebase/app-check@0.9.3
10+
- @firebase/component@0.6.16
11+
12+
## 0.3.23
13+
14+
### Patch Changes
15+
16+
- Updated dependencies [[`8593fa0`](https://github.com/firebase/firebase-js-sdk/commit/8593fa05bd884c2f1f6f3b4ae062efa48af93d24)]:
17+
- @firebase/util@1.11.2
18+
- @firebase/app-check@0.9.2
19+
- @firebase/component@0.6.15
20+
321
## 0.3.22
422

523
### Patch Changes

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/app-check-compat",
3-
"version": "0.3.22",
3+
"version": "0.3.24",
44
"description": "A compat App Check package for new firebase packages",
55
"author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",
@@ -34,16 +34,16 @@
3434
"@firebase/app-compat": "0.x"
3535
},
3636
"dependencies": {
37-
"@firebase/app-check": "0.9.1",
37+
"@firebase/app-check": "0.9.3",
3838
"@firebase/app-check-types": "0.5.3",
3939
"@firebase/logger": "0.4.4",
40-
"@firebase/util": "1.11.1",
41-
"@firebase/component": "0.6.14",
40+
"@firebase/util": "1.11.3",
41+
"@firebase/component": "0.6.16",
4242
"tslib": "^2.1.0"
4343
},
4444
"license": "Apache-2.0",
4545
"devDependencies": {
46-
"@firebase/app-compat": "0.3.1",
46+
"@firebase/app-compat": "0.3.3",
4747
"rollup": "2.79.2",
4848
"@rollup/plugin-commonjs": "21.1.0",
4949
"@rollup/plugin-json": "6.1.0",

‎packages/app-check/CHANGELOG.md

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

3+
## 0.9.3
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`9bcd1ea`](https://github.com/firebase/firebase-js-sdk/commit/9bcd1ea9b8cc5b55692765d40df000da8ddef02b)]:
8+
- @firebase/util@1.11.3
9+
- @firebase/component@0.6.16
10+
11+
## 0.9.2
12+
13+
### Patch Changes
14+
15+
- Updated dependencies [[`8593fa0`](https://github.com/firebase/firebase-js-sdk/commit/8593fa05bd884c2f1f6f3b4ae062efa48af93d24)]:
16+
- @firebase/util@1.11.2
17+
- @firebase/component@0.6.15
18+
319
## 0.9.1
420

521
### Patch Changes

0 commit comments

Comments
 (0)