Skip to content

chore: back-merge master into develop before the release - #20

Merged
tkgstrator merged 5 commits into
developfrom
chore/backmerge-master
Sep 2, 2026
Merged

chore: back-merge master into develop before the release#20
tkgstrator merged 5 commits into
developfrom
chore/backmerge-master

Conversation

@tkgstrator

Copy link
Copy Markdown
Contributor

Unblocks the release PR #19, which GitHub reports as conflicting.

The dependency update (#10) was merged straight into master, so develop never received
it. Four files diverged: package.json, bun.lock, biome.json, .devcontainer/devcontainer.json.

One thing worth flagging

Git's automatic merge resolved package.json to master's 0.3.0, silently discarding the
0.4.0 set for this release. Left alone, the release would have shipped the version that is
already out, and the tag step would have refused it. Restored to 0.4.0.

Everything else is taken as-is from master: the AI SDK held at its current major, Biome on
the 2.5 config, devcontainer Node 26.8.1.

Test plan

  • bun install against the merged lockfile
  • bun run typecheck — clean
  • bun run lint — no errors
  • bun run test — 721 pass / 0 fail
  • bun run build — succeeds

tkgstrator and others added 5 commits August 31, 2026 02:17
chore: release v0.2.0
chore: release v0.2.3
chore: release v0.2.4
…ts current major (#10)

The generated bump took ai across two majors and did not compile; ai and
@ai-sdk/* stay where they are and the rest of the update lands. Also migrates
biome.json to the 2.5 schema and formats devcontainer.json.
The dependency update went to master directly, so develop never received it and
the release PR would not merge. This brings it back: the held-back AI SDK pins,
the Biome 2.5 config, and the devcontainer Node bump.

The auto-merge resolved package.json to master's 0.3.0, which would have
released the version that is already out. Set back to 0.4.0.

Co-Authored-By: Claude <noreply@anthropic.com>
@tkgstrator
tkgstrator merged commit 67ae881 into develop Sep 2, 2026
9 of 10 checks passed
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