Skip to content

Commit a10b5a8

Browse files
hsubox76hsubox76
committed
Merge branch 'v11' into ch-schema
2 parents f5f2a48 + 097bd67 commit a10b5a8

File tree

17 files changed

+43
-117
lines changed

17 files changed

+43
-117
lines changed

‎.changeset/large-snakes-march.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'firebase': major
3+
'@firebase/vertexai': major
4+
---
5+
6+
Release VertexAI in Firebase for general availability.

‎.changeset/slimy-cups-promise.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@firebase/functions-compat': patch
3+
'@firebase/functions': patch
4+
---
5+
6+
Remove node bundle from the functions SDK as the node-specific fetch code has been removed in favor of using native fetch throughout the SDK.

‎.github/workflows/canary-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
NPM_TOKEN_STORAGE: ${{secrets.NPM_TOKEN_STORAGE}}
7171
NPM_TOKEN_STORAGE_TYPES: ${{secrets.NPM_TOKEN_STORAGE_TYPES}}
7272
NPM_TOKEN_UTIL: ${{secrets.NPM_TOKEN_UTIL}}
73-
NPM_TOKEN_VERTEXAI_PREVIEW: ${{secrets.NPM_TOKEN_VERTEXAI_PREVIEW}}
73+
NPM_TOKEN_VERTEXAI: ${{secrets.NPM_TOKEN_VERTEXAI}}
7474
NPM_TOKEN_WEBCHANNEL_WRAPPER: ${{secrets.NPM_TOKEN_WEBCHANNEL_WRAPPER}}
7575
NPM_TOKEN_FIREBASE: ${{secrets.NPM_TOKEN_FIREBASE}}
7676
NPM_TOKEN_APP_COMPAT: ${{ secrets.NPM_TOKEN_APP_COMPAT }}

‎.github/workflows/prerelease-manual-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
NPM_TOKEN_STORAGE: ${{secrets.NPM_TOKEN_STORAGE}}
7474
NPM_TOKEN_STORAGE_TYPES: ${{secrets.NPM_TOKEN_STORAGE_TYPES}}
7575
NPM_TOKEN_UTIL: ${{secrets.NPM_TOKEN_UTIL}}
76-
NPM_TOKEN_VERTEXAI_PREVIEW: ${{secrets.NPM_TOKEN_VERTEXAI_PREVIEW}}
76+
NPM_TOKEN_VERTEXAI: ${{secrets.NPM_TOKEN_VERTEXAI}}
7777
NPM_TOKEN_WEBCHANNEL_WRAPPER: ${{secrets.NPM_TOKEN_WEBCHANNEL_WRAPPER}}
7878
NPM_TOKEN_FIREBASE: ${{secrets.NPM_TOKEN_FIREBASE}}
7979
NPM_TOKEN_APP_COMPAT: ${{ secrets.NPM_TOKEN_APP_COMPAT }}

‎.github/workflows/release-prod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
NPM_TOKEN_STORAGE: ${{secrets.NPM_TOKEN_STORAGE}}
8484
NPM_TOKEN_STORAGE_TYPES: ${{secrets.NPM_TOKEN_STORAGE_TYPES}}
8585
NPM_TOKEN_UTIL: ${{secrets.NPM_TOKEN_UTIL}}
86-
NPM_TOKEN_VERTEXAI_PREVIEW: ${{secrets.NPM_TOKEN_VERTEXAI_PREVIEW}}
86+
NPM_TOKEN_VERTEXAI: ${{secrets.NPM_TOKEN_VERTEXAI}}
8787
NPM_TOKEN_WEBCHANNEL_WRAPPER: ${{secrets.NPM_TOKEN_WEBCHANNEL_WRAPPER}}
8888
NPM_TOKEN_FIREBASE: ${{secrets.NPM_TOKEN_FIREBASE}}
8989
NPM_TOKEN_APP_COMPAT: ${{ secrets.NPM_TOKEN_APP_COMPAT }}

‎.github/workflows/release-staging.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
NPM_TOKEN_STORAGE: ${{secrets.NPM_TOKEN_STORAGE}}
110110
NPM_TOKEN_STORAGE_TYPES: ${{secrets.NPM_TOKEN_STORAGE_TYPES}}
111111
NPM_TOKEN_UTIL: ${{secrets.NPM_TOKEN_UTIL}}
112-
NPM_TOKEN_VERTEXAI_PREVIEW: ${{secrets.NPM_TOKEN_VERTEXAI_PREVIEW}}
112+
NPM_TOKEN_VERTEXAI: ${{secrets.NPM_TOKEN_VERTEXAI}}
113113
NPM_TOKEN_WEBCHANNEL_WRAPPER: ${{secrets.NPM_TOKEN_WEBCHANNEL_WRAPPER}}
114114
NPM_TOKEN_FIREBASE: ${{secrets.NPM_TOKEN_FIREBASE}}
115115
NPM_TOKEN_APP_COMPAT: ${{ secrets.NPM_TOKEN_APP_COMPAT }}

