Skip to content

Commit 7347e23

Browse files
committed
Merge remote-tracking branch 'public/master' into dataconnect
2 parents 388b61c + 5e16ccf commit 7347e23

File tree

63 files changed

+1537
-691
lines changed

Some content is hidden

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

63 files changed

+1537
-691
lines changed

.github/workflows/canary-deploy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ jobs:
7474
NPM_TOKEN_TESTING: ${{secrets.NPM_TOKEN_TESTING}}
7575
NPM_TOKEN_UTIL: ${{secrets.NPM_TOKEN_UTIL}}
7676
NPM_TOKEN_VERTEXAI: ${{secrets.NPM_TOKEN_VERTEXAI}}
77+
NPM_TOKEN_VERTEXAI_PREVIEW: ${{secrets.NPM_TOKEN_VERTEXAI_PREVIEW}}
7778
NPM_TOKEN_WEBCHANNEL_WRAPPER: ${{secrets.NPM_TOKEN_WEBCHANNEL_WRAPPER}}
7879
NPM_TOKEN_FIREBASE: ${{secrets.NPM_TOKEN_FIREBASE}}
7980
NPM_TOKEN_APP_COMPAT: ${{ secrets.NPM_TOKEN_APP_COMPAT }}

.github/workflows/release-prod.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,3 +125,35 @@ jobs:
125125
curl -X POST -H "Content-Type:application/json" \
126126
-d "{\"version\":\"$BASE_VERSION\",\"date\":\"$DATE\"}" \
127127
$RELEASE_TRACKER_URL/logProduction
128+
- name: Create Github release
129+
env:
130+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
131+
run: |
132+
# Get the newest release tag for the firebase package (e.g. [email protected])
133+
NEWEST_TAG=$(git describe --tags --match "firebase@[0-9]*.[0-9]*.[0-9]*" --abbrev=0)
134+
135+
# Get the release notes from the description of the most recent merged PR into the "release" branch
136+
# See: https://github.com/firebase/firebase-js-sdk/pull/8236 for an example description
137+
JSON_RELEASE_NOTES=$(gh pr list \
138+
--repo "$GITHUB_REPOSITORY" \
139+
--state "merged" \
140+
--base "release" \
141+
--limit 1 \
142+
--json "body" \
143+
| jq '.[].body | split("\n# Releases\n")[-1]' # Remove the generated changesets header
144+
)
145+
146+
# Prepend the new release header
147+
# We have to be careful to insert the new release header after a " character, since we're
148+
# modifying the JSON string
149+
JSON_RELEASE_NOTES="\"For more detailed release notes, see [Firebase JavaScript SDK Release Notes](https://firebase.google.com/support/release-notes/js).\n\n# What's Changed\n\n${JSON_RELEASE_NOTES:1}"
150+
151+
# Format the JSON string into a readable markdown string
152+
RELEASE_NOTES=$(echo -E $JSON_RELEASE_NOTES | jq -r .)
153+
154+
# Create the GitHub release
155+
gh release create "$NEWEST_TAG" \
156+
--repo "$GITHUB_REPOSITORY" \
157+
--title "$NEWEST_TAG" \
158+
--notes "$RELEASE_NOTES" \
159+
--verify-tag

.github/workflows/test-all.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414

1515
name: Test All Packages
1616

17-
on:
18-
push:
19-
branches: ['**']
17+
on: pull_request
2018

2119
env:
2220
# make chromedriver detect installed Chrome version and download the corresponding driver

.github/workflows/test-changed-auth.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
name: Test Auth
1616

17-
on: [push, pull_request]
17+
on: pull_request
1818

1919
env:
2020
# make chromedriver detect installed Chrome version and download the corresponding driver

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ tsdoc-metadata.json
9191
# generated html docs
9292
docs-rut/
9393
docs/
94-
toc/
9594

