Merge branch 'main' into feat/storybook-cli

apps/www/registry/default/ui/chart.tsx

@@ -69,7 +69,7 @@ ChartContainer.displayName = "Chart"
 
 const ChartStyle = ({ id, config }: { id: string; config: ChartConfig }) => {
   const colorConfig = Object.entries(config).filter(
-    ([_, config]) => config.theme || config.color
+    ([, config]) => config.theme || config.color
   )
 
   if (!colorConfig.length) {

apps/www/registry/new-york/ui/chart.tsx

@@ -69,7 +69,7 @@ ChartContainer.displayName = "Chart"
 
 const ChartStyle = ({ id, config }: { id: string; config: ChartConfig }) => {
   const colorConfig = Object.entries(config).filter(
-    ([_, config]) => config.theme || config.color
+    ([, config]) => config.theme || config.color
   )
 
   if (!colorConfig.length) {

packages/shadcn/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @shadcn/ui
 
+## 2.1.8
+
+### Patch Changes
+
+- [#6093](https://github.com/shadcn-ui/ui/pull/6093) [`c8fda09`](https://github.com/shadcn-ui/ui/commit/c8fda09a63f793e9e2e5a86d8f8faad5af9d1ab4) Thanks [@shadcn](https://github.com/shadcn)! - detect and use next version
+
 ## 2.1.7
 
 ### Patch Changes

packages/shadcn/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shadcn",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "description": "Add components to your apps.",
   "publishConfig": {
     "access": "public"

packages/shadcn/src/commands/add.ts

@@ -116,6 +116,7 @@ export const add = new Command()
           cwd: options.cwd,
           force: options.overwrite,
           srcDir: options.srcDir,
+          components: options.components,
         })
         if (!projectPath) {
           logger.break()

packages/shadcn/src/utils/create-project.ts

@@ -1,22 +1,49 @@
 import path from "path"
 import { initOptionsSchema } from "@/src/commands/init"
 import { getPackageManager } from "@/src/utils/get-package-manager"
+import { handleError } from "@/src/utils/handle-error"
 import { highlighter } from "@/src/utils/highlighter"
 import { logger } from "@/src/utils/logger"
+import { fetchRegistry } from "@/src/utils/registry"
 import { spinner } from "@/src/utils/spinner"
 import { execa } from "execa"
 import fs from "fs-extra"
 import prompts from "prompts"
 import { z } from "zod"
 
 export async function createProject(
-  options: Pick<z.infer<typeof initOptionsSchema>, "cwd" | "force" | "srcDir">
+  options: Pick<
+    z.infer<typeof initOptionsSchema>,
+    "cwd" | "force" | "srcDir" | "components"
+  >
 ) {
   options = {
     srcDir: false,
     ...options,
   }
 
+  let nextVersion = "14.2.16"
+
+  const isRemoteComponent =
+    options.components?.length === 1 &&
+    !!options.components[0].match(/\/chat\/b\//)
+  if (options.components && isRemoteComponent) {
+    try {
+      const [result] = await fetchRegistry(options.components)
+      const { meta } = z
+        .object({
+          meta: z.object({
+            nextVersion: z.string(),
+          }),
+        })
+        .parse(result)
+      nextVersion = meta.nextVersion
+    } catch (error) {
+      logger.break()
+      handleError(error)
+    }
+  }
+
   if (!options.force) {
     const { proceed } = await prompts({
       type: "confirm",
@@ -93,10 +120,14 @@ export async function createProject(
     `--use-${packageManager}`,
   ]
 
+  if (nextVersion.startsWith("15")) {
+    args.push("--turbopack")
+  }
+
   try {
     await execa(
       "npx",
-      ["create-next-app@14.2.16", projectPath, "--silent", ...args],
+      [`create-next-app@${nextVersion}`, projectPath, "--silent", ...args],
       {
         cwd: options.cwd,
       }

packages/shadcn/src/utils/registry/index.ts

@@ -170,7 +170,7 @@ export async function getItemTargetPath(
   )
 }
 
-async function fetchRegistry(paths: string[]) {
+export async function fetchRegistry(paths: string[]) {
   try {
     const results = await Promise.all(
       paths.map(async (path) => {