rayan/shadcn-ui
1
0
Fork 0
mirror of https://github.com/shadcn-ui/ui.git synced 2026-07-07 14:08:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into shadcn/rtl

Browse Source 
# Conflicts:
#	apps/v4/examples/base/ui/combobox.tsx
#	apps/v4/examples/base/ui/context-menu.tsx
#	apps/v4/examples/base/ui/dropdown-menu.tsx
#	apps/v4/examples/base/ui/hover-card.tsx
#	apps/v4/examples/base/ui/menubar.tsx
#	apps/v4/examples/base/ui/popover.tsx
#	apps/v4/examples/base/ui/select.tsx
#	apps/v4/examples/base/ui/tooltip.tsx
#	apps/v4/examples/radix/ui/menubar.tsx
#	apps/v4/examples/radix/ui/select.tsx
#	apps/v4/public/r/styles/base-lyra/context-menu.json
#	apps/v4/public/r/styles/base-lyra/dropdown-menu.json
#	apps/v4/public/r/styles/base-lyra/hover-card.json
#	apps/v4/public/r/styles/base-lyra/popover.json
#	apps/v4/public/r/styles/base-lyra/tooltip-example.json
#	apps/v4/public/r/styles/base-lyra/tooltip.json
#	apps/v4/public/r/styles/base-maia/context-menu.json
#	apps/v4/public/r/styles/base-maia/dropdown-menu.json
#	apps/v4/public/r/styles/base-maia/hover-card.json
#	apps/v4/public/r/styles/base-maia/popover.json
#	apps/v4/public/r/styles/base-maia/tooltip-example.json
#	apps/v4/public/r/styles/base-maia/tooltip.json
#	apps/v4/public/r/styles/base-mira/context-menu.json
#	apps/v4/public/r/styles/base-mira/dropdown-menu.json
#	apps/v4/public/r/styles/base-mira/hover-card.json
#	apps/v4/public/r/styles/base-mira/popover.json
#	apps/v4/public/r/styles/base-mira/tooltip-example.json
#	apps/v4/public/r/styles/base-mira/tooltip.json
#	apps/v4/public/r/styles/base-nova/context-menu.json
#	apps/v4/public/r/styles/base-nova/dropdown-menu.json
#	apps/v4/public/r/styles/base-nova/hover-card.json
#	apps/v4/public/r/styles/base-nova/popover.json
#	apps/v4/public/r/styles/base-nova/tooltip-example.json
#	apps/v4/public/r/styles/base-nova/tooltip.json
#	apps/v4/public/r/styles/base-vega/context-menu.json
#	apps/v4/public/r/styles/base-vega/dropdown-menu.json
#	apps/v4/public/r/styles/base-vega/hover-card.json
#	apps/v4/public/r/styles/base-vega/popover.json
#	apps/v4/public/r/styles/base-vega/tooltip-example.json
#	apps/v4/public/r/styles/base-vega/tooltip.json
#	apps/v4/public/r/styles/radix-mira/menubar.json
#	apps/v4/public/r/styles/radix-nova/menubar.json
#	apps/v4/registry/bases/base/examples/tooltip-example.tsx
#	apps/v4/registry/bases/base/ui/hover-card.tsx
#	apps/v4/registry/bases/base/ui/popover.tsx
#	apps/v4/registry/bases/base/ui/tooltip.tsx
This commit is contained in:
shadcn
2026-01-23 21:15:31 +04:00
parent 265953771f 267d45ac7a
commit 4c58d7701a
159 changed files with 1651 additions and 882 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/v4/scripts/build-registry.mts
View File

@@ -249,10 +249,7 @@ async function buildBases(bases: Base[]) {
// Transform import paths from base to style-specific paths.
// e.g., @/registry/bases/radix/ui/button -> @/registry/radix-nova/ui/button
transformedContent = transformedContent.replace(
new RegExp(
`@/registry/bases/${base.name}/`,
"g"
),
new RegExp(`@/registry/bases/${base.name}/`, "g"),
`@/registry/${base.name}-${style.name}/`
)
}