@tanstack/cli 0.48.6 → 0.58.5

package/tests/command-line.test.ts

@@ -1,7 +1,10 @@
 import { basename, resolve } from 'node:path'
 import { beforeEach, describe, expect, it } from 'vitest'
 
-import { normalizeOptions } from '../src/command-line.js'
+import {
+  normalizeOptions,
+  validateLegacyCreateFlags,
+} from '../src/command-line.js'
 import {
   sanitizePackageName,
   getCurrentDirectoryName,
@@ -67,46 +70,25 @@ describe('normalizeOptions', () => {
     expect(options?.targetDir).toBe(resolve(process.cwd()))
   })
 
-  it('should return enable typescript based on the framework', async () => {
-    const jsOptions = await normalizeOptions({
-      projectName: 'test',
-      template: 'javascript',
-    })
-    expect(jsOptions?.typescript).toBe(false)
-    expect(jsOptions?.mode).toBe('code-router')
-
-    const tsOptions = await normalizeOptions({
+  it('should always enable typescript (file-router/TanStack Start requires it)', async () => {
+    const options = await normalizeOptions({
       projectName: 'test',
-      template: 'typescript',
     })
-    expect(tsOptions?.typescript).toBe(true)
-    expect(tsOptions?.mode).toBe('code-router')
+    expect(options?.typescript).toBe(true)
+    expect(options?.mode).toBe('file-router')
+  })
 
-    const frOptions = await normalizeOptions({
+  it('tailwind is always enabled', async () => {
+    const options = await normalizeOptions({
       projectName: 'test',
-      template: 'file-router',
     })
-    expect(frOptions?.typescript).toBe(true)
-    expect(frOptions?.mode).toBe('file-router')
-  })
+    expect(options?.tailwind).toBe(true)
 
-  it('should return enable tailwind if the framework is solid', async () => {
     const solidOptions = await normalizeOptions({
       projectName: 'test',
       framework: 'solid',
     })
     expect(solidOptions?.tailwind).toBe(true)
-
-    const twOptions = await normalizeOptions({
-      projectName: 'test',
-      tailwind: true,
-    })
-    expect(twOptions?.tailwind).toBe(true)
-
-    const noOptions = await normalizeOptions({
-      projectName: 'test',
-    })
-    expect(noOptions?.tailwind).toBe(false)
   })
 
   it('should handle a starter url', async () => {
@@ -137,7 +119,6 @@ describe('normalizeOptions', () => {
     fetch.mockResponseOnce(
       JSON.stringify({
         id: 'https://github.com/cta-dev/cta-starter-solid',
-        tailwind: true,
         typescript: false,
         framework: 'solid',
         mode: 'file-router',
@@ -195,7 +176,6 @@ describe('normalizeOptions', () => {
         projectName: 'test',
         framework: 'react-cra',
       },
-      'file-router',
       ['foo'],
     )
     expect(options?.chosenAddOns.map((a) => a.id).includes('foo')).toBe(true)
@@ -229,16 +209,12 @@ describe('normalizeOptions', () => {
         projectName: 'test',
         addOns: ['baz'],
         framework: 'react-cra',
-        template: 'file-router',
       },
-      'file-router',
       ['foo'],
     )
     expect(options?.chosenAddOns.map((a) => a.id).includes('foo')).toBe(true)
     expect(options?.chosenAddOns.map((a) => a.id).includes('baz')).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?.tailwind).toBe(true)
     expect(options?.typescript).toBe(true)
   })
 
@@ -265,9 +241,7 @@ describe('normalizeOptions', () => {
       toolchain: 'biome',
     })
     expect(options?.chosenAddOns.map((a) => a.id).includes('biome')).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?.tailwind).toBe(true)
     expect(options?.typescript).toBe(true)
   })
 
@@ -302,3 +276,33 @@ describe('normalizeOptions', () => {
     expect(options?.chosenAddOns.map((a) => a.id).includes('baz')).toBe(true)
   })
 })
+
+describe('validateLegacyCreateFlags', () => {
+  it('returns no warnings or errors without legacy flags', () => {
+    const result = validateLegacyCreateFlags({})
+    expect(result.warnings).toEqual([])
+    expect(result.error).toBeUndefined()
+  })
+
+  it('warns when --router-only is used', () => {
+    const result = validateLegacyCreateFlags({ routerOnly: true })
+    expect(result.error).toBeUndefined()
+    expect(result.warnings[0]).toContain('--router-only')
+  })
+
+  it('errors for JavaScript templates', () => {
+    const result = validateLegacyCreateFlags({ template: 'javascript' })
+    expect(result.error).toContain('JavaScript/JSX templates are not supported')
+  })
+
+  it('errors for unknown template values', () => {
+    const result = validateLegacyCreateFlags({ template: 'foo' })
+    expect(result.error).toContain('Invalid --template value')
+  })
+
+  it('warns for supported deprecated template values', () => {
+    const result = validateLegacyCreateFlags({ template: 'tsx' })
+    expect(result.error).toBeUndefined()
+    expect(result.warnings[0]).toContain('--template')
+  })
+})

package/tests/options.test.ts

@@ -23,28 +23,23 @@ beforeEach(() => {
       {
         id: 'react-query',
         type: 'add-on',
-        modes: ['file-router', 'code-router'],
+        modes: ['file-router'],
       },
       {
         id: 'tanstack-chat',
         type: 'add-on',
-        modes: ['file-router', 'code-router'],
+        modes: ['file-router'],
       },
       {
         id: 'biome',
         type: 'toolchain',
-        modes: ['file-router', 'code-router'],
+        modes: ['file-router'],
       },
     ],
     supportedModes: {
-      'code-router': {
-        displayName: 'Code Router',
-        description: 'TanStack Router using code to define the routes',
-        forceTypescript: false,
-      },
       'file-router': {
         displayName: 'File Router',
-        description: 'TanStack Router using files to define the routes',
+        description: 'TanStack Start with file-based routing',
         forceTypescript: true,
       },
     },
@@ -67,11 +62,6 @@ const baseCliOptions: CliOptions = {
 
 function setBasicSpies() {
   vi.spyOn(prompts, 'getProjectName').mockImplementation(async () => 'hello')
-  vi.spyOn(prompts, 'selectRouterType').mockImplementation(
-    async () => 'file-router',
-  )
-  vi.spyOn(prompts, 'selectTypescript').mockImplementation(async () => true)
-  vi.spyOn(prompts, 'selectTailwind').mockImplementation(async () => true)
   vi.spyOn(prompts, 'selectPackageManager').mockImplementation(
     async () => 'npm',
   )
@@ -101,95 +91,22 @@ describe('promptForCreateOptions', () => {
     expect(options?.projectName).toBe('override')
   })
 
-  //// Mode (router type)
+  //// Mode is always file-router (TanStack Start)
 
-  it('forceMode should override template', async () => {
+  it('mode should always be file-router', async () => {
     setBasicSpies()
 
-    const options = await promptForCreateOptions(
-      { ...baseCliOptions, template: 'javascript' },
-      { forcedMode: 'file-router' },
-    )
+    const options = await promptForCreateOptions(baseCliOptions, {})
 
     expect(options?.mode).toBe('file-router')
     expect(options?.typescript).toBe(true)
   })
 
-  it('takes template from cli options - code-router', async () => {
-    setBasicSpies()
-
-    vi.spyOn(prompts, 'selectRouterType').mockImplementation(
-      async () => 'code-router',
-    )
-
-    const options = await promptForCreateOptions(
-      { ...baseCliOptions, template: 'javascript' },
-      {},
-    )
-
-    expect(options?.mode).toBe('code-router')
-  })
-
-  it('takes template from cli options - file-router', async () => {
-    setBasicSpies()
-
-    vi.spyOn(prompts, 'selectRouterType').mockImplementation(
-      async () => 'code-router',
-    )
-
-    const options = await promptForCreateOptions(
-      { ...baseCliOptions, template: 'file-router' },
-      {},
-    )
-
-    expect(options?.mode).toBe('file-router')
-  })
-
-  it('prompt for router type when unspecified', async () => {
-    setBasicSpies()
-
-    vi.spyOn(prompts, 'selectRouterType').mockImplementation(
-      async () => 'code-router',
-    )
-
-    const options = await promptForCreateOptions(
-      { ...baseCliOptions, tailwind: false, framework: undefined },
-      {},
-    )
-
-    expect(options?.mode).toBe('code-router')
-  })
-
-  //// Tailwind
-
-  it('prompt for tailwind when unspecified in react-cra', async () => {
-    setBasicSpies()
-    vi.spyOn(prompts, 'selectTailwind').mockImplementation(async () => false)
-    const options = await promptForCreateOptions(
-      { ...baseCliOptions, tailwind: undefined },
-      {},
-    )
-
-    expect(options?.tailwind).toBe(false)
-  })
-
-  it('prompt for tailwind when unspecified in react-cra - true', async () => {
-    setBasicSpies()
-    vi.spyOn(prompts, 'selectTailwind').mockImplementation(async () => true)
-    const options = await promptForCreateOptions(
-      { ...baseCliOptions, tailwind: undefined },
-      {},
-    )
-
-    expect(options?.tailwind).toBe(true)
-  })
+  //// Tailwind is always enabled
 
-  it('set tailwind when solid', async () => {
+  it('tailwind is always enabled', async () => {
     setBasicSpies()
-    const options = await promptForCreateOptions(
-      { ...baseCliOptions, tailwind: undefined, framework: 'solid' },
-      {},
-    )
+    const options = await promptForCreateOptions(baseCliOptions, {})
 
     expect(options?.tailwind).toBe(true)
   })
@@ -207,7 +124,7 @@ describe('promptForCreateOptions', () => {
     expect(options?.packageManager).toBe('bun')
   })
 
-  it('uses the package manager from the cli options', async () => {
+  it('detects package manager from environment', async () => {
     setBasicSpies()
 
     process.env.npm_config_userconfig = 'blarg'
@@ -257,7 +174,6 @@ 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)
   })
@@ -274,9 +190,6 @@ 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)
   })
@@ -297,7 +210,6 @@ 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)
   })

package/tests/ui-prompts.test.ts

@@ -7,8 +7,6 @@ import {
   selectAddOns,
   selectGit,
   selectPackageManager,
-  selectRouterType,
-  selectTailwind,
   selectToolchain,
 } from '../src/ui-prompts'
 
@@ -37,42 +35,6 @@ describe('getProjectName', () => {
   })
 })
 
-describe('selectRouterType', () => {
-  it('should select the file router', async () => {
-    vi.spyOn(clack, 'select').mockImplementation(async () => 'file-router')
-    vi.spyOn(clack, 'isCancel').mockImplementation(() => false)
-
-    const routerType = await selectRouterType()
-    expect(routerType).toBe('file-router')
-  })
-
-  it('should exit on cancel', async () => {
-    vi.spyOn(clack, 'select').mockImplementation(async () => 'Cancelled')
-    vi.spyOn(clack, 'isCancel').mockImplementation(() => true)
-
-    await expect(() => selectRouterType()).rejects.toThrowError(/exit/)
-  })
-})
-
-describe('selectTailwind', () => {
-  it('should select tailwind', async () => {
-    vi.spyOn(clack, 'confirm').mockImplementation(async () => true)
-    vi.spyOn(clack, 'isCancel').mockImplementation(() => false)
-
-    const tailwind = await selectTailwind()
-    expect(tailwind).toBe(true)
-  })
-
-  it('should exit on cancel', async () => {
-    vi.spyOn(clack, 'confirm').mockImplementation(async () =>
-      Symbol.for('cancel'),
-    )
-    vi.spyOn(clack, 'isCancel').mockImplementation(() => true)
-
-    await expect(selectTailwind()).rejects.toThrowError(/exit/)
-  })
-})
-
 describe('selectPackageManager', () => {
   it('should select pnpm', async () => {
     vi.spyOn(clack, 'select').mockImplementation(async () => 'pnpm')