Skip to content

chore: merge master back into develop after 6.1.1 - #342

Merged
adrienlacombe merged 86 commits into
developfrom
claude/merge-master-into-develop
Oct 21, 2026
Merged

adrienlacombe merged 86 commits into
developfrom
claude/merge-master-into-develop

Conversation

@adrienlacombe

@adrienlacombe adrienlacombe commented Oct 21, 2026 •

Copy link
Copy Markdown
Collaborator

Summary

Brings develop back in line with master after #340 and #341 published 6.1.1 to latest. develop is already an ancestor of master, so the only differences are release bookkeeping:

  • Package versions: 6.0.x → master's versions. wallets, discovery, virtual-wallet and wallet-standard go to 6.1.1; core, modal and ui go to 6.1.0. The private docs package goes to 0.0.11.
  • CHANGELOGs: add the 6.1.0 GA and 6.1.1 entries.
  • Changesets: none pending, because Master branch version bump #341 used up the sync changesets.

There are no source, dependency or lockfile changes. After this, develop and master have identical trees, and the next develop release will be numbered from 6.1.x instead of 6.0.x.

Notes for merging

  • Merge with a merge commit, not squash or rebase. That keeps master's history in develop, so the next develop→master promotion doesn't hit these version and changelog conflicts again.
  • The release action on develop should publish nothing. There are no changesets, and the 6.1.x versions are already on npm. Before merging, check that npm view @starknet-io/get-starknet-discovery@6.1.1 resolves. Otherwise publish:next could try to republish a version npm is still processing.
  • The next dist-tag will still point at 6.0.x, which is below latest, until develop's next release. To fix it sooner, a maintainer can run npm dist-tag add <pkg>@6.1.1 next (or @6.1.0 for core, modal and ui).

Test plan

  • Same tree as master at 8961ea8, where the release workflow's build and test passed (run)
  • Diff against develop is limited to version fields and changelogs (16 files)

🤖 Generated with Claude Code

tudorpintea999 and others added 30 commits November 12, 2023 22:23
feat: support okx wallet ext download
style: format packages/core/src/discovery.ts
fix: use windowObject instead of window to prevent ssr breaking
github-actions Bot and others added 27 commits January 20, 2025 16:04
Change stable release to v4
Add Xverse to get-starknet discovery list
[codex] Backport npm trusted publishing to master
Supersede the v4 line on master with the v6 codebase. Keeps develop's
tree in full; records master as merged so master fast-forwards cleanly.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Promote v6 to master (6.1.0 GA)
Brings master (6.1.0 GA, cut from develop at #318) up to date with
develop: types-js 0.10.4, Noble/Scure 2.x (drops viem), Bramble wallet,
and the Dependabot security fixes (#339).

Conflicts were limited to package versions and changelogs: packages keep
master's 6.1.0; changelogs keep both branches' entries; private docs
package takes develop's 0.0.10.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Develop's changesets were consumed when publishing to `next`, so
re-declare them here so master's release publishes 6.1.1 to `latest`.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
chore: sync develop into master (release 6.1.1 to latest)
@adrienlacombe
adrienlacombe merged commit 98234bf into develop Oct 21, 2026
4 checks passed
@adrienlacombe
adrienlacombe deleted the claude/merge-master-into-develop branch October 21, 2026 10:54
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.