Skip to content

chore: sync develop into master (release 6.1.1 to latest) - #340

Merged
adrienlacombe merged 23 commits into
masterfrom
claude/sync-develop-into-master
Oct 21, 2026
Merged

adrienlacombe merged 23 commits into
masterfrom
claude/sync-develop-into-master

Conversation

@adrienlacombe

Copy link
Copy Markdown
Collaborator

Summary

#319 promoted v6 to master (6.1.0 on latest), but it was cut from develop at #318 in July. Everything merged to develop since then has only been published under next. This PR merges develop into master and re-adds changesets so the release action publishes that work to latest.

What master gains

After the merge, the tree is identical to develop apart from package versions and changelogs.

Conflict resolution

Conflicts were limited to package.json versions and CHANGELOG.md files:

  • Published packages keep master's 6.1.0.
  • Changelogs keep entries from both branches. The 6.0.x entries published to next sit below 6.1.0.
  • The private docs package takes develop's 0.0.10.

Changesets

Develop's changesets were used up when those versions were published to next, so a plain merge would release nothing. These three changesets copy develop's originals, with the same bump types and wording:

Changeset Packages Bump
Add Bramble wallets patch
types-js 0.10.4 discovery, virtual-wallet, wallet-standard patch
Noble/Scure 2.x virtual-wallet, wallet-standard patch

changeset status → wallets, discovery, virtual-wallet, wallet-standard → 6.1.1 (not yet on npm). core, modal and ui stay at 6.1.0 because their workspace:^ ranges still match.

After merge

  1. Merge the "Master branch version bump" PR that the release action opens. That publishes 6.1.1 to latest.
  2. Merge master back into develop so develop picks up the 6.1.x versions. Otherwise develop's next next release would compute from 6.0.x, below latest.

Test plan

  • pnpm format:check
  • pnpm build, including the docs site
  • pnpm typecheck
  • pnpm test: 50/50 pass
  • pnpm changeset status: only the four packages above go to 6.1.1

🤖 Generated with Claude Code

adrienlacombe and others added 23 commits July 29, 2026 11:11
Pin the catalog to 0.10.4-beta.1 (current npm beta tag, labelled rc0
upstream). Additive-only over 0.10.3 in wallet-api: new STRK20
sub-account types (STRK20_DAPP_NAME, STRK20_COLLECT_POLICY,
STRK20_SUBACCOUNT_INVOKE_ACTION widening the STRK20_ACTION union) and a
new wallet_strk20SubaccountCommitment method.

No source changes needed: RequestFn is generic over RpcTypeToMessageMap,
so new methods propagate without per-method registration, and nothing in
the repo constructs or narrows a STRK20_ACTION. constants.d.ts and
errors.d.ts are unchanged upstream. Typecheck, build, and tests pass
across all packages.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
…eta-2

chore: update @starknet-io/types-js to 0.10.4-beta.2
chore: upgrade Noble and Scure dependencies to 2.x
Release @starknet-io/types-js 0.10.4 consumer updates to the next tag.
Add Bramble (window.starknet_bramble, id "bramble") to the discoverable
wallets list with its Chrome Web Store link and announced icon.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…et-discovery-0bc83c

feat(wallets): add Bramble wallet
- catalog: vitest ^3.2.6 -> ^4.1.12 (fixes vitest/@vitest/mocker path
  traversal; drops vulnerable tinypool)
- overrides: katex >=0.18.2 and toml >=4.2.0, whose fixes are outside
  mermaid's / vocs' declared ranges (docs site only)
- lockfile: in-range bumps for hono, @hono/node-server, compression,
  dompurify, mermaid, react-router, vite 7/8, esbuild, postcss, nanoid,
  source-map-js, browserslist, baseline-browser-mapping, fast-uri, js-yaml

No published package's runtime dependencies change.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…r-2d351d

chore(deps): patch Dependabot security alerts
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>
@adrienlacombe
adrienlacombe merged commit 46e7b00 into master Oct 21, 2026
4 checks passed
@adrienlacombe
adrienlacombe deleted the claude/sync-develop-into-master branch October 21, 2026 10:45
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