‎common/api-review/vertexai-preview.api.md renamed to ‎common/api-review/vertexai.api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## API Report File for "@firebase/vertexai-preview"
1+
## API Report File for "@firebase/vertexai"
22

33
> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
44

‎packages/firebase/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -215,17 +215,17 @@
215215
},
216216
"default": "./storage/dist/esm/index.esm.js"
217217
},
218-
"./vertexai-preview": {
219-
"types": "./vertexai-preview/dist/vertexai-preview/index.d.ts",
218+
"./vertexai": {
219+
"types": "./vertexai/dist/vertexai/index.d.ts",
220220
"node": {
221-
"require": "./vertexai-preview/dist/index.cjs.js",
222-
"import": "./vertexai-preview/dist/index.mjs"
221+
"require": "./vertexai/dist/index.cjs.js",
222+
"import": "./vertexai/dist/index.mjs"
223223
},
224224
"browser": {
225-
"require": "./vertexai-preview/dist/index.cjs.js",
226-
"import": "./vertexai-preview/dist/esm/index.esm.js"
225+
"require": "./vertexai/dist/index.cjs.js",
226+
"import": "./vertexai/dist/esm/index.esm.js"
227227
},
228-
"default": "./vertexai-preview/dist/esm/index.esm.js"
228+
"default": "./vertexai/dist/esm/index.esm.js"
229229
},
230230
"./compat/analytics": {
231231
"types": "./compat/analytics/dist/compat/analytics/index.d.ts",
@@ -413,7 +413,7 @@
413413
"@firebase/app-check": "0.8.8",
414414
"@firebase/app-check-compat": "0.3.15",
415415
"@firebase/util": "1.10.0",
416-
"@firebase/vertexai-preview": "0.0.4"
416+
"@firebase/vertexai": "0.0.4"
417417
},
418418
"devDependencies": {
419419
"rollup": "2.79.1",
@@ -446,7 +446,7 @@
446446
"messaging",
447447
"messaging/sw",
448448
"database",
449-
"vertexai-preview"
449+
"vertexai"
450450
],
451451
"typings": "empty.d.ts"
452452
}

‎packages/firebase/vertexai-preview/index.ts renamed to ‎packages/firebase/vertexai/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
* limitations under the License.
1616
*/
1717

18-
export * from '@firebase/vertexai-preview';
18+
export * from '@firebase/vertexai';

‎packages/firebase/vertexai-preview/package.json renamed to ‎packages/firebase/vertexai/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "firebase/vertexai-preview",
2+
"name": "firebase/vertexai",
33
"main": "dist/index.cjs.js",
44
"browser": "dist/esm/index.esm.js",
55
"module": "dist/esm/index.esm.js",
6-
"typings": "dist/vertexai-preview/index.d.ts"
6+
"typings": "dist/vertexai/index.d.ts"
77
}

