@tanstack/cta-cli 0.35.0 → 0.36.0

package/dist/cli.js

@@ -11,8 +11,8 @@ 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, hosts, modes, etc.
-export function cli({ name, appName, forcedMode, forcedAddOns = [], defaultTemplate = 'javascript', forcedHost, defaultFramework, craCompatible = false, webBase, showHostingOptions = false, }) {
+// This CLI assumes that all of the registered frameworks have the same set of toolchains, deployments, modes, etc.
+export function cli({ name, appName, forcedMode, forcedAddOns = [], defaultTemplate = 'javascript', forcedDeployment, defaultFramework, craCompatible = false, webBase, showDeploymentOptions = false, }) {
     const environment = createUIEnvironment(appName, false);
     const program = new Command();
     const availableFrameworks = getFrameworks().map((f) => f.name);
@@ -24,11 +24,11 @@ export function cli({ name, appName, forcedMode, forcedAddOns = [], defaultTempl
             }
         }
     }
-    const hosts = new Set();
+    const deployments = new Set();
     for (const framework of getFrameworks()) {
         for (const addOn of framework.getAddOns()) {
-            if (addOn.type === 'host') {
-                hosts.add(addOn.id);
+            if (addOn.type === 'deployment') {
+                deployments.add(addOn.id);
             }
         }
     }
@@ -130,7 +130,7 @@ Remove your node_modules directory and package lock file and re-install.`);
                 forcedAddOns,
                 environmentFactory: () => createUIEnvironment(appName, false),
                 webBase,
-                showHostingOptions,
+                showDeploymentOptions,
             });
         }
         else if (parsedAddOns.length < 1) {
@@ -200,10 +200,10 @@ 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(', ')}`);
+    if (deployments.size > 0) {
+        program.option(`--deployment <${Array.from(deployments).join('|')}>`, `Explicitly tell the CLI to use this deployment adapter`, (value) => {
+            if (!deployments.has(value)) {
+                throw new InvalidArgumentError(`Invalid adapter: ${value}. The following are allowed: ${Array.from(deployments).join(', ')}`);
             }
             return value;
         });
@@ -324,10 +324,10 @@ Remove your node_modules directory and package lock file and re-install.`);
                     cliOptions.addOns = true;
                 }
                 else {
-                    finalOptions = await normalizeOptions(cliOptions, defaultMode, forcedAddOns, { forcedHost });
+                    finalOptions = await normalizeOptions(cliOptions, defaultMode, forcedAddOns, { forcedDeployment });
                 }
                 if (options.ui) {
-                    const optionsFromCLI = await normalizeOptions(cliOptions, defaultMode, forcedAddOns, { disableNameCheck: true, forcedHost });
+                    const optionsFromCLI = await normalizeOptions(cliOptions, defaultMode, forcedAddOns, { disableNameCheck: true, forcedDeployment });
                     const options = {
                         ...createSerializedOptions(optionsFromCLI),
                         projectName: 'my-app',
@@ -340,7 +340,7 @@ Remove your node_modules directory and package lock file and re-install.`);
                         forcedAddOns,
                         environmentFactory: () => createUIEnvironment(appName, false),
                         webBase,
-                        showHostingOptions,
+                        showDeploymentOptions,
                     });
                     return;
                 }
