Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "web-speed-test-server",
"version": "1.3.15",
"version": "1.3.16",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please drop this manual bump. release-please owns the version, and .release-please-manifest.json is still at 1.3.15. After merge, /version (routes/wpt.js) and the telemetry service version (instrumentation.js) would report 1.3.16 with no matching release or tag, and release-please will later rewrite this from the manifest. This already happened after #246: it bumped to 1.3.16 by hand, and release-please's next release (cefa60f) reset it to 1.3.13, so the deployed version went backwards. The fix: title already triggers a patch release.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dropped in 6b34357. package.json is back at 1.3.15, so release-please does the bump from the fix: title.

"private": true,
"scripts": {
"test": "mocha",
Expand Down
40 changes: 20 additions & 20 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
kuler "^2.0.0"

"@grpc/grpc-js@^1.14.3":
version "1.14.4"
resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.14.4.tgz#e73ff57d97802f063999545f43ebb2b1eca65d9d"
integrity sha512-k9Dj3DV/itK9D06Y8f190Qgop7/Ui+D0njFV3LHMPwPT75DpXLQohE9Wmz0QElrJnzsjB7KPWiKJbOl7IPDArQ==
version "1.14.5"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fix exists only in the lockfile. The range ^1.14.3 still allows the vulnerable 1.14.3 and 1.14.4, so a later lockfile edit or merge-conflict resolution could quietly bring back 1.14.4 (GHSA-m9gg-hp2v-232j). Could you add a resolutions entry for @grpc/grpc-js (e.g. ^1.14.5), the same way protobufjs, qs and proxy-addr are already pinned?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added "@grpc/grpc-js": "^1.14.5" to resolutions in 6b34357. The lock entry is now "@grpc/grpc-js@^1.14.3", "@grpc/grpc-js@^1.14.5" → 1.14.5, so a re-lock can't fall back to 1.14.4.

resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.14.5.tgz#12f97bd9f716358e377ffaa768195d1219eb76a3"
integrity sha512-7VZM+SVdEcUUqSQeNI3zM8Qs/BhQKZndPo2h5VkYkAM8Iz0wJIa8mKV5ekQGqG8UUsnkQ0NMxIxwkIHYvj0qOw==
dependencies:
"@grpc/proto-loader" "^0.8.0"
"@js-sdsl/ordered-map" "^4.4.2"
Expand Down Expand Up @@ -519,11 +519,11 @@
integrity sha512-L3LgimLHXtGkWikKnsPg0/VFx9OGZaC+eN1u4r+OB1XRqH3meBIAVC2zr1WdMH+RHmnRkqliQAOHNJ/E0j/e0Q==

"@types/node@*", "@types/node@>=13.7.0":
version "22.20.3"
resolved "https://registry.yarnpkg.com/@types/node/-/node-22.20.3.tgz#f77d48b4cb336b4e6dc44850ddb6da69caade396"
integrity sha512-DZmzkmwHzXrLPAXPyKNDzlIwMMUZCVacoD25ywdy5YTKGbOx/2ld+Q38Im2zJ0vBuZP5Prd3VZutKZyXwkOS8A==
version "26.6.4"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The lockfile refresh also moved @types/node from 22.20.3 to 26.6.4 (and undici-types from 6.21 to 8.9). CI runs Node 20.16 and .mise.local.toml uses 22.13, so editor and type checks would now accept Node 26 APIs that don't exist at runtime. It's also unrelated to the security fix. Could you keep this at 22.x, or mention the jump in the PR description if it's intentional?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not intentional, reverted in 6b34357. I rebuilt yarn.lock from master and re-ran yarn install, so the only lockfile change vs master is the grpc-js entry. @types/node stays at 22.20.3 / undici-types 6.21.0, and the other incidental bumps are gone too.

resolved "https://registry.yarnpkg.com/@types/node/-/node-26.6.4.tgz#5aaac1a7337945f7f9a2de4e0d14e7107157e813"
integrity sha512-ldVPDCzj7fsaGZrLB0NuHuTvJcsNasysBAqMolr/cgxrLd1xbqxIr3XJiPnHHJUCxj5sNF1vnRj9aWnrVh5Jcg==
dependencies:
undici-types "~6.21.0"
undici-types "~8.9.0"

"@types/superagent@4.1.13":
version "4.1.13"
Expand Down Expand Up @@ -557,9 +557,9 @@ ansi-regex@^5.0.1:
integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==

ansi-regex@^6.2.2:
version "6.3.0"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.3.0.tgz#247c8e7b70a1a43b10ce14c0226fcbf58e8815d5"
integrity sha512-WpDfL7NO6j7tH88IDBNVdUJxDh9nmCteAVW9dsep846XdwF4naCBK+/tGLX3KJgcpgMRXCFlTM2hKGoK9FsdrQ==
version "6.4.0"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.4.0.tgz#69093d6436d30dbb9b04fe7bdcbcfe16c697d8a1"
integrity sha512-KzTVk2tCWAHtYrvvvaP8bJKJq2pVinhLcGEQdtLIYPbmNGNyYe8QwNaTUYQp2J7/vIsUKt5QCqAfUkYyG9DkOw==

ansi-styles@^4.0.0, ansi-styles@^4.1.0:
version "4.3.0"
Expand Down Expand Up @@ -1350,9 +1350,9 @@ he@^1.2.0:
integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==

http-cache-semantics@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz#205f4db64f8562b76a4ff9235aa5279839a09dd5"
integrity sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==
version "4.3.0"
resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.3.0.tgz#09eead3b16c6d85552857cc3fbd888d8353a2aaf"
integrity sha512-M5t5LlJpS1UHMjvwRQVdFHvPISGeLAxNcrWuJkeGh0KxsqCHZ1O3NXZU/8x7cD0BDcGW8kapxMKTvwlqrNkHkA==

http-errors@~2.0.0, http-errors@~2.0.1:
version "2.0.1"
Expand Down Expand Up @@ -1386,9 +1386,9 @@ iconv-lite@~0.4.24:
safer-buffer ">= 2.1.2 < 3"

import-in-the-middle@^3.0.0:
version "3.5.1"
resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-3.5.1.tgz#74fc490851751005dc2f776a87bc8a075904b474"
integrity sha512-mPKuL8bPQzecui2KK6Gb+M8JvJoHnhS1FeYGa22QopBmlevF5F0FE6ued/B5EgHDeIoMTONIpDWWFKUPOG0DBQ==
version "3.5.2"
resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-3.5.2.tgz#c017ecf4fe1f83da743793ea9321519131cd3135"
integrity sha512-WseIA/4o56+GYO3RmlOPvejYi771OFeJEeK/ejROsr9bdjW+E5NXTOD1Di8TL40Qgg3JJX9aa97Hf8iiSVIKZw==
dependencies:
cjs-module-lexer "^2.2.0"
es-module-lexer "^3.0.2"
Expand Down Expand Up @@ -2340,10 +2340,10 @@ type-is@~1.6.18:
media-typer "0.3.0"
mime-types "~2.1.24"

undici-types@~6.21.0:
version "6.21.0"
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb"
integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==
undici-types@~8.9.0:
version "8.9.0"
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-8.9.0.tgz#e240d97c8b5d85e5347ce73d25865c7906c1ec9f"
integrity sha512-KTDyRTYX8sWmKXAikPHHSyc63CRPETMctyjKFupcC6OBLXT3xsN0e9aF7m+mIXutFWpUXuedtowG7iLOzp0kQg==

universalify@^2.0.0:
version "2.0.1"
Expand Down
Loading