From b5e5d2b91d4ccb2ad7df426861dd4b7a22b97bfc Mon Sep 17 00:00:00 2001
From: shadcn <m@shadcn.com>
Date: Thu, 29 Aug 2024 13:25:55 +0400
Subject: [PATCH] fix: spinner

---
 packages/cli/src/commands/init.ts                           | 6 +++---
 packages/cli/src/utils/create-project.ts                    | 6 +++---
 packages/cli/src/utils/updaters/update-tailwind-config.ts   | 1 -
 .../__snapshots__/registry-resolve-items-tree.test.ts.snap  | 6 ++++++
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/cli/src/commands/init.ts b/packages/cli/src/commands/init.ts
index 04cd441f24..c0dac1e104 100644
--- a/packages/cli/src/commands/init.ts
+++ b/packages/cli/src/commands/init.ts
@@ -19,8 +19,8 @@ import { handleError } from "@/src/utils/handle-error"
 import { highlighter } from "@/src/utils/highlighter"
 import { logger } from "@/src/utils/logger"
 import { getRegistryBaseColors, getRegistryStyles } from "@/src/utils/registry"
+import { spinner } from "@/src/utils/spinner"
 import { Command } from "commander"
-import ora from "ora"
 import prompts from "prompts"
 import { z } from "zod"
 
@@ -108,10 +108,10 @@ export async function runInit(
   }
 
   // Write components.json.
-  const spinner = ora(`Writing components.json.`).start()
+  const componentSpinner = spinner(`Writing components.json.`).start()
   const targetPath = path.resolve(options.cwd, "components.json")
   await fs.writeFile(targetPath, JSON.stringify(config, null, 2), "utf8")
-  spinner.succeed()
+  componentSpinner.succeed()
 
   // Add components.
   const fullConfig = await resolveConfigPaths(options.cwd, config)
diff --git a/packages/cli/src/utils/create-project.ts b/packages/cli/src/utils/create-project.ts
index e94dffbee4..6de9bf7679 100644
--- a/packages/cli/src/utils/create-project.ts
+++ b/packages/cli/src/utils/create-project.ts
@@ -3,9 +3,9 @@ import { initOptionsSchema } from "@/src/commands/init"
 import { getPackageManager } from "@/src/utils/get-package-manager"
 import { highlighter } from "@/src/utils/highlighter"
 import { logger } from "@/src/utils/logger"
+import { spinner } from "@/src/utils/spinner"
 import { execa } from "execa"
 import fs from "fs-extra"
-import ora from "ora"
 import prompts from "prompts"
 import { z } from "zod"
 
@@ -71,7 +71,7 @@ export async function createProject(
     process.exit(1)
   }
 
-  const spinner = ora(`Creating a new Next.js project.`).start()
+  const createSpinner = spinner(`Creating a new Next.js project.`).start()
 
   // Note: pnpm fails here. Fallback to npx with --use-PACKAGE-MANAGER.
   const args = [
@@ -100,7 +100,7 @@ export async function createProject(
     process.exit(1)
   }
 
-  spinner.succeed()
+  createSpinner?.succeed()
 
   return {
     projectPath,
diff --git a/packages/cli/src/utils/updaters/update-tailwind-config.ts b/packages/cli/src/utils/updaters/update-tailwind-config.ts
index 7f2813988c..cdcffda75a 100644
--- a/packages/cli/src/utils/updaters/update-tailwind-config.ts
+++ b/packages/cli/src/utils/updaters/update-tailwind-config.ts
@@ -6,7 +6,6 @@ import { highlighter } from "@/src/utils/highlighter"
 import { registryItemTailwindSchema } from "@/src/utils/registry/schema"
 import { spinner } from "@/src/utils/spinner"
 import deepmerge from "deepmerge"
-import ora from "ora"
 import objectToString from "stringify-object"
 import { type Config as TailwindConfig } from "tailwindcss"
 import {
diff --git a/packages/cli/test/utils/schema/__snapshots__/registry-resolve-items-tree.test.ts.snap b/packages/cli/test/utils/schema/__snapshots__/registry-resolve-items-tree.test.ts.snap
index 796491400c..5c734cd982 100644
--- a/packages/cli/test/utils/schema/__snapshots__/registry-resolve-items-tree.test.ts.snap
+++ b/packages/cli/test/utils/schema/__snapshots__/registry-resolve-items-tree.test.ts.snap
@@ -52,6 +52,7 @@ Label.displayName = LabelPrimitive.Root.displayName
 export { Label }
 ",
       "path": "ui/label.tsx",
+      "target": "",
       "type": "registry:ui",
     },
     {
@@ -155,6 +156,7 @@ Button.displayName = "Button"
 export { Button, buttonVariants }
 ",
       "path": "ui/button.tsx",
+      "target": "",
       "type": "registry:ui",
     },
   ],
@@ -231,6 +233,7 @@ Button.displayName = "Button"
 export { Button, buttonVariants }
 ",
       "path": "ui/button.tsx",
+      "target": "",
       "type": "registry:ui",
     },
     {
@@ -261,6 +264,7 @@ Input.displayName = "Input"
 export { Input }
 ",
       "path": "ui/input.tsx",
+      "target": "",
       "type": "registry:ui",
     },
     {
@@ -421,6 +425,7 @@ export {
 }
 ",
       "path": "ui/command.tsx",
+      "target": "",
       "type": "registry:ui",
     },
     {
@@ -548,6 +553,7 @@ export {
 }
 ",
       "path": "ui/dialog.tsx",
+      "target": "",
       "type": "registry:ui",
     },
   ],