Merge branch 'main' into fix/laravel-init

2026-06-15 03:41:33 +00:00 · 2026-03-08 11:01:25 +02:00
parent c1b92c3175 8dabe113fa
commit 6909385aea
19 changed files with 74 additions and 31 deletions
--- a/apps/v4/app/(create)/components/project-form.tsx
+++ b/apps/v4/app/(create)/components/project-form.tsx
@@ -80,10 +80,11 @@ export function ProjectForm({

  const commands = React.useMemo(() => {
    const presetFlag = ` --preset ${presetCode}`
+    const baseFlag = params.base !== "radix" ? ` --base ${params.base}` : ""
    const templateFlag = ` --template ${framework}`
    const monorepoFlag = isMonorepo ? " --monorepo" : ""
    const rtlFlag = params.rtl ? " --rtl" : ""
-    const flags = `${presetFlag}${templateFlag}${monorepoFlag}${rtlFlag}`
+    const flags = `${presetFlag}${baseFlag}${templateFlag}${monorepoFlag}${rtlFlag}`

    return IS_LOCAL_DEV && !process.env.NEXT_PUBLIC_RC
      ? {
@@ -98,7 +99,7 @@ export function ProjectForm({
          yarn: `yarn dlx shadcn${SHADCN_VERSION} init${flags}`,
          bun: `bunx --bun shadcn${SHADCN_VERSION} init${flags}`,
        }
-  }, [framework, isMonorepo, params.rtl, presetCode])
+  }, [framework, isMonorepo, params.base, params.rtl, presetCode])

  const command = commands[packageManager]

--- a/apps/v4/content/docs/registry/registry-item-json.mdx
+++ b/apps/v4/content/docs/registry/registry-item-json.mdx
@@ -103,18 +103,20 @@ The `type` property is used to specify the type of your registry item. This is u

 The following types are supported:

-| Type                 | Description                                      |
-| -------------------- | ------------------------------------------------ |
-| `registry:block`     | Use for complex components with multiple files.  |
-| `registry:component` | Use for simple components.                       |
-| `registry:lib`       | Use for lib and utils.                           |
-| `registry:hook`      | Use for hooks.                                   |
-| `registry:ui`        | Use for UI components and single-file primitives |
-| `registry:page`      | Use for page or file-based routes.               |
-| `registry:file`      | Use for miscellaneous files.                     |
-| `registry:style`     | Use for registry styles. eg. `new-york`          |
-| `registry:theme`     | Use for themes.                                  |
-| `registry:item`      | Use for universal registry items.                |
+| Type                 | Description                                       |
+| -------------------- | ------------------------------------------------- |
+| `registry:base`      | Use for entire design systems.                    |
+| `registry:block`     | Use for complex components with multiple files.   |
+| `registry:component` | Use for simple components.                        |
+| `registry:font`      | Use for fonts.                                    |
+| `registry:lib`       | Use for lib and utils.                            |
+| `registry:hook`      | Use for hooks.                                    |
+| `registry:ui`        | Use for UI components and single-file primitives. |
+| `registry:page`      | Use for page or file-based routes.                |
+| `registry:file`      | Use for miscellaneous files.                      |
+| `registry:style`     | Use for registry styles. eg. `new-york`.          |
+| `registry:theme`     | Use for themes.                                   |
+| `registry:item`      | Use for universal registry items.                 |

 ### author

--- a/apps/v4/package.json
+++ b/apps/v4/package.json
@@ -76,7 +76,7 @@
    "rehype-pretty-code": "^0.14.1",
    "rimraf": "^6.0.1",
    "server-only": "^0.0.1",
-    "shadcn": "4.0.0",
+    "shadcn": "4.0.1",
    "shiki": "^1.10.1",
    "sonner": "^2.0.0",
    "swr": "^2.3.6",
--- a/apps/v4/public/r/registries.json
+++ b/apps/v4/public/r/registries.json
@@ -1,10 +1,4 @@
 [
-  {
-    "name": "@lmscn",
-    "homepage": "https://lmscn.vercel.app",
-    "url": "https://lmscn.vercel.app/r/{name}.json",
-    "description": "LMS components for building interactive learning experiences — quiz, flashcards, matching, fill-in-the-blank, word scramble, sequencing, reading comprehension, spaced repetition and more."
-  },
  {
    "name": "@8bitcn",
    "homepage": "https://www.8bitcn.com",
@@ -305,6 +299,12 @@
    "url": "https://limeplay.winoffrg.dev/r/{name}.json",
    "description": "Modern UI Library for building media players in React. Powered by Shaka Player."
  },
+  {
+    "name": "@lmscn",
+    "homepage": "https://lmscn.vercel.app",
+    "url": "https://lmscn.vercel.app/r/{name}.json",
+    "description": "LMS components for building interactive learning experiences — quiz, flashcards, matching, fill-in-the-blank, word scramble, sequencing, reading comprehension, spaced repetition and more."
+  },
  {
    "name": "@lucide-animated",
    "homepage": "https://lucide-animated.com",
@@ -832,5 +832,17 @@
    "homepage": "https://iconiqs.vercel.app",
    "url": "https://iconiqs.vercel.app/r/{name}.json",
    "description": "Iconiq is a collection of icons designed for web applications. It is a modern, clean, and minimalistic icon set that is perfect for web applications."
+  },
+  {
+    "name": "@fonttrio",
+    "homepage": "https://www.fonttrio.xyz",
+    "url": "https://www.fonttrio.xyz/r/{name}.json",
+    "description": "Curated font pairing registry for shadcn. Three fonts. One command. Install perfectly configured typography (heading + body + mono) with shadcn add. Includes editorial-grade type scales, CSS variables, and a live preview site."
+  },
+  {
+    "name": "@componentry",
+    "homepage": "https://componentry.fun",
+    "url": "https://componentry.fun/r/{name}.json",
+    "description": "Beautiful, interactive React + Tailwind components for modern product UIs."
  }
 ]
--- a/apps/v4/public/r/templates/astro-app.tar.gz
+++ b/apps/v4/public/r/templates/astro-app.tar.gz
--- a/apps/v4/public/r/templates/astro-monorepo.tar.gz
+++ b/apps/v4/public/r/templates/astro-monorepo.tar.gz
--- a/apps/v4/public/r/templates/next-app.tar.gz
+++ b/apps/v4/public/r/templates/next-app.tar.gz
--- a/apps/v4/public/r/templates/next-monorepo.tar.gz
+++ b/apps/v4/public/r/templates/next-monorepo.tar.gz
--- a/apps/v4/public/r/templates/react-router-app.tar.gz
+++ b/apps/v4/public/r/templates/react-router-app.tar.gz
--- a/apps/v4/public/r/templates/react-router-monorepo.tar.gz
+++ b/apps/v4/public/r/templates/react-router-monorepo.tar.gz
--- a/apps/v4/public/r/templates/start-app.tar.gz
+++ b/apps/v4/public/r/templates/start-app.tar.gz
--- a/apps/v4/public/r/templates/start-monorepo.tar.gz
+++ b/apps/v4/public/r/templates/start-monorepo.tar.gz
--- a/apps/v4/public/r/templates/vite-app.tar.gz
+++ b/apps/v4/public/r/templates/vite-app.tar.gz
--- a/apps/v4/public/r/templates/vite-monorepo.tar.gz
+++ b/apps/v4/public/r/templates/vite-monorepo.tar.gz
--- a/apps/v4/registry/directory.json
+++ b/apps/v4/registry/directory.json
@@ -1,11 +1,4 @@
 [
-  {
-    "name": "@lmscn",
-    "homepage": "https://lmscn.vercel.app",
-    "url": "https://lmscn.vercel.app/r/{name}.json",
-    "description": "LMS components for building interactive learning experiences — quiz, flashcards, matching, fill-in-the-blank, word scramble, sequencing, reading comprehension, spaced repetition and more.",
-    "logo": "<svg width=\"125\" height=\"125\" xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 400 90\" fill=\"none\" role=\"img\" aria-label=\"lmscn\"><g transform=\"translate(5,5)\"><path d=\"M 2,2 L 40,2 L 40,13 A 7,7 0 0,1 40,27 L 40,40 L 27,40 A 7,7 0 0,1 13,40 L 2,40 Z\" fill=\"#06b6d4\"/><path d=\"M 40,2 L 78,2 L 78,40 L 67,40 A 7,7 0 0,1 53,40 L 40,40 L 40,27 A 7,7 0 0,0 40,13 L 40,2 Z\" fill=\"#2563eb\"/><path d=\"M 2,40 L 13,40 A 7,7 0 0,0 27,40 L 40,40 L 40,53 A 7,7 0 0,1 40,67 L 40,78 L 2,78 Z\" fill=\"#f59e0b\"/><path d=\"M 40,40 L 53,40 A 7,7 0 0,0 67,40 L 78,40 L 78,78 L 40,78 L 40,67 A 7,7 0 0,0 40,53 L 40,40 Z\" fill=\"#8b5cf6\"/></g><text x=\"108\" y=\"80\" font-family=\"'DM Mono', 'Fira Code', ui-monospace, monospace\" font-weight=\"700\" font-size=\"64\" letter-spacing=\"-2\" fill=\"currentColor\">lmscn</text></svg>"
-  },
  {
    "name": "@8bitcn",
    "homepage": "https://www.8bitcn.com",
@@ -357,6 +350,13 @@
    "url": "https://limeplay.winoffrg.dev/r/{name}.json",
    "logo": "<svg xmlns='http://www.w3.org/2000/svg' viewBox='248.92 245.57 243.13 238.13'><path fill='var(--foreground)' d='M397.568 369.262c27.617.078 52.447-2.298 74.398 18.495 23.415 22.179 19.46 42.881 20.087 71.256l-.338.065c-3.665-2.027-12.027-11.519-15.515-15.004l-42.2-42.3q-17.386-17.186-36.432-32.512m-23.033 23.316c2.551 2.28 4.734 5.153 6.955 7.748q5.166 6.128 10.714 11.914c4.496 4.603 9.257 8.958 13.844 13.474l33.445 32.883c3.942 3.854 23.987 22 25.442 24.88-10.187.33-20.88.323-31.06-.258-17.994-1.025-32.831-8.672-44.752-22.171-12.9-14.607-14.79-31.744-14.856-50.467-.022-5.976-.092-12.04.268-18.003m-82.968-146.672a130 130 0 0 1 9.225-.34c18.421.013 34.481 5.638 47.565 18.9 20.827 21.111 18.957 44.541 18.68 71.783-2.439-2.843-5.093-5.526-7.662-8.254-12.933-13.759-26.76-26.688-40.247-39.898-14.263-13.97-28.241-28.195-42.73-41.935q7.586-.069 15.17-.256m161.313 17.662c3.514.126 7.045-.112 10.561-.144 9.31-.087 18.68-.232 27.983.105-5.955 5.27-11.465 11.148-17.189 16.673l-42.854 41.773c-6.323 6.18-12.487 12.94-19.188 18.68-3.967.852-8.483.507-12.543.502-8.624-.01-17.272-.354-25.89-.096 7.41-8.54 15.532-16.36 23.526-24.345l31.967-31.77q6.211-6.04 12.278-12.227c2.61-2.685 5.315-5.972 8.288-8.237.836-.637 2.051-.755 3.061-.914m-203.541 6.695c9.659 10.217 19.8 19.972 29.645 30.009 15.666 15.969 31.365 32.346 48.503 46.74 3.597 3.022 12.376 8.58 14.531 12.019-13.147.069-26.618.546-39.66-1.34-17.154-2.479-30.895-11.561-41.164-25.434-10.742-14.515-12.2-30.464-12.198-47.948.001-4.588-.323-9.51.343-14.046m78.014 116.444c4.605-.31 9.327-.08 13.948-.075l25.584.02c-19.013 19.47-38.82 38.283-58.421 57.166q-6.565 6.407-12.98 12.966c-2.425 2.45-4.845 5.22-7.62 7.278-5.649.827-11.798.43-17.515.339l-21.382-.221c4.733-5.283 10.086-10.137 15.12-15.137l30.084-29.846 22.484-22.392c3.262-3.232 6.797-7.69 10.698-10.098m160.9-78.485c1.14-.04 2.042-.036 2.952.684 1.386 5.214.558 14.208.538 19.74l-.074 32.96c-17.807-.794-35.786-.642-53.613-.752-2.584-.04-5.187.15-7.77.27a70 70 0 0 0 8.311-2.594c16.945-6.515 32.422-18.069 41.772-33.825 3.158-5.322 5.403-10.85 7.884-16.483M249.32 365.341q29.561-.259 59.121.02c-12.883 4.064-25.515 10.66-35.128 20.269-5.107 4.798-9.766 11.471-13.043 17.616-3.724 6.982-5.44 11.562-10.934 17.663-.274-18.506.001-37.057-.016-55.568m120.035 57.99c1.633 2.12 1.007 53.792 1.009 60.112l-56.072-.041-.742-.183c1.048-1.815 7.844-3.553 10.03-4.529 16.73-7.47 31.393-21.39 39.24-37.922 2.7-5.69 4.321-11.586 6.535-17.437m40.048-177.475c5.68.438 11.456.419 17.153.505q-6.27 1.47-12.115 4.169c-19.414 8.896-31.57 24.434-38.786 44.132q-1.86 5.667-3.206 11.478c-.51-3.507-1.266-6.936-1.606-10.474-1.576-16.383-.933-33.11-.803-49.551l22.7-.069c5.539.01 11.137.202 16.663-.19'/></svg>"
  },
+  {
+    "name": "@lmscn",
+    "homepage": "https://lmscn.vercel.app",
+    "url": "https://lmscn.vercel.app/r/{name}.json",
+    "description": "LMS components for building interactive learning experiences — quiz, flashcards, matching, fill-in-the-blank, word scramble, sequencing, reading comprehension, spaced repetition and more.",
+    "logo": "<svg width=\"125\" height=\"125\" xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 400 90\" fill=\"none\" role=\"img\" aria-label=\"lmscn\"><g transform=\"translate(5,5)\"><path d=\"M 2,2 L 40,2 L 40,13 A 7,7 0 0,1 40,27 L 40,40 L 27,40 A 7,7 0 0,1 13,40 L 2,40 Z\" fill=\"#06b6d4\"/><path d=\"M 40,2 L 78,2 L 78,40 L 67,40 A 7,7 0 0,1 53,40 L 40,40 L 40,27 A 7,7 0 0,0 40,13 L 40,2 Z\" fill=\"#2563eb\"/><path d=\"M 2,40 L 13,40 A 7,7 0 0,0 27,40 L 40,40 L 40,53 A 7,7 0 0,1 40,67 L 40,78 L 2,78 Z\" fill=\"#f59e0b\"/><path d=\"M 40,40 L 53,40 A 7,7 0 0,0 67,40 L 78,40 L 78,78 L 40,78 L 40,67 A 7,7 0 0,0 40,53 L 40,40 Z\" fill=\"#8b5cf6\"/></g><text x=\"108\" y=\"80\" font-family=\"'DM Mono', 'Fira Code', ui-monospace, monospace\" font-weight=\"700\" font-size=\"64\" letter-spacing=\"-2\" fill=\"currentColor\">lmscn</text></svg>"
+  },
  {
    "name": "@lucide-animated",
    "homepage": "https://lucide-animated.com",
@@ -972,5 +972,19 @@
    "url": "https://iconiqs.vercel.app/r/{name}.json",
    "description": "Iconiq is a collection of icons designed for web applications. It is a modern, clean, and minimalistic icon set that is perfect for web applications.",
    "logo": "<svg xmlns='http://www.w3.org/2000/svg' width='31' height='30' viewBox='0 0 31 30' fill='none'><path d='M30.8574 13.4209H25.0322V24.8223H17.4414L17.4961 26.2822C17.9462 26.0015 18.5219 25.8223 19.1543 25.7988C20.6429 25.744 21.8818 26.5719 21.9219 27.6484C21.96 28.6881 20.8658 29.576 19.4502 29.6855V29.6924L17.5859 29.7617C17.043 29.7816 16.5855 29.3565 16.5654 28.8135L16.5303 27.8643H16.5312C16.531 27.8588 16.5305 27.8531 16.5303 27.8477C16.5292 27.8173 16.5324 27.787 16.5332 27.7568L16.4229 24.8223H13.2686L13.1494 27.9941C13.1502 28.0242 13.1534 28.0546 13.1523 28.085C13.1521 28.0902 13.1517 28.0963 13.1514 28.1016H13.1523L13.1172 29.0518C13.097 29.5946 12.6395 30.0188 12.0967 29.999L10.2324 29.9297V29.9238C8.81666 29.8144 7.7226 28.9265 7.76074 27.8867C7.80082 26.8101 9.03966 25.9813 10.5283 26.0361C11.1608 26.0596 11.7364 26.2396 12.1865 26.5205L12.25 24.8223H4.72266L5.2832 13.4209H0L14.0205 0L30.8574 13.4209Z' fill='#EE4822'/><circle cx='10.4573' cy='14.5408' r='2.62989' fill='white'/><circle cx='17.5155' cy='14.5408' r='2.62989' fill='white'/><circle cx='10.6948' cy='14.88' r='0.763516' fill='black'/><circle cx='17.0064' cy='14.88' r='0.763516' fill='black'/></svg>"
+  },
+  {
+    "name": "@fonttrio",
+    "homepage": "https://www.fonttrio.xyz",
+    "url": "https://www.fonttrio.xyz/r/{name}.json",
+    "description": "Curated font pairing registry for shadcn. Three fonts. One command. Install perfectly configured typography (heading + body + mono) with shadcn add. Includes editorial-grade type scales, CSS variables, and a live preview site.",
+    "logo": "<svg width='64' height='64' viewBox='0 0 64 64' fill='none' xmlns='http://www.w3.org/2000/svg'><rect width='64' height='64' rx='8' fill='#141414'/><path d='M23.66 47.616C20.5507 47.616 18.204 46.868 16.62 45.372C15.0653 43.8467 14.288 41.2947 14.288 37.716V29.752H12.352V22.536C13.4667 22.536 14.3027 22.2573 14.86 21.7C15.4173 21.1133 15.696 20.3213 15.696 19.324V17.344H25.024V22.536H30.964V29.752H25.024V36.968C25.024 37.936 25.2293 38.6547 25.64 39.124C26.08 39.564 26.7253 39.784 27.576 39.784C28.6907 39.784 29.908 39.652 31.228 39.388V46.296C30.4067 46.6187 29.292 46.912 27.884 47.176C26.5053 47.4693 25.0973 47.616 23.66 47.616ZM43.5116 47.616C40.4022 47.616 38.0556 46.868 36.4716 45.372C34.9169 43.8467 34.1396 41.2947 34.1396 37.716V29.752H32.2036V22.536C33.3182 22.536 34.1542 22.2573 34.7116 21.7C35.2689 21.1133 35.5476 20.3213 35.5476 19.324V17.344H44.8756V22.536H50.8156V29.752H44.8756V36.968C44.8756 37.936 45.0809 38.6547 45.4916 39.124C45.9316 39.564 46.5769 39.784 47.4276 39.784C48.5422 39.784 49.7596 39.652 51.0796 39.388V46.296C50.2582 46.6187 49.1436 46.912 47.7356 47.176C46.3569 47.4693 44.9489 47.616 43.5116 47.616Z' fill='white'/><rect x='29.5' y='22.536' width='5' height='7.20545' fill='white'/><path d='M35.9548 43.8232C34.883 44.6496 31.2651 45.7749 31.2651 45.7749L31.1765 39.9152C31.1765 39.9152 34.6401 39.2419 36.8651 38.0282C38.2077 37.2959 38.9932 41.5015 38.9932 41.5015C38.9932 41.5015 36.9525 43.054 35.9548 43.8232Z' fill='white' stroke='white'/></svg>"
+  },
+  {
+    "name": "@componentry",
+    "homepage": "https://componentry.fun",
+    "url": "https://componentry.fun/r/{name}.json",
+    "description": "Beautiful, interactive React + Tailwind components for modern product UIs.",
+    "logo": "<svg xmlns='http://www.w3.org/2000/svg' width='32' height='32' viewBox='120 120 272 272' fill='currentColor'><path d='M120 160Q120 120 160 120H260Q300 120 300 160V220H352Q392 220 392 260V352Q392 392 352 392H260Q220 392 220 352V292H160Q120 292 120 252Z'/></svg>"
  }
 ]
--- a/apps/v4/scripts/build-registry.mts
+++ b/apps/v4/scripts/build-registry.mts
@@ -777,11 +777,17 @@ async function buildTemplates() {
            ".git",
            "--exclude",
            "pnpm-lock.yaml",
+            "--exclude",
+            "._*",
            "-C",
            templatesDir,
            name,
          ],
-          { cwd: process.cwd(), stdio: "pipe" }
+          {
+            cwd: process.cwd(),
+            stdio: "pipe",
+            env: { ...process.env, COPYFILE_DISABLE: "1" },
+          }
        )
        let stderr = ""
        proc.stderr?.on("data", (data) => (stderr += data))
--- a/packages/shadcn/CHANGELOG.md
+++ b/packages/shadcn/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @shadcn/ui

+## 4.0.1
+
+### Patch Changes
+
+- [#9896](https://github.com/shadcn-ui/ui/pull/9896) [`1ce9c2dd6a3d16422a6586e39632ebbccc45d3a4`](https://github.com/shadcn-ui/ui/commit/1ce9c2dd6a3d16422a6586e39632ebbccc45d3a4) Thanks [@shadcn](https://github.com/shadcn)! - fix apple metadata files in template
+
+- [#9897](https://github.com/shadcn-ui/ui/pull/9897) [`5edf9c95b7d13dcbd325aa4cf6b48d58a53b07c6`](https://github.com/shadcn-ui/ui/commit/5edf9c95b7d13dcbd325aa4cf6b48d58a53b07c6) Thanks [@shadcn](https://github.com/shadcn)! - fix fallback style resolving issue
+
 ## 4.0.0

 ### Major Changes
--- a/packages/shadcn/package.json
+++ b/packages/shadcn/package.json
@@ -1,6 +1,6 @@
 {
  "name": "shadcn",
-  "version": "4.0.0",
+  "version": "4.0.1",
  "description": "Add components to your apps.",
  "publishConfig": {
    "access": "public"
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -278,7 +278,7 @@ importers:
        specifier: ^0.0.1
        version: 0.0.1
      shadcn:
-        specifier: 4.0.0
+        specifier: 4.0.1
        version: link:../../packages/shadcn
      shiki:
        specifier: ^1.10.1