Skip to content

Commit 87afbf1

Browse files
committed
Merge remote-tracking branch 'origin/upstream'
2 parents 7fbdebb + d28e02b commit 87afbf1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1917
-518
lines changed

.changeset/tidy-crabs-count.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

apps/v4/components/github-link.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export function GitHubLink() {
1111
<Button asChild size="sm" variant="ghost" className="h-8 shadow-none">
1212
<Link href={siteConfig.links.github} target="_blank" rel="noreferrer">
1313
<Icons.gitHub />
14-
<React.Suspense fallback={<Skeleton className="h-4 w-8" />}>
14+
<React.Suspense fallback={<Skeleton className="h-4 w-[42px]" />}>
1515
<StarsCount />
1616
</React.Suspense>
1717
</Link>

apps/v4/content/docs/(root)/changelog.mdx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,7 @@ Blocks 是开源的。GitHub 上可查源码。可在项目中使用、定制并
10051005

10061006
### Drawer
10071007

1008-
基于 [Vaul](https://github.com/emilkowalski/vaul),由 [emilkowalski\_](https://twitter.com/emilkowalski_) 开发。
1008+
基于 [Vaul](https://github.com/emilkowalski/vaul),由 [emilkowalski](https://twitter.com/emilkowalski) 开发。
10091009

10101010
试着在手机打开抽屉,特别棒!
10111011

@@ -1027,7 +1027,7 @@ Blocks 是开源的。GitHub 上可查源码。可在项目中使用、定制并
10271027

10281028
### Sonner
10291029

1030-
另一款由 [emilkowalski\_](https://twitter.com/emilkowalski_) 开发的终极吐司组件。现集成于 shadcn/ui。
1030+
另一款由 [emilkowalski](https://twitter.com/emilkowalski) 开发的终极吐司组件。现集成于 shadcn/ui。
10311031

10321032
<ComponentPreview name="sonner-demo" />
10331033

@@ -1412,4 +1412,4 @@ const buttonVariants = cva({
14121412

14131413
### 感谢
14141414

1415-
感谢所有使用、反馈和贡献本项目的朋友们,感谢🙏
1415+
感谢所有使用、反馈和贡献本项目的朋友们,感谢🙏

apps/v4/content/docs/(root)/figma.mdx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ description: Figma 中重新创建的每个组件。支持可自定义属性、
77
**注意:** Figma 文件由社区贡献。如果您有任何问题或反馈,请联系 Figma 文件维护者。
88
</Callout>
99

10-
## 付费
10+
## 免费
1111

12-
- [shadcn/ui 组件包](https://shadcndesign.com)[Matt Wierzbicki](https://x.com/matsugfx) 提供 - 一个高级、始终保持最新的 Figma UI 组件包 - 兼容 shadcn/ui 并优化设计到开发的无缝交接。
13-
- [Shadcraft UI Kit](https://shadcraft.com) - 最先进的支持 shadcn 兼容的组件包,支持通过 [tweakcn](https://tweakcn.com) 实现即时换肤,包含专业组件和模板库,完整覆盖 shadcn 组件和块
12+
- [Obra shadcn/ui](https://www.figma.com/community/file/1514746685758799870/obra-shadcn-ui)[Obra Studio](https://obra.studio/) 提供 - 精心打造的套件,采用 shadcn 哲学设计,跟踪 v4,MIT 许可
13+
- [shadcn/ui 设计系统](https://www.figma.com/community/file/1203061493325953101)[Pietro Schirano](https://twitter.com/skirano) 提供 - shadcn/ui 的设计伴侣。每个组件都经过精心制作,完美匹配代码实现
1414

15-
## 免费
15+
## 付费
1616

17-
- [shadcn/ui 设计系统](https://www.figma.com/community/file/1203061493325953101)[Pietro Schirano](https://twitter.com/skirano) 提供 - shadcn/ui 的设计辅助工具。每个组件经过精心打造,完美契合代码实现。
18-
- [Obra shadcn/ui](https://www.figma.com/community/file/1514746685758799870/obra-shadcn-ui)[Obra Studio](https://obra.studio/) 提供 - 精心设计的组件包,基于 shadcn 的设计理念,追踪 v4 版本,使用 MIT 许可证。
17+
- [shadcn/ui kit](https://shadcndesign.com)[Matt Wierzbicki](https://x.com/matsugfx) 提供 - Figma 的高级、始终保持最新的 UI 套件 - 兼容 shadcn/ui 并优化设计到开发的流畅交接。
18+
- [Shadcraft UI Kit](https://shadcraft.com) - 最先进的 shadcn 兼容套件,通过 [tweakcn](https://tweakcn.com) 实现即时主题切换,拥有专业组件和模板库,全面覆盖 shadcn 组件和区块。
19+
- [shadcn/studio UI Kit](https://shadcnstudio.com/figma) - 通过兼容 shadcn/ui 的 Figma 套件加速设计与开发,包含更新的组件、550+ 区块、10+ 模板、20+ 主题,以及可将设计转换为 shadcn/ui 代码的 AI 工具。

apps/v4/content/docs/(root)/mcp.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ shadcn MCP 服务器即开即用,支持所有 shadcn 兼容的注册表。
182182

183183
```json title=".vscode/mcp.json" showLineNumbers
184184
{
185-
"mcpServers": {
185+
"servers": {
186186
"shadcn": {
187187
"command": "npx",
188188
"args": ["shadcn@latest", "mcp"]

apps/v4/content/docs/components/drawer.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ links:
1010

1111
## 关于
1212

13-
抽屉组件基于 [Vaul](https://github.com/emilkowalski/vaul)[emilkowalski\_](https://twitter.com/emilkowalski_) 构建。
13+
抽屉组件基于 [Vaul](https://github.com/emilkowalski/vaul)[emilkowalski](https://twitter.com/emilkowalski) 构建。
1414

1515
## 安装
1616

apps/v4/content/docs/components/sonner.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ links:
1010

1111
## 关于
1212

13-
Sonner 由 [emilkowalski\_](https://twitter.com/emilkowalski_) 创建并维护。
13+
Sonner 由 [emilkowalski](https://twitter.com/emilkowalski) 创建并维护。
1414

1515
## 安装
1616

apps/v4/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"lodash": "^4.17.21",
7979
"lucide-react": "0.474.0",
8080
"motion": "^12.12.1",
81-
"next": "16.0.0",
81+
"next": "16.0.7",
8282
"next-themes": "0.4.6",
8383
"nuqs": "^2.7.2",
8484
"postcss": "^8.5.1",
@@ -91,7 +91,7 @@
9191
"recharts": "2.15.1",
9292
"rehype-pretty-code": "^0.14.1",
9393
"rimraf": "^6.0.1",
94-
"shadcn": "3.5.0",
94+
"shadcn": "3.5.2",
9595
"shiki": "^1.10.1",
9696
"sonner": "^2.0.0",
9797
"tailwind-merge": "^3.0.1",

apps/v4/public/r/registries.json

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
{
22
"@8bitcn": "https://8bitcn.com/r/{name}.json",
33
"@97cn": "https://97cn.itzik.co/r/{name}.json",
4+
"@abstract": "https://build.abs.xyz/r/{name}/json",
5+
"@abui": "https://abui.io/r/{name}.json",
46
"@aceternity": "https://ui.aceternity.com/registry/{name}.json",
57
"@aevr": "https://ui.aevr.space/r/{name}.json",
8+
"@ai-blocks": "https://webllm.org/r/{name}.json",
69
"@ai-elements": "https://registry.ai-sdk.dev/{name}.json",
710
"@alexcarpenter": "https://ui.alexcarpenter.me/r/{name}.json",
811
"@algolia": "https://sitesearch.algolia.com/r/{name}.json",
@@ -23,12 +26,15 @@
2326
"@creative-tim": "https://www.creative-tim.com/ui/r/{name}.json",
2427
"@cult-ui": "https://cult-ui.com/r/{name}.json",
2528
"@diceui": "https://diceui.com/r/{name}.json",
29+
"@doras-ui": "https://ui.doras.to/r/{name}.json",
2630
"@efferd": "https://efferd.com/r/{name}.json",
2731
"@eldoraui": "https://eldoraui.site/r/{name}.json",
2832
"@elements": "https://tryelements.dev/r/{name}.json",
2933
"@elevenlabs-ui": "https://ui.elevenlabs.io/r/{name}.json",
3034
"@fancy": "https://fancycomponents.dev/r/{name}.json",
3135
"@formcn": "https://formcn.dev/r/{name}.json",
36+
"@gaia": "https://ui.heygaia.io/r/{name}.json",
37+
"@glass-ui": "https://glass-ui.crenspire.com/r/{name}.json",
3238
"@heseui": "https://www.heseui.com/r/{name}.json",
3339
"@hooks": "https://shadcn-hooks.vercel.app/r/{name}.json",
3440
"@intentui": "https://intentui.com/r/{name}",
@@ -37,19 +43,22 @@
3743
"@kokonutui": "https://kokonutui.com/r/{name}.json",
3844
"@lens-blocks": "https://lensblocks.com/r/{name}.json",
3945
"@limeplay": "https://limeplay.winoffrg.dev/r/{name}.json",
46+
"@lucide-animated": "https://lucide-animated.com/r/{name}.json",
4047
"@lytenyte": "https://www.1771technologies.com/r/{name}.json",
4148
"@magicui": "https://magicui.design/r/{name}.json",
4249
"@magicui-pro": "https://pro.magicui.design/registry/{name}",
4350
"@motion-primitives": "https://motion-primitives.com/c/{name}.json",
4451
"@mui-treasury": "https://mui-treasury.com/r/{name}.json",
4552
"@nativeui": "https://nativeui.io/registry/{name}.json",
53+
"@nexus-elements": "https://elements.nexus.availproject.org/r/{name}.json",
4654
"@ncdai": "https://chanhdai.com/r/{name}.json",
4755
"@nuqs": "https://nuqs.dev/r/{name}.json",
4856
"@oui": "https://oui.mw10013.workers.dev/r/{name}.json",
4957
"@paceui": "https://ui.paceui.com/r/{name}.json",
5058
"@plate": "https://platejs.org/r/{name}.json",
5159
"@prompt-kit": "https://prompt-kit.com/c/{name}.json",
5260
"@prosekit": "https://prosekit.dev/r/{name}.json",
61+
"@phucbm": "https://ui.phucbm.com/r/{name}.json",
5362
"@react-bits": "https://reactbits.dev/r/{name}.json",
5463
"@react-market": "https://www.react-market.com/get/{name}.json",
5564
"@retroui": "https://retroui.dev/r/{name}.json",
@@ -64,6 +73,7 @@
6473
"@shadcn-studio": "https://shadcnstudio.com/r/{name}.json",
6574
"@shadcnblocks": "https://shadcnblocks.com/r/{name}.json",
6675
"@shadcnui-blocks": "https://shadcnui-blocks.com/r/{name}.json",
76+
"@shadcraft": "https://shadcraft-free.vercel.app/r/{name}.json",
6777
"@simple-ai": "https://simple-ai.dev/r/{name}.json",
6878
"@skiper-ui": "https://skiper-ui.com/registry/{name}.json",
6979
"@skyr": "https://ui-play.skyroc.me/r/{name}.json",
@@ -72,6 +82,8 @@
7282
"@supabase": "https://supabase.com/ui/r/{name}.json",
7383
"@svgl": "https://svgl.app/r/{name}.json",
7484
"@tailark": "https://tailark.com/r/{name}.json",
85+
"@tailwind-admin": "https://tailwind-admin.com/r/{name}.json",
86+
"@tailwind-builder": "https://tailwindbuilder.ai/r/{name}.json",
7587
"@tweakcn": "https://tweakcn.com/r/themes/{name}.json",
7688
"@wds": "https://wds-shadcn-registry.netlify.app/r/{name}.json",
7789
"@wandry-ui": "https://ui.wandry.com.ua/r/{name}.json",
@@ -85,5 +97,12 @@
8597
"@utilcn": "https://utilcn.dev/r/{name}.json",
8698
"@hextaui": "https://hextaui.com/r/{name}.json",
8799
"@taki": "https://taki-ui.com/r/{name}.json",
88-
"@square-ui": "https://square.lndev.me/registry/{name}.json"
100+
"@square-ui": "https://square.lndev.me/registry/{name}.json",
101+
"@moleculeui": "https://moleculeui.design/r/{name}.json",
102+
"@uicapsule": "https://uicapsule.com/r/{name}.json",
103+
"@uitripled": "https://ui.tripled.work/r/{name}.json",
104+
"@ui-layouts": "https://ui-layouts.com/r/{name}.json",
105+
"@tour": "https://onboarding-tour.vercel.app/r/{name}.json",
106+
"@tb-blocks": "https://tailwindbuilder.ai/r/blocks/{name}.json",
107+
"@ui-layouts": "https://ui-layouts.com/r/{name}.json"
89108
}

0 commit comments

Comments
 (0)