‎packages/functions-compat/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"version": "0.3.14",
44
"description": "",
55
"author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
6-
"main": "dist/index.node.cjs.js",
6+
"main": "dist/index.cjs.js",
77
"browser": "dist/index.esm2017.js",
88
"module": "dist/index.esm2017.js",
99
"esm5": "dist/index.esm5.js",
1010
"exports": {
1111
".": {
1212
"types": "./dist/src/index.d.ts",
1313
"node": {
14-
"import": "./dist/node-esm/index.node.esm.js",
15-
"require": "./dist/index.node.cjs.js"
14+
"require": "./dist/index.cjs.js",
15+
"import": "./dist/index.esm2017.js"
1616
},
1717
"esm5": "./dist/index.esm5.js",
1818
"browser": {
@@ -57,7 +57,7 @@
5757
"test:all": "run-p --npm-path npm test:browser test:node",
5858
"test:browser": "karma start",
5959
"test:browser:debug": "karma start --browsers=Chrome --auto-watch",
60-
"test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'src/{,!(browser)/**/}*.test.ts' --file src/index.node.ts --config ../../config/mocharc.node.js",
60+
"test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'src/{,!(browser)/**/}*.test.ts' --config ../../config/mocharc.node.js",
6161
"test:emulator": "env FIREBASE_FUNCTIONS_HOST=http://localhost FIREBASE_FUNCTIONS_PORT=5005 run-p --npm-path npm test:node",
6262
"trusted-type-check": "tsec -p tsconfig.json --noEmit",
6363
"add-compat-overloads": "ts-node-script ../../scripts/build/create-overloads.ts -i ../functions/dist/functions-public.d.ts -o dist/src/index.d.ts -a -r Functions:types.FirebaseFunctions -r FirebaseApp:FirebaseAppCompat --moduleToEnhance @firebase/functions"

‎packages/functions-compat/rollup.config.js

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -73,21 +73,4 @@ const browserBuilds = [
7373
}
7474
];
7575

76-
const nodeBuilds = [
77-
{
78-
input: 'src/index.node.ts',
79-
output: [{ file: pkg.main, format: 'cjs', sourcemap: true }],
80-
plugins: es5BuildPlugins,
81-
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
82-
},
83-
{
84-
input: 'src/index.node.ts',
85-
output: [
86-
{ file: pkg.exports['.'].node.import, format: 'es', sourcemap: true }
87-
],
88-
plugins: [...es2017BuildPlugins, emitModulePackageFile()],
89-
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
90-
}
91-
];
92-
93-
export default [...browserBuilds, ...nodeBuilds];
76+
export default [...browserBuilds];

‎packages/functions-compat/src/index.node.ts

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

‎packages/functions/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"version": "0.11.8",
44
"description": "",
55
"author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
6-
"main": "dist/index.node.cjs.js",
6+
"main": "dist/index.cjs.js",
77
"browser": "dist/index.esm2017.js",
88
"module": "dist/index.esm2017.js",
99
"esm5": "dist/index.esm.js",
1010
"exports": {
1111
".": {
1212
"types": "./dist/functions-public.d.ts",
1313
"node": {
14-
"import": "./dist/esm-node/index.node.esm.js",
15-
"require": "./dist/index.node.cjs.js"
14+
"import": "./dist/index.esm2017.js",
15+
"require": "./dist/index.cjs.js"
1616
},
1717
"esm5": "./dist/index.esm.js",
1818
"browser": {
@@ -38,7 +38,7 @@
3838
"test:all": "run-p --npm-path npm test:browser test:node",
3939
"test:browser": "karma start",
4040
"test:browser:debug": "karma start --browsers=Chrome --auto-watch",
41-
"test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'src/{,!(browser)/**/}*.test.ts' --file src/index.node.ts --config ../../config/mocharc.node.js",
41+
"test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'src/{,!(browser)/**/}*.test.ts' --file src/index.ts --config ../../config/mocharc.node.js",
4242
"test:emulator": "env FIREBASE_FUNCTIONS_EMULATOR_ORIGIN=http://localhost:5005 run-p --npm-path npm test:node",
4343
"trusted-type-check": "tsec -p tsconfig.json --noEmit",
4444
"api-report": "api-extractor run --local --verbose",

‎packages/functions/rollup.config.js

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -84,28 +84,4 @@ const browserBuilds = [
8484
}
8585
];
8686

87-
const nodeBuilds = [
88-
{
89-
input: 'src/index.node.ts',
90-
output: [{ file: pkg.main, format: 'cjs', sourcemap: true }],
91-
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
92-
plugins: [
93-
...es5BuildPlugins,
94-
replace(generateBuildTargetReplaceConfig('cjs', 5))
95-
]
96-
},
97-
{
98-
input: 'src/index.node.ts',
99-
output: [
100-
{ file: pkg.exports['.'].node.import, format: 'es', sourcemap: true }
101-
],
102-
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
103-
plugins: [
104-
...es2017BuildPlugins,
105-
replace(generateBuildTargetReplaceConfig('esm', 2017)),
106-
emitModulePackageFile()
107-
]
108-
}
109-
];
110-
111-
export default [...browserBuilds, ...nodeBuilds];
87+
export default [...browserBuilds];

‎packages/functions/src/index.node.ts

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

‎packages/vertexai/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "@firebase/vertexai-preview",
2+
"name": "@firebase/vertexai",
33
"version": "0.0.4",
4-
"description": "A Firebase SDK for VertexAI (preview)",
4+
"description": "A Firebase SDK for VertexAI",
55
"author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
66
"engines": {
77
"node": ">=18.0.0"
@@ -11,7 +11,7 @@
1111
"module": "dist/esm/index.esm2017.js",
1212
"exports": {
1313
".": {
14-
"types": "./dist/vertexai-preview-public.d.ts",
14+
"types": "./dist/vertexai-public.d.ts",
1515
"node": {
1616
"require": "./dist/index.cjs.js",
1717
"import": "./dist/esm/index.esm2017.js"
@@ -40,7 +40,7 @@
4040
"test:skip-clone": "karma start",
4141
"test:browser": "yarn testsetup && karma start",
4242
"api-report": "api-extractor run --local --verbose",
43-
"typings:public": "node ../../scripts/build/use_typings.js ./dist/vertexai-preview-public.d.ts",
43+
"typings:public": "node ../../scripts/build/use_typings.js ./dist/vertexai-public.d.ts",
4444
"trusted-type-check": "tsec -p tsconfig.json --noEmit"
4545
},
4646
"peerDependencies": {

0 commit comments

Comments
 (0)