chore: merge main into v2 (unblocks #37) - #78
Merged
coderdan merged 5 commits intoJul 28, 2026
Merged
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
Bumps [next](https://github.com/vercel/next.js) from 16.2.3 to 16.2.6. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](vercel/next.js@v16.2.3...v16.2.6) --- updated-dependencies: - dependency-name: next dependency-version: 16.2.6 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
fix(docs): correct localhost URL in README
…16.2.6 chore(deps): bump next from 16.2.3 to 16.2.6
Brings main's four commits onto v2 so #37 (v2 -> main) is mergeable again. Everything main has that v2 lacks is a README URL fix and a Next bump; there is no content divergence. One conflict, in package.json: main bumped next 16.2.3 -> 16.2.6 (dependabot #18) while v2 added mermaid to the same dependency block. Kept both — v2's mermaid and main's newer next. Also regenerates bun.lock, which main's bump never touched: its package.json asked for next 16.2.6 while its lockfile still pinned 16.2.3, so `bun install --frozen-lockfile` failed on main. It passes here. `bun run build` is green end to end on the merge: EQL drift check clean, mermaid diagrams parse, all 188 legacy redirects covered, 706 pages compiled. Claude-Session: https://claude.ai/code/session_01NkuQNMvw9BpB4BWWeKtfV8
Copy link
Copy Markdown
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
Sorry, something went wrong.
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
2 participants
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.
Merges main into v2 so #37 (v2 → main) stops reporting CONFLICTING.
Despite #37 being +10411/−481, the divergence causing the conflict is tiny: main has exactly four commits v2 lacks, touching two files.
The one conflict
package.json — main bumped next 16.2.3 → 16.2.6 while v2 added mermaid to the same dependency block, so the hunks overlapped:
<<<<<<< HEAD "mermaid": "^11.16.0", "next": "16.2.3", ======= "next": "16.2.6", >>>>>>> origin/mainKept both — v2's mermaid and main's newer next. No judgement call beyond that; nothing else conflicted, and README.md merged cleanly.
Also fixes main's stale lockfile
main's dependabot commit changed package.json without updating bun.lock, so its lockfile still pinned next 16.2.3 while its manifest asked for 16.2.6. That is why bun install --frozen-lockfile fails on main — I hit it while reproducing #76's CI failure. Regenerated here, and --frozen-lockfile now passes.
Verified
bun run build green end to end on the merged tree:
Generated artifacts (content/, src/lib/eql-version.ts, CLI reference, stash fixture) are deliberately not committed — prebuild rebuilds them.
Note on #76
This unblocks #37, but does not by itself make #76 green. #76 targets main, and main will keep failing its build until #37 actually lands and carries #77's typedoc fix across. Once #37 merges, #76 should go green without changes.