9695
# generated Terraform docs
9796
.terraform/*

README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ To get started using Firebase, see
1818
[![Release Notes](https://img.shields.io/npm/v/firebase.svg?style=flat-square&label=Release%20Notes%20for&labelColor=039be5&color=666)](https://firebase.google.com/support/release-notes/js)
1919

2020
## Upgrade to Version 9
21+
2122
Version 9 has a redesigned API that supports tree-shaking. Read the [Upgrade Guide](https://firebase.google.com/docs/web/modular-upgrade) to learn more.
23+
2224
## Supported Environments
25+
2326
Please see [Environment Support](https://firebase.google.com/support/guides/environments_js-sdk).
2427

2528
## SDK Dev Workflow
@@ -30,7 +33,7 @@ Please see [Environment Support](https://firebase.google.com/support/guides/envi
3033

3134
Before you can start working on the Firebase JS SDK, you need to have Node.js
3235
installed on your machine. As of April 19th, 2024 the team has been testing with Node.js version
33-
`20.12.2`, but the required verison of Node.js may change as we update our dependencies.
36+
`20.12.2`, but the required version of Node.js may change as we update our dependencies.
3437

3538
To download Node.js visit https://nodejs.org/en/download/.
3639

@@ -44,7 +47,7 @@ In addition to Node.js we use `yarn` to facilitate multi package development.
4447
To install `yarn` follow the instructions listed on their website:
4548
https://yarnpkg.com/en/docs/install
4649

47-
This repo currently supports building with yarn `1.x`. For instance, after installating yarn, run
50+
This repo currently supports building with yarn `1.x`. For instance, after installing yarn, run
4851
```bash
4952
$ yarn set version 1.22.11
5053
```
@@ -204,7 +207,7 @@ In order to manually test your SDK changes locally, you must use [yarn link](htt
204207
```shell
205208
$ cd packages/firebase
206209
$ yarn link # initialize the linking to the other folder
207-
$ cd ../packages/<my-product> # Example: $ cd packages/database
210+
$ cd ../<my-product> # Example: $ cd ../firestore
208211
$ yarn link # link your product to make it available elsewhere
209212
$ cd <my-test-app-dir> # cd into your personal project directory
210213
$ yarn link firebase @firebase/<my-product> # tell yarn to use the locally built firebase SDK instead

docs-devsite/vertexai-preview.generationconfig.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export interface GenerationConfig
2626
| [frequencyPenalty](./vertexai-preview.generationconfig.md#generationconfigfrequencypenalty) | number | |
2727
| [maxOutputTokens](./vertexai-preview.generationconfig.md#generationconfigmaxoutputtokens) | number | |
2828
| [presencePenalty](./vertexai-preview.generationconfig.md#generationconfigpresencepenalty) | number | |
29-
| [responseMimeType](./vertexai-preview.generationconfig.md#generationconfigresponsemimetype) | string | Output response mimetype of the generated candidate text. Supported mimetype: <code>text/plain</code>: (default) Text output. <code>application/json</code>: JSON response in the candidates. The model needs to be prompted to output the appropriate response type, otherwise the behavior is undefined. This is a preview feature. |
29+
| [responseMimeType](./vertexai-preview.generationconfig.md#generationconfigresponsemimetype) | string | Output response mimetype of the generated candidate text. Supported mimetypes are <code>text/plain</code> (default, text output) and <code>application/json</code> (JSON response in the candidates). The model needs to be prompted to output the appropriate response type, otherwise the behavior is undefined. This is a preview feature. |
3030
| [stopSequences](./vertexai-preview.generationconfig.md#generationconfigstopsequences) | string\[\] | |
3131
| [temperature](./vertexai-preview.generationconfig.md#generationconfigtemperature) | number | |
3232
| [topK](./vertexai-preview.generationconfig.md#generationconfigtopk) | number | |
@@ -66,7 +66,7 @@ presencePenalty?: number;
6666

6767
## GenerationConfig.responseMimeType
6868

69-
Output response mimetype of the generated candidate text. Supported mimetype: `text/plain`<!-- -->: (default) Text output. `application/json`<!-- -->: JSON response in the candidates. The model needs to be prompted to output the appropriate response type, otherwise the behavior is undefined. This is a preview feature.
69+
Output response mimetype of the generated candidate text. Supported mimetypes are `text/plain` (default, text output) and `application/json` (JSON response in the candidates). The model needs to be prompted to output the appropriate response type, otherwise the behavior is undefined. This is a preview feature.
7070

7171
<b>Signature:</b>
7272

e2e/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"firebase": "9.23.0"
2222
},
2323
"devDependencies": {
24-
"@babel/core": "7.24.3",
25-
"@babel/preset-env": "7.22.10",
24+
"@babel/core": "7.24.4",
25+
"@babel/preset-env": "7.24.4",
2626
"@types/chai": "4.3.14",
2727
"@types/mocha": "9.1.1",
2828
"babel-loader": "8.3.0",

integration/compat-interop/package.json

Lines changed: 6 additions & 6 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.10.3",
12-
"@firebase/app-compat": "0.2.33",
13-
"@firebase/analytics": "0.10.3",
14-
"@firebase/analytics-compat": "0.2.9",
15-
"@firebase/auth": "1.7.3",
16-
"@firebase/auth-compat": "0.5.8",
11+
"@firebase/app": "0.10.5",
12+
"@firebase/app-compat": "0.2.35",
13+
"@firebase/analytics": "0.10.4",
14+
"@firebase/analytics-compat": "0.2.10",
15+
"@firebase/auth": "1.7.4",
16+
"@firebase/auth-compat": "0.5.9",
1717
"@firebase/functions": "0.11.5",
1818
"@firebase/functions-compat": "0.3.11",
1919
"@firebase/messaging": "0.12.9",

integration/firebase/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"test:ci": "node ../../scripts/run_tests_in_ci.js -s test"
88
},
99
"devDependencies": {
10-
"firebase": "10.12.0",
10+
"firebase": "10.12.2",
1111
"@types/chai": "4.3.14",
1212
"@types/mocha": "9.1.1",
1313
"chai": "4.4.1",

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.10.3",
18-
"@firebase/firestore": "4.6.2"
17+
"@firebase/app": "0.10.5",
18+
"@firebase/firestore": "4.6.3"
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": "10.12.0",
12+
"firebase": "10.12.2",
1313
"chai": "4.4.1",
1414
"chromedriver": "119.0.1",
1515
"express": "4.19.2",

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@
6060
"repo-scripts/*"
6161
],
6262
"devDependencies": {
63-
"@babel/core": "7.24.3",
64-
"@babel/plugin-transform-modules-commonjs": "7.22.11",
65-
"@babel/preset-env": "7.22.10",
66-
"@babel/preset-typescript": "7.22.11",
63+
"@babel/core": "7.24.4",
64+
"@babel/plugin-transform-modules-commonjs": "7.24.1",
65+
"@babel/preset-env": "7.24.4",
66+
"@babel/preset-typescript": "7.24.1",
6767
"@babel/register": "7.23.7",
6868
"@changesets/changelog-github": "0.4.8",
6969
"@changesets/cli": "2.26.2",

packages/analytics-compat/CHANGELOG.md

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

3+
## 0.2.10
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`f66769cca`](https://github.com/firebase/firebase-js-sdk/commit/f66769cca243019354f88ac9dc8de07caf9de56e)]:
8+
- @firebase/analytics@0.10.4
9+
310
## 0.2.9
411

512
### Patch Changes

packages/analytics-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/analytics-compat",
3-
"version": "0.2.9",
3+
"version": "0.2.10",
44
"description": "",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",
@@ -24,7 +24,7 @@
2424
"@firebase/app-compat": "0.x"
2525
},
2626
"devDependencies": {
27-
"@firebase/app-compat": "0.2.33",
27+
"@firebase/app-compat": "0.2.35",
2828
"rollup": "2.79.1",
2929
"@rollup/plugin-json": "4.1.0",
3030
"rollup-plugin-typescript2": "0.31.2",
@@ -54,7 +54,7 @@
5454
"typings": "dist/src/index.d.ts",
5555
"dependencies": {
5656
"@firebase/component": "0.6.7",
57-
"@firebase/analytics": "0.10.3",
57+
"@firebase/analytics": "0.10.4",
5858
"@firebase/analytics-types": "0.8.2",
5959
"@firebase/util": "1.9.6",
6060
"tslib": "^2.1.0"

packages/analytics/CHANGELOG.md

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

3+
## 0.10.4
4+
5+
### Patch Changes
6+
7+
- [`f66769cca`](https://github.com/firebase/firebase-js-sdk/commit/f66769cca243019354f88ac9dc8de07caf9de56e) [#8243](https://github.com/firebase/firebase-js-sdk/pull/8243) (fixes [#8210](https://github.com/firebase/firebase-js-sdk/issues/8210)) - Analytics - fixed an issue where setConsent was clobbering the consentSettings before passing them to the gtag implementation.
8+
39
## 0.10.3
410

511
### Patch Changes

packages/analytics/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/analytics",
3-
"version": "0.10.3",
3+
"version": "0.10.4",
44
"description": "A analytics package for new firebase packages",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",
@@ -48,7 +48,7 @@
4848
},
4949
"license": "Apache-2.0",
5050
"devDependencies": {
51-
"@firebase/app": "0.10.3",
51+
"@firebase/app": "0.10.5",
5252
"rollup": "2.79.1",
5353
"@rollup/plugin-commonjs": "21.1.0",
5454
"@rollup/plugin-json": "4.1.0",

0 commit comments

Comments
 (0)