Skip to content

[pull] main from shadcn-ui:main - #504

Merged
pull[bot] merged 6 commits into
code:mainfrom
shadcn-ui:main
Aug 13, 2026
Merged

[pull] main from shadcn-ui:main#504
pull[bot] merged 6 commits into
code:mainfrom
shadcn-ui:main

Conversation

@pull

@pull pull Bot commented Aug 13, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

Grafikart and others added 6 commits August 13, 2026 21:45
…#11501)

- getRegistriesConfig now merges registries from both package.json and
  components.json, with components.json taking precedence per key.
- registry add now writes to package.json when components.json is not
  present, mirroring how registries are resolved.
* fix: ignore errors on glob

* fix: add error suppression for workspace and migration scans

* fix(shadcn): add suppressErrors to migration glob scans

---------

Co-authored-by: Jonathan <contact@grafikart.fr>
Co-authored-by: Jonathan <395137+Grafikart@users.noreply.github.com>
…#11502)

ensureRegistriesInConfig now checks package.json registries before
falling back to the registries index. Registries declared in
package.json are merged into the config in memory and never persisted
to components.json: the components.json write is built from the file
on disk, and init only persists registries discovered from the index.
Generated with [Devin](https://devin.ai)

Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: shadcn <m@shadcn.com>
@pull pull Bot locked and limited conversation to collaborators Aug 13, 2026
@pull pull Bot added the ⤵️ pull label Aug 13, 2026
@pull
pull Bot merged commit d4fc45b into code:main Aug 13, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants