fix(cli): handling of base style for add command

from shadcn

Author: sadeghbarati

packages/cli/src/commands/add.ts

@@ -91,14 +91,20 @@ export const add = new Command()
       }
 
       let itemType: z.infer<typeof registryItemTypeSchema> | undefined
+      let shouldInstallBaseStyle = true
       if (components.length > 0) {
         const [registryItem] = await getRegistryItems([components[0]], {
           config: initialConfig,
         })
         itemType = registryItem?.type
+        shouldInstallBaseStyle
+          = itemType !== 'registry:theme' && itemType !== 'registry:style'
 
         if (isUniversalRegistryItem(registryItem)) {
-          await addComponents(components, initialConfig, options)
+          await addComponents(components, initialConfig, {
+            ...options,
+            baseStyle: shouldInstallBaseStyle,
+          })
           return
         }
 
@@ -171,11 +177,12 @@ export const add = new Command()
           force: true,
           defaults: false,
           skipPreflight: false,
-          silent: options.silent || !hasNewRegistries,
+          silent: options.silent && !hasNewRegistries,
           isNewProject: false,
           srcDir: options.srcDir,
           cssVariables: options.cssVariables,
-          baseStyle: itemType !== 'registry:theme',
+          baseStyle: shouldInstallBaseStyle,
+          baseColor: shouldInstallBaseStyle ? undefined : 'neutral',
           components: options.components,
         })
       }
@@ -238,7 +245,7 @@ export const add = new Command()
       if (!initHasRun) {
         await addComponents(options.components, config, {
           ...options,
-          baseStyle: itemType !== 'registry:theme',
+          baseStyle: shouldInstallBaseStyle,
         })
       }
 

packages/cli/src/commands/init.ts

@@ -28,6 +28,7 @@ import {
   restoreFileBackup,
 } from '@/src/utils/file-helper'
 import {
+  createConfig,
   DEFAULT_COMPONENTS,
   DEFAULT_TAILWIND_CONFIG,
   DEFAULT_TAILWIND_CSS,
@@ -160,15 +161,32 @@ export const init = new Command()
       if (components.length > 0) {
         // We don't know the full config at this point.
         // So we'll use a shadow config to fetch the first item.
-        let shadowConfig = configWithDefaults({})
+        let shadowConfig = configWithDefaults(
+          createConfig({
+            resolvedPaths: {
+              cwd: options.cwd,
+            },
+          }),
+        )
 
         // Check if there's a components.json file.
         // If so, we'll merge with our shadow config.
         const componentsJsonPath = path.resolve(options.cwd, 'components.json')
         if (fsExtra.existsSync(componentsJsonPath)) {
           const existingConfig = await fsExtra.readJson(componentsJsonPath)
           const config = rawConfigSchema.partial().parse(existingConfig)
-          shadowConfig = configWithDefaults(config)
+          const baseConfig = createConfig({
+            resolvedPaths: {
+              cwd: options.cwd,
+            },
+          })
+          shadowConfig = configWithDefaults({
+            ...config,
+            resolvedPaths: {
+              ...baseConfig.resolvedPaths,
+              cwd: options.cwd,
+            },
+          })
 
           // Since components.json might not be valid at this point.
           // Temporarily rename components.json to allow preflight to run.
@@ -182,6 +200,7 @@ export const init = new Command()
           shadowConfig,
           {
             silent: true,
+            writeFile: false,
           },
         )
         shadowConfig = updatedConfig
@@ -217,7 +236,7 @@ export const init = new Command()
         )} Project initialization completed.\nYou may now add components.`,
       )
 
-      // We need when runninng with custom cwd.
+      // We need when running with custom cwd.
       deleteFileBackup(path.resolve(options.cwd, 'components.json'))
       logger.break()
     }