@tanstack/cta-cli 0.46.2 → 0.48.0

package/src/options.ts

@@ -1,4 +1,5 @@
-import { intro } from '@clack/prompts'
+import fs from 'node:fs'
+import { cancel, confirm, intro, isCancel } from '@clack/prompts'
 
 import {
   finalizeAddOns,
@@ -12,8 +13,8 @@ import {
   getProjectName,
   promptForAddOnOptions,
   selectAddOns,
-  selectGit,
   selectDeployment,
+  selectGit,
   selectPackageManager,
   selectRouterType,
   selectTailwind,
@@ -46,6 +47,7 @@ export async function promptForCreateOptions(
 
   options.framework = getFrameworkById(cliOptions.framework || 'react-cra')!
 
+  // Validate project name
   if (cliOptions.projectName) {
     // Handle "." as project name - use sanitized current directory name
     if (cliOptions.projectName === '.') {
@@ -62,6 +64,23 @@ export async function promptForCreateOptions(
     options.projectName = await getProjectName()
   }
 
+  // Check if target directory is empty
+  if (
+    !cliOptions.force &&
+    fs.existsSync(options.projectName) &&
+    fs.readdirSync(options.projectName).length > 0
+  ) {
+    const shouldContinue = await confirm({
+      message: `Target directory ${options.projectName} is not empty. Do you want to continue?`,
+      initialValue: true,
+    })
+
+    if (isCancel(shouldContinue) || !shouldContinue) {
+      cancel('Operation cancelled.')
+      process.exit(0)
+    }
+  }
+
   // Router type selection
   if (forcedMode) {
     options.mode = forcedMode
@@ -86,13 +105,6 @@ export async function promptForCreateOptions(
     options.typescript = await selectTypescript()
   }
 
-  // Tailwind selection
-  if (!cliOptions.tailwind && options.framework.id === 'react-cra') {
-    options.tailwind = await selectTailwind()
-  } else {
-    options.tailwind = true
-  }
-
   // Package manager selection
   if (cliOptions.packageManager) {
     options.packageManager = cliOptions.packageManager
@@ -159,10 +171,29 @@ export async function promptForCreateOptions(
   )
 
   if (options.chosenAddOns.length) {
-    options.tailwind = true
     options.typescript = true
   }
 
+  // Tailwind selection
+  // Only treat add-ons as requiring tailwind if they explicitly have "tailwind": true
+  const addOnsRequireTailwind = options.chosenAddOns.some(
+    (addOn) => addOn.tailwind === true,
+  )
+
+  if (addOnsRequireTailwind) {
+    // If any add-on explicitly requires tailwind, enable it automatically
+    options.tailwind = true
+  } else if (cliOptions.tailwind !== undefined) {
+    // User explicitly provided a CLI flag, respect it
+    options.tailwind = !!cliOptions.tailwind
+  } else if (options.framework.id === 'react-cra') {
+    // Only show prompt for react-cra when no CLI flag and no add-ons require it
+    options.tailwind = await selectTailwind()
+  } else {
+    // For other frameworks (like solid), default to true
+    options.tailwind = true
+  }
+
   // Prompt for add-on options in interactive mode
   if (Array.isArray(cliOptions.addOns)) {
     // Non-interactive mode: use defaults
@@ -177,7 +208,11 @@ export async function promptForCreateOptions(
     // Merge user options with defaults
     options.addOnOptions = { ...defaultOptions, ...userOptions }
   }
+
   options.git = cliOptions.git || (await selectGit())
+  if (cliOptions.install === false) {
+    options.install = false
+  }
 
   return options
 }

package/src/types.ts

@@ -7,7 +7,7 @@ export interface CliOptions {
   framework?: string
   tailwind?: boolean
   packageManager?: PackageManager
-  toolchain?: string
+  toolchain?: string | false
   deployment?: string
   projectName?: string
   git?: boolean
@@ -20,5 +20,8 @@ export interface CliOptions {
   targetDir?: string
   interactive?: boolean
   ui?: boolean
+  devWatch?: string
+  install?: boolean
   addOnConfig?: string
+  force?: boolean
 }

package/src/ui-prompts.ts

@@ -18,7 +18,6 @@ import { validateProjectName } from './utils.js'
 import type { AddOn, PackageManager } from '@tanstack/cta-engine'
 
 import type { Framework } from '@tanstack/cta-engine/dist/types/types.js'
-import { InitialData } from '../../cta-ui/src/types'
 
 export async function getProjectName(): Promise<string> {
   const value = await text({
@@ -197,8 +196,12 @@ export async function selectGit(): Promise<boolean> {
 
 export async function selectToolchain(
   framework: Framework,
-  toolchain?: string,
+  toolchain?: string | false,
 ): Promise<string | undefined> {
+  if (toolchain === false) {
+    return undefined
+  }
+
   const toolchains = new Set<AddOn>()
   for (const addOn of framework.getAddOns()) {
     if (addOn.type === 'toolchain') {

package/tests/command-line.test.ts

@@ -236,7 +236,9 @@ describe('normalizeOptions', () => {
     )
     expect(options?.chosenAddOns.map((a) => a.id).includes('foo')).toBe(true)
     expect(options?.chosenAddOns.map((a) => a.id).includes('baz')).toBe(true)
-    expect(options?.tailwind).toBe(true)
+    // Tailwind is not automatically set to true unless an add-on explicitly requires it
+    // Since mock add-ons don't have tailwind: true, tailwind should be false
+    expect(options?.tailwind).toBe(false)
     expect(options?.typescript).toBe(true)
   })
 
@@ -263,7 +265,9 @@ describe('normalizeOptions', () => {
       toolchain: 'biome',
     })
     expect(options?.chosenAddOns.map((a) => a.id).includes('biome')).toBe(true)
-    expect(options?.tailwind).toBe(true)
+    // Tailwind is not automatically set to true unless an add-on explicitly requires it
+    // Since mock add-ons don't have tailwind: true, tailwind should be false
+    expect(options?.tailwind).toBe(false)
     expect(options?.typescript).toBe(true)
   })
 

package/tests/options.test.ts

@@ -257,6 +257,7 @@ describe('promptForCreateOptions', () => {
     expect(options?.chosenAddOns.map((a) => a.id).sort()).toEqual([
       'react-query',
     ])
+    // Tailwind should be prompted (and mock returns true) since no add-on explicitly requires it
     expect(options?.tailwind).toBe(true)
     expect(options?.typescript).toBe(true)
   })
@@ -273,6 +274,9 @@ describe('promptForCreateOptions', () => {
       'biome',
       'react-query',
     ])
+    // In non-interactive mode with add-ons, tailwind defaults to false unless explicitly required
+    // But since we're in interactive mode (addOns is an array but we still prompt), tailwind is prompted
+    // The mock returns true, so tailwind should be true
     expect(options?.tailwind).toBe(true)
     expect(options?.typescript).toBe(true)
   })
@@ -293,6 +297,7 @@ describe('promptForCreateOptions', () => {
       'biome',
       'react-query',
     ])
+    // Tailwind should be prompted (and mock returns true) since no add-on explicitly requires it
     expect(options?.tailwind).toBe(true)
     expect(options?.typescript).toBe(true)
   })