Skip to content

Commit

Permalink
Merge master into release
Browse files Browse the repository at this point in the history
  • Loading branch information
google-oss-bot authored Feb 27, 2024
2 parents 9fa0e9f + f3cec28 commit 7e2efbf
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 25 deletions.
9 changes: 9 additions & 0 deletions .changeset/short-falcons-look.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@firebase/auth-compat': patch
'@firebase/firestore': patch
'@firebase/functions': patch
'@firebase/storage': patch
'@firebase/auth': patch
---

Bump undici version to 5.28.3 due to security issue.
2 changes: 1 addition & 1 deletion .github/workflows/test-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ env:
# The default behavior of chromedriver uses the older Chrome download URLs. We need to override
# the beahvior to use the new URLs.
CHROMEDRIVER_CDNURL: https://googlechromelabs.github.io/
CHROMEDRIVER_CDNBINARIESURL: https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/
CHROMEDRIVER_CDNBINARIESURL: https://storage.googleapis.com/chrome-for-testing-public
CHROME_VALIDATED_VERSION: linux-120.0.6099.71
CHROME_VERSION_MISMATCH_MESSAGE: "The Chrome version doesn't match the previously validated version. Consider updating CHROME_VALIDATED_VERSION in the GitHub workflow if tests pass."
artifactRetentionDays: 14
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-changed-auth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ env:
# The default behavior of chromedriver uses the older Chrome download URLs. We need to override
# the beahvior to use the new URLs.
CHROMEDRIVER_CDNURL: https://googlechromelabs.github.io/
CHROMEDRIVER_CDNBINARIESURL: https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/
CHROMEDRIVER_CDNBINARIESURL: https://storage.googleapis.com/chrome-for-testing-public
CHROME_VALIDATED_VERSION: linux-120.0.6099.71
# Bump Node memory limit
NODE_OPTIONS: "--max_old_space_size=4096"
Expand Down
4 changes: 2 additions & 2 deletions integration/messaging/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"devDependencies": {
"firebase": "10.8.0",
"chai": "4.3.7",
"chromedriver": "114.0.2",
"chromedriver": "116.0.0",
"express": "4.18.2",
"geckodriver": "2.0.4",
"mocha": "9.2.2",
"undici": "5.26.5",
"undici": "5.28.3",
"selenium-assistant": "6.1.1"
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
"tslint": "6.1.3",
"typedoc": "0.16.11",
"typescript": "4.7.4",
"undici": "5.26.5",
"undici": "5.28.3",
"watch": "1.0.2",
"webpack": "5.76.0",
"yargs": "17.7.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/auth-compat/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@firebase/auth-types": "0.12.0",
"@firebase/component": "0.6.5",
"@firebase/util": "1.9.4",
"undici": "5.26.5",
"undici": "5.28.3",
"tslib": "^2.1.0"
},
"license": "Apache-2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
"@firebase/component": "0.6.5",
"@firebase/logger": "0.4.0",
"@firebase/util": "1.9.4",
"undici": "5.26.5",
"undici": "5.28.3",
"tslib": "^2.1.0"
},
"license": "Apache-2.0",
Expand All @@ -138,7 +138,7 @@
"@rollup/plugin-json": "4.1.0",
"@rollup/plugin-strip": "2.1.0",
"@types/express": "4.17.17",
"chromedriver": "114.0.2",
"chromedriver": "116.0.0",
"rollup": "2.79.1",
"rollup-plugin-sourcemaps": "0.6.3",
"rollup-plugin-typescript2": "0.31.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/firestore/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"@firebase/webchannel-wrapper": "0.10.5",
"@grpc/grpc-js": "~1.9.0",
"@grpc/proto-loader": "^0.7.8",
"undici": "5.26.5",
"undici": "5.28.3",
"tslib": "^2.1.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/functions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"@firebase/auth-interop-types": "0.2.1",
"@firebase/app-check-interop-types": "0.3.0",
"@firebase/util": "1.9.4",
"undici": "5.26.5",
"undici": "5.28.3",
"tslib": "^2.1.0"
},
"nyc": {
Expand Down
2 changes: 1 addition & 1 deletion packages/storage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"dependencies": {
"@firebase/util": "1.9.4",
"@firebase/component": "0.6.5",
"undici": "5.26.5",
"undici": "5.28.3",
"tslib": "^2.1.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion repo-scripts/changelog-generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@changesets/types": "3.3.0",
"@changesets/get-github-info": "0.5.2",
"@types/node": "20.8.10",
"undici": "5.26.5"
"undici": "5.28.3"
},
"license": "Apache-2.0",
"devDependencies": {
Expand Down
26 changes: 13 additions & 13 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5583,14 +5583,14 @@ chrome-trace-event@^1.0.2:
resolved "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"
integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==

chromedriver@114.0.2:
version "114.0.2"
resolved "https://registry.npmjs.org/chromedriver/-/chromedriver-114.0.2.tgz"
integrity sha512-v0qrXRBknbxqmtklG7RWOe3TJ/dLaHhtB0jVxE7BAdYERxUjEaNRyqBwoGgVfQDibHCB0swzvzsj158nnfPgZw==
chromedriver@116.0.0:
version "116.0.0"
resolved "https://registry.npmjs.org/chromedriver/-/chromedriver-116.0.0.tgz#3f5d07b5427953270461791651d7b68cb6afe9fe"
integrity sha512-/TQaRn+RUAYnVqy5Vx8VtU8DvtWosU8QLM2u7BoNM5h55PRQPXF/onHAehEi8Sj/CehdKqH50NFdiumQAUr0DQ==
dependencies:
"@testim/chrome-version" "^1.1.3"
axios "^1.4.0"
compare-versions "^5.0.3"
compare-versions "^6.0.0"
extract-zip "^2.0.1"
https-proxy-agent "^5.0.1"
proxy-from-env "^1.1.0"
Expand Down Expand Up @@ -5955,10 +5955,10 @@ compare-func@^2.0.0:
array-ify "^1.0.0"
dot-prop "^5.1.0"

compare-versions@^5.0.3:
version "5.0.3"
resolved "https://registry.npmjs.org/compare-versions/-/compare-versions-5.0.3.tgz"
integrity sha512-4UZlZP8Z99MGEY+Ovg/uJxJuvoXuN4M6B3hKaiackiHrgzQFEe3diJi1mf1PNHbFujM7FvLrK2bpgIaImbtZ1A==
compare-versions@^6.0.0:
version "6.1.0"
resolved "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.0.tgz#3f2131e3ae93577df111dba133e6db876ffe127a"
integrity sha512-LNZQXhqUvqUTotpZ00qLSaify3b4VFD588aRr8MKFw4CMUr98ytzCW5wDH5qx/DEY5kCDXcbcRuCqL0szEf2tg==

component-emitter@^1.2.1, component-emitter@~1.3.0:
version "1.3.0"
Expand Down Expand Up @@ -16835,10 +16835,10 @@ undici-types@~5.26.4:
resolved "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==

undici@5.26.5:
version "5.26.5"
resolved "https://registry.npmjs.org/undici/-/undici-5.26.5.tgz#f6dc8c565e3cad8c4475b187f51a13e505092838"
integrity sha512-cSb4bPFd5qgR7qr2jYAi0hlX9n5YKK2ONKkLFkxl+v/9BvC0sOpZjBHDBSXc5lWAf5ty9oZdRXytBIHzgUcerw==
undici@5.28.3:
version "5.28.3"
resolved "https://registry.npmjs.org/undici/-/undici-5.28.3.tgz#a731e0eff2c3fcfd41c1169a869062be222d1e5b"
integrity sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA==
dependencies:
"@fastify/busboy" "^2.0.0"

Expand Down

0 comments on commit 7e2efbf

Please sign in to comment.