@tanstack/cta-cli 0.24.0 → 0.25.0

package/dist/cli.js

@@ -11,7 +11,7 @@ import { promptForAddOns, promptForCreateOptions } from './options.js';
 import { normalizeOptions } from './command-line.js';
 import { createUIEnvironment } from './ui-environment.js';
 import { convertTemplateToMode } from './utils.js';
-// This CLI assumes that all of the registered frameworks have the same set of toolchains, modes, etc.
+// This CLI assumes that all of the registered frameworks have the same set of toolchains, hosts, modes, etc.
 export function cli({ name, appName, forcedMode, forcedAddOns = [], defaultTemplate = 'javascript', defaultFramework, craCompatible = false, webBase, }) {
     const environment = createUIEnvironment(appName, false);
     const program = new Command();
@@ -24,6 +24,14 @@ export function cli({ name, appName, forcedMode, forcedAddOns = [], defaultTempl
             }
         }
     }
+    const hosts = new Set();
+    for (const framework of getFrameworks()) {
+        for (const addOn of framework.getAddOns()) {
+            if (addOn.type === 'host') {
+                hosts.add(addOn.id);
+            }
+        }
+    }
     let defaultMode = forcedMode;
     const supportedModes = new Set();
     for (const framework of getFrameworks()) {
@@ -191,6 +199,14 @@ Remove your node_modules directory and package lock file and re-install.`);
         }
         return value;
     });
+    if (hosts.size > 0) {
+        program.option(`--host <${Array.from(hosts).join('|')}>`, `Explicitly tell the CLI to use this hosting provider`, (value) => {
+            if (!hosts.has(value)) {
+                throw new InvalidArgumentError(`Invalid host: ${value}. The following are allowed: ${Array.from(hosts).join(', ')}`);
+            }
+            return value;
+        });
+    }
     if (toolchains.size > 0) {
         program.option(`--toolchain <${Array.from(toolchains).join('|')}>`, `Explicitly tell the CLI to use this toolchain`, (value) => {
             if (!toolchains.has(value)) {
@@ -249,13 +265,14 @@ Remove your node_modules directory and package lock file and re-install.`);
                 }
                 if (options.ui) {
                     const optionsFromCLI = await normalizeOptions(cliOptions, defaultMode, forcedAddOns, { disableNameCheck: true });
+                    const options = {
+                        ...createSerializedOptions(optionsFromCLI),
+                        projectName: 'my-app',
+                        targetDir: resolve(process.cwd(), 'my-app'),
+                    };
                     launchUI({
                         mode: 'setup',
-                        options: {
-                            ...createSerializedOptions(optionsFromCLI),
-                            projectName: 'my-app',
-                            targetDir: resolve(process.cwd(), 'my-app'),
-                        },
+                        options,
                         forcedRouterMode: defaultMode,
                         forcedAddOns,
                         environmentFactory: () => createUIEnvironment(appName, false),

package/dist/command-line.js

@@ -40,7 +40,8 @@ export async function normalizeOptions(cliOptions, forcedMode, forcedAddOns, opt
         if (Array.isArray(cliOptions.addOns) ||
             starter?.dependsOn ||
             forcedAddOns ||
-            cliOptions.toolchain) {
+            cliOptions.toolchain ||
+            cliOptions.host) {
             const selectedAddOns = new Set([
                 ...(starter?.dependsOn || []),
                 ...(forcedAddOns || []),
@@ -53,6 +54,12 @@ export async function normalizeOptions(cliOptions, forcedMode, forcedAddOns, opt
             if (cliOptions.toolchain) {
                 selectedAddOns.add(cliOptions.toolchain);
             }
+            if (cliOptions.host) {
+                selectedAddOns.add(cliOptions.host);
+            }
+            if (!cliOptions.host) {
+                selectedAddOns.add('nitro');
+            }
             return await finalizeAddOns(framework, mode, Array.from(selectedAddOns));
         }
         return [];

package/dist/options.js

@@ -1,6 +1,6 @@
 import { intro } from '@clack/prompts';
 import { finalizeAddOns, getFrameworkById, getPackageManager, readConfigFile, } from '@tanstack/cta-engine';
-import { getProjectName, selectAddOns, selectGit, selectPackageManager, selectRouterType, selectTailwind, selectToolchain, selectTypescript, } from './ui-prompts.js';
+import { getProjectName, selectAddOns, selectGit, selectPackageManager, selectRouterType, selectTailwind, selectToolchain, selectHost, selectTypescript, } from './ui-prompts.js';
 export async function promptForCreateOptions(cliOptions, { forcedAddOns = [], forcedMode, }) {
     const options = {};
     options.framework = getFrameworkById(cliOptions.framework || 'react-cra');
@@ -45,11 +45,16 @@ export async function promptForCreateOptions(cliOptions, { forcedAddOns = [], fo
     }
     // Toolchain selection
     const toolchain = await selectToolchain(options.framework, cliOptions.toolchain);
+    // Host selection
+    const host = await selectHost(options.framework, cliOptions.host);
     // Add-ons selection
     const addOns = new Set();
     if (toolchain) {
         addOns.add(toolchain);
     }
+    if (host) {
+        addOns.add(host);
+    }
     for (const addOn of forcedAddOns) {
         addOns.add(addOn);
     }

package/dist/types/types.d.ts

@@ -6,6 +6,7 @@ export interface CliOptions {
     tailwind?: boolean;
     packageManager?: PackageManager;
     toolchain?: string;
+    host?: string;
     projectName?: string;
     git?: boolean;
     addOns?: Array<string> | boolean;

package/dist/types/ui-prompts.d.ts

@@ -8,3 +8,4 @@ export declare function selectPackageManager(): Promise<PackageManager>;
 export declare function selectAddOns(framework: Framework, mode: string, type: string, message: string, forcedAddOns?: Array<string>): Promise<Array<string>>;
 export declare function selectGit(): Promise<boolean>;
 export declare function selectToolchain(framework: Framework, toolchain?: string): Promise<string | undefined>;
+export declare function selectHost(framework: Framework, host?: string): Promise<string | undefined>;

package/dist/ui-prompts.js

@@ -138,3 +138,31 @@ export async function selectToolchain(framework, toolchain) {
     }
     return tc;
 }
+export async function selectHost(framework, host) {
+    const hosts = new Set();
+    for (const addOn of framework
+        .getAddOns()
+        .sort((a, b) => a.name.localeCompare(b.name))) {
+        if (addOn.type === 'host') {
+            hosts.add(addOn);
+            if (host && addOn.id === host) {
+                return host;
+            }
+        }
+    }
+    const hp = await select({
+        message: 'Select hosting provider',
+        options: [
+            ...Array.from(hosts).map((h) => ({
+                value: h.id,
+                label: h.name,
+            })),
+        ],
+        initialValue: undefined,
+    });
+    if (isCancel(hp)) {
+        cancel('Operation cancelled.');
+        process.exit(0);
+    }
+    return hp;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/cta-cli",
-  "version": "0.24.0",
+  "version": "0.25.0",
   "description": "Tanstack Application Builder CLI",
   "type": "module",
   "main": "./dist/index.js",
@@ -30,8 +30,8 @@
     "express": "^4.21.2",
     "semver": "^7.7.2",
     "zod": "^3.24.2",
-    "@tanstack/cta-engine": "0.24.0",
-    "@tanstack/cta-ui": "0.24.0"
+    "@tanstack/cta-engine": "0.25.0",
+    "@tanstack/cta-ui": "0.25.0"
   },
   "devDependencies": {
     "@tanstack/config": "^0.16.2",

package/src/cli.ts

@@ -33,7 +33,7 @@ import { convertTemplateToMode } from './utils.js'
 import type { CliOptions, TemplateOptions } from './types.js'
 import type { Options, PackageManager } from '@tanstack/cta-engine'
 
-// This CLI assumes that all of the registered frameworks have the same set of toolchains, modes, etc.
+// This CLI assumes that all of the registered frameworks have the same set of toolchains, hosts, modes, etc.
 
 export function cli({
   name,
@@ -69,6 +69,15 @@ export function cli({
     }
   }
 
+  const hosts = new Set<string>()
+  for (const framework of getFrameworks()) {
+    for (const addOn of framework.getAddOns()) {
+      if (addOn.type === 'host') {
+        hosts.add(addOn.id)
+      }
+    }
+  }
+
   let defaultMode: string | undefined = forcedMode
   const supportedModes = new Set<string>()
   for (const framework of getFrameworks()) {
@@ -295,6 +304,23 @@ Remove your node_modules directory and package lock file and re-install.`,
       },
     )
 
+  if (hosts.size > 0) {
+    program.option<string>(
+      `--host <${Array.from(hosts).join('|')}>`,
+      `Explicitly tell the CLI to use this hosting provider`,
+      (value) => {
+        if (!hosts.has(value)) {
+          throw new InvalidArgumentError(
+            `Invalid host: ${value}. The following are allowed: ${Array.from(
+              hosts,
+            ).join(', ')}`,
+          )
+        }
+        return value
+      },
+    )
+  }
+
   if (toolchains.size > 0) {
     program.option<string>(
       `--toolchain <${Array.from(toolchains).join('|')}>`,
@@ -385,13 +411,14 @@ Remove your node_modules directory and package lock file and re-install.`,
             forcedAddOns,
             { disableNameCheck: true },
           )
+          const options = {
+            ...createSerializedOptions(optionsFromCLI!),
+            projectName: 'my-app',
+            targetDir: resolve(process.cwd(), 'my-app'),
+          }
           launchUI({
             mode: 'setup',
-            options: {
-              ...createSerializedOptions(optionsFromCLI!),
-              projectName: 'my-app',
-              targetDir: resolve(process.cwd(), 'my-app'),
-            },
+            options,
             forcedRouterMode: defaultMode,
             forcedAddOns,
             environmentFactory: () => createUIEnvironment(appName, false),

package/src/command-line.ts

@@ -74,7 +74,8 @@ export async function normalizeOptions(
       Array.isArray(cliOptions.addOns) ||
       starter?.dependsOn ||
       forcedAddOns ||
-      cliOptions.toolchain
+      cliOptions.toolchain ||
+      cliOptions.host
     ) {
       const selectedAddOns = new Set<string>([
         ...(starter?.dependsOn || []),
@@ -88,6 +89,13 @@ export async function normalizeOptions(
       if (cliOptions.toolchain) {
         selectedAddOns.add(cliOptions.toolchain)
       }
+      if (cliOptions.host) {
+        selectedAddOns.add(cliOptions.host)
+      }
+
+      if (!cliOptions.host) {
+        selectedAddOns.add('nitro')
+      }
 
       return await finalizeAddOns(framework, mode, Array.from(selectedAddOns))
     }

package/src/options.ts

@@ -15,6 +15,7 @@ import {
   selectRouterType,
   selectTailwind,
   selectToolchain,
+  selectHost,
   selectTypescript,
 } from './ui-prompts.js'
 
@@ -84,12 +85,18 @@ export async function promptForCreateOptions(
     cliOptions.toolchain,
   )
 
+  // Host selection
+  const host = await selectHost(options.framework, cliOptions.host)
+
   // Add-ons selection
   const addOns: Set<string> = new Set()
 
   if (toolchain) {
     addOns.add(toolchain)
   }
+  if (host) {
+    addOns.add(host)
+  }
 
   for (const addOn of forcedAddOns) {
     addOns.add(addOn)

package/src/types.ts

@@ -8,6 +8,7 @@ export interface CliOptions {
   tailwind?: boolean
   packageManager?: PackageManager
   toolchain?: string
+  host?: string
   projectName?: string
   git?: boolean
   addOns?: Array<string> | boolean

package/src/ui-prompts.ts

@@ -183,3 +183,38 @@ export async function selectToolchain(
 
   return tc
 }
+
+export async function selectHost(
+  framework: Framework,
+  host?: string,
+): Promise<string | undefined> {
+  const hosts = new Set<AddOn>()
+  for (const addOn of framework
+    .getAddOns()
+    .sort((a, b) => a.name.localeCompare(b.name))) {
+    if (addOn.type === 'host') {
+      hosts.add(addOn)
+      if (host && addOn.id === host) {
+        return host
+      }
+    }
+  }
+
+  const hp = await select({
+    message: 'Select hosting provider',
+    options: [
+      ...Array.from(hosts).map((h) => ({
+        value: h.id,
+        label: h.name,
+      })),
+    ],
+    initialValue: undefined,
+  })
+
+  if (isCancel(hp)) {
+    cancel('Operation cancelled.')
+    process.exit(0)
+  }
+
+  return hp as string
+}

package/tests/command-line.test.ts

@@ -62,7 +62,14 @@ describe('normalizeOptions', () => {
     __testRegisterFramework({
       id: 'solid',
       name: 'Solid',
-      getAddOns: () => [],
+      getAddOns: () => [
+        {
+          id: 'nitro',
+          name: 'nitro',
+          modes: ['file-router'],
+          default: true,
+        },
+      ],
       supportedModes: {
         'code-router': {
           displayName: 'Code Router',
@@ -95,10 +102,11 @@ describe('normalizeOptions', () => {
     const options = await normalizeOptions({
       projectName: 'test',
       starter: 'https://github.com/cta-dev/cta-starter-solid',
+      host: 'nitro',
     })
     expect(options?.mode).toBe('file-router')
     expect(options?.tailwind).toBe(true)
-    expect(options?.typescript).toBe(false)
+    expect(options?.typescript).toBe(true)
     expect(options?.framework?.id).toBe('solid')
   })
 
@@ -123,6 +131,12 @@ describe('normalizeOptions', () => {
           name: 'foobar',
           modes: ['file-router'],
         },
+        {
+          id: 'nitro',
+          name: 'nitro',
+          modes: ['file-router'],
+          default: true,
+        },
       ],
     })
     const options = await normalizeOptions(
@@ -151,6 +165,12 @@ describe('normalizeOptions', () => {
           name: 'baz',
           modes: ['file-router'],
         },
+        {
+          id: 'nitro',
+          name: 'nitro',
+          modes: ['file-router'],
+          default: true,
+        },
       ],
     })
     const options = await normalizeOptions(
@@ -179,6 +199,12 @@ describe('normalizeOptions', () => {
           name: 'Biome',
           modes: ['file-router', 'code-router'],
         },
+        {
+          id: 'nitro',
+          name: 'nitro',
+          modes: ['file-router', 'code-router'],
+          default: true,
+        },
       ],
     })
     const options = await normalizeOptions({
@@ -205,6 +231,12 @@ describe('normalizeOptions', () => {
           name: 'baz',
           modes: ['file-router', 'code-router'],
         },
+        {
+          id: 'nitro',
+          name: 'nitro',
+          modes: ['file-router', 'code-router'],
+          default: true,
+        },
       ],
     })
     const options = await normalizeOptions({