@@ -352,7 +352,7 @@ Remove your node_modules directory and package lock file and re-install.`);
                     finalOptions = await promptForCreateOptions(cliOptions, {
                         forcedMode: defaultMode,
                         forcedAddOns,
-                        showHostingOptions,
+                        showDeploymentOptions,
                     });
                 }
                 if (!finalOptions) {

package/dist/command-line.js

@@ -41,7 +41,7 @@ export async function normalizeOptions(cliOptions, forcedMode, forcedAddOns, opt
             starter?.dependsOn ||
             forcedAddOns ||
             cliOptions.toolchain ||
-            cliOptions.host) {
+            cliOptions.deployment) {
             const selectedAddOns = new Set([
                 ...(starter?.dependsOn || []),
                 ...(forcedAddOns || []),
@@ -54,11 +54,11 @@ export async function normalizeOptions(cliOptions, forcedMode, forcedAddOns, opt
             if (cliOptions.toolchain) {
                 selectedAddOns.add(cliOptions.toolchain);
             }
-            if (cliOptions.host) {
-                selectedAddOns.add(cliOptions.host);
+            if (cliOptions.deployment) {
+                selectedAddOns.add(cliOptions.deployment);
             }
-            if (!cliOptions.host && opts?.forcedHost) {
-                selectedAddOns.add(opts.forcedHost);
+            if (!cliOptions.deployment && opts?.forcedDeployment) {
+                selectedAddOns.add(opts.forcedDeployment);
             }
             return await finalizeAddOns(framework, mode, Array.from(selectedAddOns));
         }

package/dist/options.js

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

package/dist/types/cli.d.ts

@@ -1,13 +1,13 @@
 import type { TemplateOptions } from './types.js';
-export declare function cli({ name, appName, forcedMode, forcedAddOns, defaultTemplate, forcedHost, defaultFramework, craCompatible, webBase, showHostingOptions, }: {
+export declare function cli({ name, appName, forcedMode, forcedAddOns, defaultTemplate, forcedDeployment, defaultFramework, craCompatible, webBase, showDeploymentOptions, }: {
     name: string;
     appName: string;
     forcedMode?: string;
     forcedAddOns?: Array<string>;
-    forcedHost?: string;
+    forcedDeployment?: string;
     defaultTemplate?: TemplateOptions;
     defaultFramework?: string;
     craCompatible?: boolean;
     webBase?: string;
-    showHostingOptions?: boolean;
+    showDeploymentOptions?: boolean;
 }): void;

package/dist/types/command-line.d.ts

@@ -2,5 +2,5 @@ import type { Options } from '@tanstack/cta-engine';
 import type { CliOptions } from './types.js';
 export declare function normalizeOptions(cliOptions: CliOptions, forcedMode?: string, forcedAddOns?: Array<string>, opts?: {
     disableNameCheck?: boolean;
-    forcedHost?: string;
+    forcedDeployment?: string;
 }): Promise<Options | undefined>;

package/dist/types/options.d.ts

@@ -1,8 +1,8 @@
 import type { Options } from '@tanstack/cta-engine';
 import type { CliOptions } from './types.js';
-export declare function promptForCreateOptions(cliOptions: CliOptions, { forcedAddOns, forcedMode, showHostingOptions, }: {
+export declare function promptForCreateOptions(cliOptions: CliOptions, { forcedAddOns, forcedMode, showDeploymentOptions, }: {
     forcedAddOns?: Array<string>;
     forcedMode?: string;
-    showHostingOptions?: boolean;
+    showDeploymentOptions?: boolean;
 }): Promise<Required<Options> | undefined>;
 export declare function promptForAddOns(): Promise<Array<string>>;

package/dist/types/types.d.ts

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

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

@@ -9,4 +9,4 @@ export declare function selectAddOns(framework: Framework, mode: string, type: s
 export declare function selectGit(): Promise<boolean>;
 export declare function selectToolchain(framework: Framework, toolchain?: string): Promise<string | undefined>;
 export declare function promptForAddOnOptions(addOnIds: Array<string>, framework: Framework): Promise<Record<string, Record<string, any>>>;
-export declare function selectHost(framework: Framework, host?: string): Promise<string | undefined>;
+export declare function selectDeployment(framework: Framework, deployment?: string): Promise<string | undefined>;

package/dist/ui-prompts.js

@@ -169,35 +169,35 @@ export async function promptForAddOnOptions(addOnIds, framework) {
     }
     return addOnOptions;
 }
-export async function selectHost(framework, host) {
-    const hosts = new Set();
+export async function selectDeployment(framework, deployment) {
+    const deployments = new Set();
     let initialValue = undefined;
     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;
+        if (addOn.type === 'deployment') {
+            deployments.add(addOn);
+            if (deployment && addOn.id === deployment) {
+                return deployment;
             }
             if (addOn.default) {
                 initialValue = addOn.id;
             }
         }
     }
-    const hp = await select({
-        message: 'Select hosting provider',
+    const dp = await select({
+        message: 'Select deployment adapter',
         options: [
-            ...Array.from(hosts).map((h) => ({
-                value: h.id,
-                label: h.name,
+            ...Array.from(deployments).map((d) => ({
+                value: d.id,
+                label: d.name,
             })),
         ],
         initialValue: initialValue,
     });
-    if (isCancel(hp)) {
+    if (isCancel(dp)) {
         cancel('Operation cancelled.');
         process.exit(0);
     }
-    return hp;
+    return dp;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/cta-cli",
-  "version": "0.35.0",
+  "version": "0.36.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.35.0",
-    "@tanstack/cta-ui": "0.35.0"
+    "@tanstack/cta-engine": "0.36.0",
+    "@tanstack/cta-ui": "0.36.0"
   },
   "devDependencies": {
     "@tanstack/config": "^0.16.2",

package/src/cli.ts

@@ -32,7 +32,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, hosts, modes, etc.
+// This CLI assumes that all of the registered frameworks have the same set of toolchains, deployments, modes, etc.
 
 export function cli({
   name,
@@ -40,22 +40,22 @@ export function cli({
   forcedMode,
   forcedAddOns = [],
   defaultTemplate = 'javascript',
-  forcedHost,
+  forcedDeployment,
   defaultFramework,
   craCompatible = false,
   webBase,
-  showHostingOptions = false,
+  showDeploymentOptions = false,
 }: {
   name: string
   appName: string
   forcedMode?: string
   forcedAddOns?: Array<string>
-  forcedHost?: string
+  forcedDeployment?: string
   defaultTemplate?: TemplateOptions
   defaultFramework?: string
   craCompatible?: boolean
   webBase?: string
-  showHostingOptions?: boolean
+  showDeploymentOptions?: boolean
 }) {
   const environment = createUIEnvironment(appName, false)
 
@@ -72,11 +72,11 @@ export function cli({
     }
   }
 
-  const hosts = new Set<string>()
+  const deployments = new Set<string>()
   for (const framework of getFrameworks()) {
     for (const addOn of framework.getAddOns()) {
-      if (addOn.type === 'host') {
-        hosts.add(addOn.id)
+      if (addOn.type === 'deployment') {
+        deployments.add(addOn.id)
       }
     }
   }
@@ -202,7 +202,7 @@ Remove your node_modules directory and package lock file and re-install.`,
           forcedAddOns,
           environmentFactory: () => createUIEnvironment(appName, false),
           webBase,
-          showHostingOptions,
+          showDeploymentOptions,
         })
       } else if (parsedAddOns.length < 1) {
         const addOns = await promptForAddOns()
@@ -308,15 +308,15 @@ Remove your node_modules directory and package lock file and re-install.`,
       },
     )
 
-  if (hosts.size > 0) {
+  if (deployments.size > 0) {
     program.option<string>(
-      `--host <${Array.from(hosts).join('|')}>`,
-      `Explicitly tell the CLI to use this hosting provider`,
+      `--deployment <${Array.from(deployments).join('|')}>`,
+      `Explicitly tell the CLI to use this deployment adapter`,
       (value) => {
-        if (!hosts.has(value)) {
+        if (!deployments.has(value)) {
           throw new InvalidArgumentError(
-            `Invalid host: ${value}. The following are allowed: ${Array.from(
-              hosts,
+            `Invalid adapter: ${value}. The following are allowed: ${Array.from(
+              deployments,
             ).join(', ')}`,
           )
         }
@@ -485,7 +485,7 @@ Remove your node_modules directory and package lock file and re-install.`,
             cliOptions,
             defaultMode,
             forcedAddOns,
-            { forcedHost },
+            { forcedDeployment },
           )
         }
 
@@ -494,7 +494,7 @@ Remove your node_modules directory and package lock file and re-install.`,
             cliOptions,
             defaultMode,
             forcedAddOns,
-            { disableNameCheck: true, forcedHost },
+            { disableNameCheck: true, forcedDeployment },
           )
           const options = {
             ...createSerializedOptions(optionsFromCLI!),
@@ -508,7 +508,7 @@ Remove your node_modules directory and package lock file and re-install.`,
             forcedAddOns,
             environmentFactory: () => createUIEnvironment(appName, false),
             webBase,
-            showHostingOptions,
+            showDeploymentOptions,
           })
           return
         }
@@ -520,7 +520,7 @@ Remove your node_modules directory and package lock file and re-install.`,
           finalOptions = await promptForCreateOptions(cliOptions, {
             forcedMode: defaultMode,
             forcedAddOns,
-            showHostingOptions,
+            showDeploymentOptions,
           })
         }
 

package/src/command-line.ts

@@ -19,7 +19,7 @@ export async function normalizeOptions(
   forcedAddOns?: Array<string>,
   opts?: {
     disableNameCheck?: boolean
-    forcedHost?: string
+    forcedDeployment?: string
   },
 ): Promise<Options | undefined> {
   const projectName = (cliOptions.projectName ?? '').trim()
@@ -77,7 +77,7 @@ export async function normalizeOptions(
       starter?.dependsOn ||
       forcedAddOns ||
       cliOptions.toolchain ||
-      cliOptions.host
+      cliOptions.deployment
     ) {
       const selectedAddOns = new Set<string>([
         ...(starter?.dependsOn || []),
@@ -91,12 +91,12 @@ export async function normalizeOptions(
       if (cliOptions.toolchain) {
         selectedAddOns.add(cliOptions.toolchain)
       }
-      if (cliOptions.host) {
-        selectedAddOns.add(cliOptions.host)
+      if (cliOptions.deployment) {
+        selectedAddOns.add(cliOptions.deployment)
       }
 
-      if (!cliOptions.host && opts?.forcedHost) {
-        selectedAddOns.add(opts.forcedHost)
+      if (!cliOptions.deployment && opts?.forcedDeployment) {
+        selectedAddOns.add(opts.forcedDeployment)
       }
 
       return await finalizeAddOns(framework, mode, Array.from(selectedAddOns))

package/src/options.ts

@@ -13,7 +13,7 @@ import {
   promptForAddOnOptions,
   selectAddOns,
   selectGit,
-  selectHost,
+  selectDeployment,
   selectPackageManager,
   selectRouterType,
   selectTailwind,
@@ -30,11 +30,11 @@ export async function promptForCreateOptions(
   {
     forcedAddOns = [],
     forcedMode,
-    showHostingOptions = false,
+    showDeploymentOptions = false,
   }: {
     forcedAddOns?: Array<string>
     forcedMode?: string
-    showHostingOptions?: boolean
+    showDeploymentOptions?: boolean
   },
 ): Promise<Required<Options> | undefined> {
   const options = {} as Required<Options>
@@ -89,9 +89,9 @@ export async function promptForCreateOptions(
     cliOptions.toolchain,
   )
 
-  // Host selection
-  const host = showHostingOptions
-    ? await selectHost(options.framework, cliOptions.host)
+  // Deployment selection
+  const deployment = showDeploymentOptions
+    ? await selectDeployment(options.framework, cliOptions.deployment)
     : undefined
 
   // Add-ons selection
@@ -100,8 +100,8 @@ export async function promptForCreateOptions(
   if (toolchain) {
     addOns.add(toolchain)
   }
-  if (host) {
-    addOns.add(host)
+  if (deployment) {
+    addOns.add(deployment)
   }
 
   for (const addOn of forcedAddOns) {

package/src/types.ts

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

package/src/ui-prompts.ts

@@ -232,19 +232,19 @@ export async function promptForAddOnOptions(
   return addOnOptions
 }
 
-export async function selectHost(
+export async function selectDeployment(
   framework: Framework,
-  host?: string,
+  deployment?: string,
 ): Promise<string | undefined> {
-  const hosts = new Set<AddOn>()
+  const deployments = new Set<AddOn>()
   let initialValue: string | undefined = undefined
   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
+    if (addOn.type === 'deployment') {
+      deployments.add(addOn)
+      if (deployment && addOn.id === deployment) {
+        return deployment
       }
       if (addOn.default) {
         initialValue = addOn.id
@@ -252,21 +252,21 @@ export async function selectHost(
     }
   }
 
-  const hp = await select({
-    message: 'Select hosting provider',
+  const dp = await select({
+    message: 'Select deployment adapter',
     options: [
-      ...Array.from(hosts).map((h) => ({
-        value: h.id,
-        label: h.name,
+      ...Array.from(deployments).map((d) => ({
+        value: d.id,
+        label: d.name,
       })),
     ],
     initialValue: initialValue,
   })
 
-  if (isCancel(hp)) {
+  if (isCancel(dp)) {
     cancel('Operation cancelled.')
     process.exit(0)
   }
 
-  return hp
+  return dp
 }

package/tests/command-line.test.ts

@@ -102,7 +102,7 @@ describe('normalizeOptions', () => {
     const options = await normalizeOptions({
       projectName: 'test',
       starter: 'https://github.com/cta-dev/cta-starter-solid',
-      host: 'nitro',
+      deployment: 'nitro',
     })
     expect(options?.mode).toBe('file-router')
     expect(options?.tailwind).toBe(true)