Repository navigation
fix(site): patch build-toolchain advisories in the website lockfile - #260
Merged
Merged
Conversation
Bumps the site-dependencies group in /site with 2 updates: [sharp](https://github.com/lovell/sharp) and [wrangler](https://github.com/cloudflare/workers-sdk/tree/HEAD/packages/wrangler). Updates `sharp` from 0.35.4 to 0.35.5 - [Release notes](https://github.com/lovell/sharp/releases) - [Commits](lovell/sharp@v0.35.4...v0.35.5) Updates `wrangler` from 4.140.0 to 4.147.0 - [Release notes](https://github.com/cloudflare/workers-sdk/releases) - [Commits](https://github.com/cloudflare/workers-sdk/commits/wrangler@4.147.0/packages/wrangler) --- updated-dependencies: - dependency-name: sharp dependency-version: 0.35.5 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: site-dependencies - dependency-name: wrangler dependency-version: 4.147.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: site-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
Bump sharp to 0.35.5 (GHSA-wq5f-xc86-pv6w, librsvg) and pin http-cache-semantics 4.3.0 and source-map-js 1.2.2 through overrides. Regenerated with npm 11 so the platform libc selectors are preserved; npm audit for site/ reports 0 vulnerabilities and npm test (images, astro check, build, 58 postbuild tests) passes.
Integrate the existing dependency update branch while preserving npm 11 platform selectors and build-toolchain security overrides.
This was referenced Oct 7, 2026
…ries # Conflicts: # CHANGELOG.md # site/package.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Reconcile the website dependency refresh in #252 with the build-toolchain security fixes in this PR. Only
site/package.json,site/package-lock.json, and the existing CHANGELOG entry differ from main.http-cache-semanticsto 4.3.0 andsource-map-jsto 1.2.2; retain the existing nanoid and undici overrides.These are website build/deployment-tool dependencies. No Swift source, app entitlements, runtime networking, website source, workflow, or deployment configuration changed.
Integration and review order
720dbd43a10d3d85bac4eababdf4dcafbad28008.Merge-method condition: the conflict-free proof assumes #252 is merged with its existing commit ancestry preserved (a merge commit). A local simulation of squash-merging #252 still produces a package.json context conflict because its new commit is not an ancestor of this branch. If choosing squash/rebase instead, refresh this PR against the resulting main and rerun the lockfile/site checks before merging it; do not resolve by discarding either side.
The reconciliation commit
68b31d6f98b2f447d9839c9e09ef28715875d652has two parents: this PR's originala1ce34d9775c95d90dff211f9a5fcbbaa82de22cand #252's720dbd43a10d3d85bac4eababdf4dcafbad28008. Existing commits and both PR bases are preserved. This feature-branch integration resolves overlapping package.json context as well as lockfile content; neither PR nor main has been merged.Against #252, the entire remaining diff is:
A local
git merge-tree --write-treeof #252 with the reconciled head completes without conflicts and produces the exact tested tree. This order also avoids obscuring #252's review by merging its descendant first. If either source branch or main changes, recheck the integration rather than selecting one lockfile wholesale.Verification
Exact tested tree:
f3f94695fbfdd449f194dc3020f7a858414d7ae4Published head:
68b31d6f98b2f447d9839c9e09ef28715875d652Local Linux checks on Node 22.22.0 / npm 11.21.0:
npm ci --no-audit --no-fund: passed.npm test: passed image generation, Astro check (0 errors, 0 warnings), static build, build validation, and 58/58 tests.npm audit --json: 0 vulnerabilities at verification time.git diff --check, repository hygiene, and changelog/version checks: passed.make lint: passed; its QA archive sub-check explicitly skips where ditto/unzip is unavailable.Local limitations:
make formatand the final Swift-format stage ofmake lintcannot run on this Linux host because xcrun/Xcode are absent. No Swift files changed.Reviewer focus
Verify the two-parent ancestry and narrow diff against #252; confirm Sharp/Wrangler pins and all overrides agree with the lockfile; retain the libc platform metadata; inspect the latest CI for the published head before merging.
Final CI result
CI run 37551495048 completed successfully for head
68b31d6f98b2f447d9839c9e09ef28715875d652: 5/5 jobs green (Linux static checks; build/test on Sequoia 15 and Tahoe 26; UI tests on both versions). The native lanes include Swift-format, Debug/universal Release builds, coverage tests, performance and golden gates; both UI lanes include the strict visual evidence tour.GitHub's test merge
d810b25ea24a1ad8674a06b0de32450692046e40has treef3f94695fbfdd449f194dc3020f7a858414d7ae4, identical to the local tested and published tree. Linux CI independently reports 58/58 site tests, 0 Astro errors/warnings, and 0 audit findings. This is ready for the requested subsequent human/model review, not an approval to merge.