Skip to content

chore: forward-merge main into next - #306

Merged
raviships merged 22 commits into
nextfrom
chore/forward-merge-main-into-next
Oct 23, 2026
Merged

raviships merged 22 commits into
nextfrom
chore/forward-merge-main-into-next

Conversation

@raviships

Copy link
Copy Markdown
Collaborator

Summary

Forward-merges main into next, as RELEASING.md describes for stable fixes. next was 21 commits behind main. The important one is the Next.js 16.4.1 security upgrade (#304, the October 14 advisories). Until this merges, Vercel preview deployments built from next keep running Next 16.2.10: today's edgestore-docs, example-access-control and example-components previews do. Production (main) is already on 16.4.1.

The merge applied cleanly with no conflicts. next keeps its own Node 24.22.1 pin from #305.

Evidence

On the merge commit, using pnpm 11.15.1 and Node 24.22.1:

  • pnpm install --frozen-lockfile: passes (lockfile consistent; catalog next: 16.4.1)
  • pnpm build: passes
  • pnpm typecheck: passes
  • pnpm test: 9/9 tasks pass

Risk and rollback

Door: Two-way. Revert the merge commit to undo. Merge this with a merge commit, not a squash, so later forward merges stay clean.
Blast radius: Only the next branch and its Vercel previews. Nothing is published: next is dormant (no .changeset/pre.json), so the release workflow skips on push.

By: Claude Opus 5.5 Extra High on Claude Code

🤖 Generated with Claude Code

raviships and others added 22 commits October 11, 2026 12:19
Upload button usage and block, and file field, imported FileList/FileListItem
from multi-file without the matching registry dependency. Extract FileBadge,
FileListItem and FileList into file-list.tsx with a file-list registry item.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
fix: move file list into its own registry item
…y-imports

# Conflicts:
#	docs/public/r/upload-button-block.json
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
fix: open registry blocks in v0 as the app page
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Patches GHSA-673q-mjm6-r5xr (use cache RCE), CVE-2026-96889 /
GHSA-2464-fhr4-w9xw (Image Optimization SVG RCE via sharp) and
GHSA-p3m5-59mp-jv5r (Server Actions DoS) in the docs site and the
Next.js examples. Next now resolves the fixed sharp 0.35.5.

16.4.1 is younger than the one-day minimumReleaseAge, so its exact
versions are excluded until then.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
fix(deps): upgrade Next.js to 16.4.1 (October 14 security release)
Brings next up to date with main, including the Next.js 16.4.1 security
upgrade (#304), so Vercel previews built from next stop running Next 16.2.10.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@vercel

vercel Bot commented Oct 23, 2026 •

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated
edgestore-docs Ready Ready Preview Oct 23, 2026 7:49am UTC
example-access-control Ready Ready Preview Oct 23, 2026 7:49am UTC
example-components Ready Ready Preview Oct 23, 2026 7:49am UTC

Request Review

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 23, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-23T07:49:34.150759Z a7317a8 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

This branch was successfully deployed

3 active deployments
Preview – edgestore-docs — a7317a84 Deployed Oct 23, 2026 by vercel[bot]
Preview – example-components — a7317a84 Deployed Oct 23, 2026 by vercel[bot]
Preview – example-access-control — a7317a84 Deployed Oct 23, 2026 by vercel[bot]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant