@tanstack/cli 0.71.1 → 0.72.0

package/dist/cli.js

@@ -4,7 +4,7 @@ import { Command, InvalidArgumentError, Option } from 'commander';
 import { cancel, confirm, intro, isCancel, log } from '@clack/prompts';
 import chalk from 'chalk';
 import semver from 'semver';
-import { SUPPORTED_PACKAGE_MANAGERS, addToApp, compileAddOn, compileStarter, createApp, devAddOn, getAllAddOns, getFrameworkByName, getFrameworks, initAddOn, initStarter, isDemoFilePath, } from '@tanstack/create';
+import { SUPPORTED_PACKAGE_MANAGERS, addToApp, compileAddOn, compileStarter, createApp, devAddOn, getAllAddOns, getBundlers, getFrameworkByName, getFrameworks, initAddOn, initStarter, isDemoFilePath, resolveBundler, } from '@tanstack/create';
 import { LIBRARY_GROUPS, fetchDocContent, fetchLibraries, fetchPartners, searchTanStackDocs, } from './discovery.js';
 import { getTelemetryStatus, setTelemetryEnabled, } from './telemetry-config.js';
 import { createTelemetryClient } from './telemetry.js';
@@ -97,7 +97,7 @@ function getCreateCommandVariant(options) {
     }
     return 'scaffold';
 }
-function getCreateTelemetryProperties(projectName, options) {
+export function getCreateTelemetryProperties(projectName, options) {
     const addOnIds = Array.isArray(options.addOns)
         ? sanitizeIdList(options.addOns)
         : undefined;
@@ -110,6 +110,7 @@ function getCreateTelemetryProperties(projectName, options) {
             : undefined,
         command_variant: getCreateCommandVariant(options),
         deployment: options.deployment ? sanitizeId(options.deployment) : undefined,
+        bundler: options.buildTool ? sanitizeId(options.buildTool) : undefined,
         examples: options.examples,
         blank: !!options.blank,
         framework: options.framework ? sanitizeId(options.framework) : undefined,
@@ -127,7 +128,7 @@ function getCreateTelemetryProperties(projectName, options) {
         yes: !!options.yes,
     };
 }
-function getResolvedCreateTelemetryProperties(finalOptions, cliOptions) {
+export function getResolvedCreateTelemetryProperties(finalOptions, cliOptions) {
     const includeExamples = finalOptions.includeExamples !== false;
     const addOnIds = sanitizeIdList(finalOptions.chosenAddOns.map((addOn) => addOn.id));
     const deployment = finalOptions.chosenAddOns.find((addOn) => addOn.type === 'deployment');
@@ -137,6 +138,7 @@ function getResolvedCreateTelemetryProperties(finalOptions, cliOptions) {
         add_on_count: addOnIds.length,
         add_on_ids: addOnIds,
         deployment: deployment ? sanitizeId(deployment.id) : undefined,
+        bundler: sanitizeId(finalOptions.bundler ?? 'vite'),
         examples: includeExamples,
         blank: finalOptions.projectPreset === 'blank',
         framework: sanitizeId(finalOptions.framework.id),
@@ -185,6 +187,7 @@ export function cli({ name, appName, forcedAddOns = [], forcedDeployment, defaul
         lines.push(`  Project:         ${finalOptions.projectName}`);
         lines.push(`  Location:        ${finalOptions.targetDir}`);
         lines.push(`  Framework:       ${finalOptions.framework.name}`);
+        lines.push(`  Build tool:      ${resolveBundler(finalOptions.framework, finalOptions.bundler).name}`);
         lines.push(`  Mode:            ${finalOptions.mode}`);
         if (finalOptions.projectPreset === 'blank') {
             lines.push(`  Preset:          blank`);
@@ -401,6 +404,12 @@ export function cli({ name, appName, forcedAddOns = [], forcedDeployment, defaul
             }
         }
     }
+    const bundlers = new Set();
+    for (const framework of getFrameworks()) {
+        for (const bundler of getBundlers(framework)) {
+            bundlers.add(bundler.id);
+        }
+    }
     // Mode is always file-router (TanStack Start)
     const defaultMode = 'file-router';
     const categoryAliases = {
@@ -475,7 +484,7 @@ export function cli({ name, appName, forcedAddOns = [], forcedDeployment, defaul
             }, async (telemetry) => {
                 validateCreateCommandOptions(options);
                 if (options.listAddOns) {
-                    const addOns = await getAllAddOns(getFrameworkByName(options.framework || defaultFramework || 'React'), defaultMode);
+                    const addOns = await getAllAddOns(getFrameworkByName(options.framework || defaultFramework || 'React'), defaultMode, options.buildTool);
                     const visibleAddOns = addOns.filter((a) => !forcedAddOns.includes(a.id));
                     telemetry.mergeProperties({
                         result_count: visibleAddOns.length,
@@ -511,7 +520,7 @@ export function cli({ name, appName, forcedAddOns = [], forcedDeployment, defaul
                     return;
                 }
                 if (options.addonDetails) {
-                    const addOns = await getAllAddOns(getFrameworkByName(options.framework || defaultFramework || 'React'), defaultMode);
+                    const addOns = await getAllAddOns(getFrameworkByName(options.framework || defaultFramework || 'React'), defaultMode, options.buildTool);
                     const addOn = addOns.find((a) => a.id === options.addonDetails) ??
                         addOns.find((a) => a.id.toLowerCase() === options.addonDetails.toLowerCase());
                     if (!addOn) {
@@ -702,6 +711,13 @@ export function cli({ name, appName, forcedAddOns = [], forcedDeployment, defaul
             });
         }
         cmd
+            .option(`--build-tool <${Array.from(bundlers).join('|')}>`, 'select the project build tool', (value) => {
+            const buildTool = Array.from(bundlers).find((item) => item.toLowerCase() === value.toLowerCase());
+            if (!buildTool) {
+                throw new InvalidArgumentError(`Invalid build tool: ${value}. The following are allowed: ${Array.from(bundlers).join(', ')}`);
+            }
+            return buildTool;
+        })
             .option('--starter [url-or-id]', 'DEPRECATED: use --template. Initializes from a template URL or built-in id', false)
             .option('--template-id <id>', 'initialize using a built-in template id')
             .option('--template [url-or-id]', 'initialize this project from a template URL or built-in template id')

package/dist/command-line.js

@@ -1,6 +1,6 @@
 import { resolve } from 'node:path';
 import fs from 'node:fs';
-import { DEFAULT_PACKAGE_MANAGER, finalizeAddOns, getFrameworkById, getPackageManager, getRawRegistry, loadStarter, populateAddOnOptionsDefaults, } from '@tanstack/create';
+import { DEFAULT_PACKAGE_MANAGER, finalizeAddOns, getFrameworkById, getPackageManager, getRawRegistry, loadStarter, populateAddOnOptionsDefaults, resolveBundler, } from '@tanstack/create';
 import { resolveProjectLocation, validateProjectName, } from './utils.js';
 const SUPPORTED_LEGACY_TEMPLATES = new Set([
     'file-router',
@@ -217,6 +217,30 @@ export async function listTemplateChoices(preferredFramework) {
 export function validateLegacyCreateFlags(cliOptions) {
     const warnings = [];
     const legacyTemplate = getLegacyTemplateValue(cliOptions.template);
+    const isSupportedLegacyTemplate = legacyTemplate !== undefined &&
+        SUPPORTED_LEGACY_TEMPLATES.has(legacyTemplate);
+    if (cliOptions.buildTool?.toLowerCase() === 'rsbuild') {
+        if (cliOptions.starter ||
+            (cliOptions.template && !isSupportedLegacyTemplate) ||
+            cliOptions.templateId) {
+            return {
+                warnings,
+                error: 'Rsbuild does not currently support --starter, --template, or --template-id.',
+            };
+        }
+        if (cliOptions.deployment) {
+            return {
+                warnings,
+                error: 'Rsbuild does not currently support --deployment.',
+            };
+        }
+        if (cliOptions.addOns) {
+            return {
+                warnings,
+                error: 'Rsbuild currently supports toolchains only. Use --toolchain eslint or --toolchain biome.',
+            };
+        }
+    }
     if (cliOptions.blank &&
         (cliOptions.starter || cliOptions.template || cliOptions.templateId)) {
         return {
@@ -304,6 +328,8 @@ export async function normalizeOptions(cliOptions, forcedAddOns, opts) {
     let routerOnly = !!cliOptions.routerOnly;
     const blank = cliOptions.blank === true;
     const legacyTemplate = getLegacyTemplateValue(cliOptions.template);
+    const isSupportedLegacyTemplate = legacyTemplate !== undefined &&
+        SUPPORTED_LEGACY_TEMPLATES.has(legacyTemplate);
     if (!cliOptions.starter) {
         if (cliOptions.template && !legacyTemplate) {
             cliOptions.starter = cliOptions.template;
@@ -320,6 +346,24 @@ export async function normalizeOptions(cliOptions, forcedAddOns, opts) {
         cliOptions.starter = cliOptions.templateId;
     }
     const preferredFramework = (cliOptions.framework || 'react').toLowerCase();
+    const initialFramework = getFrameworkById(preferredFramework);
+    let framework = initialFramework;
+    const bundler = initialFramework
+        ? resolveBundler(initialFramework, cliOptions.buildTool).id
+        : (cliOptions.buildTool ?? 'vite');
+    if (bundler === 'rsbuild') {
+        if (cliOptions.starter ||
+            (cliOptions.template && !isSupportedLegacyTemplate) ||
+            cliOptions.templateId) {
+            throw new Error('Rsbuild does not currently support templates.');
+        }
+        if (cliOptions.deployment || opts?.forcedDeployment) {
+            throw new Error('Rsbuild does not currently support deployments.');
+        }
+        if (forcedAddOns?.length || cliOptions.addOns) {
+            throw new Error('Rsbuild currently supports toolchains only. Use --toolchain eslint or --toolchain biome.');
+        }
+    }
     const starter = !routerOnly && !blank && cliOptions.starter
         ? await loadStarter(await resolveStarterSpecifier(cliOptions.starter, preferredFramework))
         : undefined;
@@ -329,7 +373,11 @@ export async function normalizeOptions(cliOptions, forcedAddOns, opts) {
         cliOptions.framework = starter.framework;
         mode = starter.mode;
     }
-    const framework = getFrameworkById(cliOptions.framework || 'react');
+    const resolvedFramework = getFrameworkById(cliOptions.framework || 'react');
+    if (resolvedFramework) {
+        resolveBundler(resolvedFramework, bundler);
+    }
+    framework = resolvedFramework;
     async function selectAddOns() {
         // Edge case for Windows Powershell
         if (Array.isArray(cliOptions.addOns) && cliOptions.addOns.length === 1) {
@@ -364,7 +412,7 @@ export async function normalizeOptions(cliOptions, forcedAddOns, opts) {
             if (!routerOnly && !cliOptions.deployment && opts?.forcedDeployment) {
                 selectedAddOns.add(opts.forcedDeployment);
             }
-            return await finalizeAddOns(framework, mode, Array.from(selectedAddOns));
+            return await finalizeAddOns(framework, mode, Array.from(selectedAddOns), bundler);
         }
         return [];
     }
@@ -390,6 +438,7 @@ export async function normalizeOptions(cliOptions, forcedAddOns, opts) {
         targetDir,
         framework,
         mode,
+        bundler,
         typescript,
         tailwind,
         packageManager: cliOptions.packageManager ||
@@ -405,6 +454,7 @@ export async function normalizeOptions(cliOptions, forcedAddOns, opts) {
         },
         starter: starter,
         projectPreset: blank ? 'blank' : 'default',
+        routerOnly,
     };
     normalized.includeExamples =
         includeExamples;

package/dist/dev-watch.js

@@ -176,7 +176,7 @@ export class DevWatchManager {
             if (!registeredFramework) {
                 throw new Error(`Failed to register framework: ${this.options.framework.id}`);
             }
-            const updatedChosenAddons = await finalizeAddOns(registeredFramework, this.options.cliOptions.mode, chosenAddonIds);
+            const updatedChosenAddons = await finalizeAddOns(registeredFramework, this.options.cliOptions.mode, chosenAddonIds, this.options.cliOptions.bundler);
             // Check if package metadata was modified
             const packageMetadataChanged = Array.from(changes).some((filePath) => {
                 const normalized = filePath.replace(/\\/g, '/');
@@ -327,6 +327,8 @@ export class DevWatchManager {
             addOns,
             basePackageJSON,
             optionalPackages,
+            bundlers: this.options.framework.bundlers,
+            defaultBundler: this.options.framework.defaultBundler,
             supportedModes: this.options.framework.supportedModes,
         };
     }

package/dist/options.js

@@ -1,7 +1,7 @@
 import { intro } from '@clack/prompts';
-import { finalizeAddOns, getFrameworkById, getFrameworks, getPackageManager, loadStarter, populateAddOnOptionsDefaults, readConfigFile, } from '@tanstack/create';
-import { getProjectName, promptForAddOnOptions, promptForEnvVars, selectAddOns, selectDeployment, selectExamples, selectFramework, selectGit, selectInstall, selectPackageManager, selectTemplate, selectToolchain, } from './ui-prompts.js';
-import { listTemplateChoices, resolveStarterSpecifier, } from './command-line.js';
+import { finalizeAddOns, getAllAddOns, getFrameworkById, getFrameworks, getPackageManager, loadStarter, populateAddOnOptionsDefaults, readConfigFile, resolveBundler, } from '@tanstack/create';
+import { getProjectName, promptForAddOnOptions, promptForEnvVars, selectAddOns, selectBundler, selectDeployment, selectExamples, selectFramework, selectGit, selectInstall, selectPackageManager, selectTemplate, selectToolchain, } from './ui-prompts.js';
+import { listTemplateChoices, resolveStarterSpecifier, validateLegacyCreateFlags, } from './command-line.js';
 import { resolveProjectLocation, validateProjectName, } from './utils.js';
 export async function promptForCreateOptions(cliOptions, { forcedAddOns = [], forcedDeployment, showDeploymentOptions = true, defaultFrameworkId, }) {
     const options = {};
@@ -18,6 +18,25 @@ export async function promptForCreateOptions(cliOptions, { forcedAddOns = [], fo
             options.framework = await selectFramework(availableFrameworks, defaultFrameworkId);
         }
     }
+    options.bundler = await selectBundler(options.framework, cliOptions.buildTool);
+    if (options.bundler === 'rsbuild') {
+        const validation = validateLegacyCreateFlags({
+            ...cliOptions,
+            buildTool: options.bundler,
+            addOns: Array.isArray(cliOptions.addOns) && cliOptions.addOns.length > 0
+                ? cliOptions.addOns
+                : undefined,
+        });
+        if (validation.error) {
+            throw new Error(validation.error);
+        }
+        if (forcedAddOns.length > 0) {
+            throw new Error('Rsbuild does not currently support forced add-ons.');
+        }
+        if (forcedDeployment) {
+            throw new Error('Rsbuild does not currently support deployments.');
+        }
+    }
     const projectLocation = resolveProjectLocation({
         projectName: cliOptions.projectName ?? (await getProjectName()),
         targetDir: cliOptions.targetDir,
@@ -48,7 +67,7 @@ export async function promptForCreateOptions(cliOptions, { forcedAddOns = [], fo
             cliOptions.starter = cliOptions.templateId;
         }
     }
-    if (!routerOnly && !blank && !cliOptions.starter) {
+    if (options.bundler !== 'rsbuild' && !routerOnly && !blank && !cliOptions.starter) {
         const starterChoices = await listTemplateChoices(options.framework.id);
         const selectedTemplateId = await selectTemplate(starterChoices.map((choice) => ({
             id: choice.id,
@@ -59,7 +78,7 @@ export async function promptForCreateOptions(cliOptions, { forcedAddOns = [], fo
             cliOptions.starter = selectedTemplateId;
         }
     }
-    const starter = !routerOnly && !blank && cliOptions.starter
+    const starter = options.bundler !== 'rsbuild' && !routerOnly && !blank && cliOptions.starter
         ? await loadStarter(await resolveStarterSpecifier(cliOptions.starter, options.framework.id))
         : undefined;
     if (starter) {
@@ -78,12 +97,12 @@ export async function promptForCreateOptions(cliOptions, { forcedAddOns = [], fo
             detectedPackageManager || (await selectPackageManager());
     }
     // Toolchain selection
-    const toolchain = blank && cliOptions.toolchain === undefined
+    const toolchain = blank && options.bundler !== 'rsbuild' && cliOptions.toolchain === undefined
         ? undefined
         : await selectToolchain(options.framework, cliOptions.toolchain);
     // Deployment selection
     let deployment;
-    if (routerOnly) {
+    if (routerOnly || options.bundler === 'rsbuild') {
         deployment = undefined;
     }
     else if (cliOptions.deployment) {
@@ -112,7 +131,7 @@ export async function promptForCreateOptions(cliOptions, { forcedAddOns = [], fo
     if (deployment) {
         addOns.add(deployment);
     }
-    if (!routerOnly) {
+    if (!routerOnly && options.bundler !== 'rsbuild') {
         for (const addOn of starter?.dependsOn || []) {
             addOns.add(addOn);
         }
@@ -120,7 +139,7 @@ export async function promptForCreateOptions(cliOptions, { forcedAddOns = [], fo
             addOns.add(addOn);
         }
     }
-    if (!routerOnly && Array.isArray(cliOptions.addOns)) {
+    if (!routerOnly && options.bundler !== 'rsbuild' && Array.isArray(cliOptions.addOns)) {
         for (const addOn of cliOptions.addOns) {
             if (addOn.toLowerCase() === 'start') {
                 continue;
@@ -128,7 +147,7 @@ export async function promptForCreateOptions(cliOptions, { forcedAddOns = [], fo
             addOns.add(addOn);
         }
     }
-    else if (!routerOnly && !blank) {
+    else if (!routerOnly && options.bundler !== 'rsbuild' && !blank) {
         for (const addOn of await selectAddOns(options.framework, options.mode, 'add-on', 'What add-ons would you like for your project?', forcedAddOns)) {
             addOns.add(addOn);
         }
@@ -138,13 +157,14 @@ export async function promptForCreateOptions(cliOptions, { forcedAddOns = [], fo
             }
         }
     }
-    const chosenAddOns = Array.from(await finalizeAddOns(options.framework, options.mode, Array.from(addOns)));
+    const chosenAddOns = Array.from(await finalizeAddOns(options.framework, options.mode, Array.from(addOns), options.bundler));
     options.chosenAddOns = includeExamples
         ? chosenAddOns
         : chosenAddOns.filter((addOn) => addOn.type !== 'example');
     options.tailwind =
         !blank || options.chosenAddOns.some((addOn) => addOn.tailwind === true);
     options.projectPreset = blank ? 'blank' : 'default';
+    options.routerOnly = routerOnly;
     // Prompt for add-on options in interactive mode
     if (Array.isArray(cliOptions.addOns)) {
         // Non-interactive mode: use defaults
@@ -184,6 +204,25 @@ export async function promptForAddOns() {
     }
     intro(`Adding new add-ons to '${config.projectName}'`);
     const addOns = new Set();
+    const bundler = resolveBundler(framework, config.bundler).id;
+    if (bundler === 'rsbuild') {
+        const toolchains = getAllAddOns(framework, config.mode, bundler).filter((addOn) => addOn.type === 'toolchain');
+        const configuredAddOnIds = new Set(config.chosenAddOns.map((addOn) => addOn.toLowerCase()));
+        const configuredExclusiveGroups = new Set(toolchains
+            .filter((addOn) => configuredAddOnIds.has(addOn.id.toLowerCase()))
+            .flatMap((addOn) => addOn.exclusive ?? []));
+        const unavailableToolchains = toolchains
+            .filter((addOn) => configuredAddOnIds.has(addOn.id.toLowerCase()) ||
+            addOn.exclusive?.some((exclusive) => configuredExclusiveGroups.has(exclusive)))
+            .map((addOn) => addOn.id);
+        if (unavailableToolchains.length === toolchains.length) {
+            return [];
+        }
+        for (const addOn of await selectAddOns(framework, config.mode, 'toolchain', 'Which toolchain would you like to add?', unavailableToolchains, false, bundler)) {
+            addOns.add(addOn);
+        }
+        return Array.from(addOns);
+    }
     for (const addOn of await selectAddOns(framework, config.mode, 'add-on', 'What add-ons would you like for your project?', config.chosenAddOns)) {
         addOns.add(addOn);
     }

package/dist/types/cli.d.ts

@@ -1,4 +1,127 @@
-import type { FrameworkDefinition } from '@tanstack/create';
+import type { CliOptions } from './types.js';
+import type { FrameworkDefinition, Options } from '@tanstack/create';
+export declare function getCreateTelemetryProperties(projectName: string, options: CliOptions): {
+    add_on_count: number | undefined;
+    add_on_ids: string[] | undefined;
+    addon_details_id: string | undefined;
+    command_variant: string;
+    deployment: string | undefined;
+    bundler: string | undefined;
+    examples: boolean | undefined;
+    blank: boolean;
+    framework: string | undefined;
+    git: boolean | undefined;
+    install: boolean;
+    intent: boolean;
+    interactive: boolean;
+    json: boolean;
+    non_interactive: boolean;
+    package_manager: "npm" | "yarn" | "pnpm" | "bun" | "deno" | undefined;
+    project_name_provided: boolean;
+    router_only: boolean;
+    target_dir_flag: boolean;
+    toolchain: string | undefined;
+    yes: boolean;
+    starter_kind?: undefined;
+    starter_id?: undefined;
+} | {
+    add_on_count: number | undefined;
+    add_on_ids: string[] | undefined;
+    addon_details_id: string | undefined;
+    command_variant: string;
+    deployment: string | undefined;
+    bundler: string | undefined;
+    examples: boolean | undefined;
+    blank: boolean;
+    framework: string | undefined;
+    git: boolean | undefined;
+    install: boolean;
+    intent: boolean;
+    interactive: boolean;
+    json: boolean;
+    non_interactive: boolean;
+    package_manager: "npm" | "yarn" | "pnpm" | "bun" | "deno" | undefined;
+    project_name_provided: boolean;
+    router_only: boolean;
+    target_dir_flag: boolean;
+    toolchain: string | undefined;
+    yes: boolean;
+    starter_kind: string;
+    starter_id?: undefined;
+} | {
+    add_on_count: number | undefined;
+    add_on_ids: string[] | undefined;
+    addon_details_id: string | undefined;
+    command_variant: string;
+    deployment: string | undefined;
+    bundler: string | undefined;
+    examples: boolean | undefined;
+    blank: boolean;
+    framework: string | undefined;
+    git: boolean | undefined;
+    install: boolean;
+    intent: boolean;
+    interactive: boolean;
+    json: boolean;
+    non_interactive: boolean;
+    package_manager: "npm" | "yarn" | "pnpm" | "bun" | "deno" | undefined;
+    project_name_provided: boolean;
+    router_only: boolean;
+    target_dir_flag: boolean;
+    toolchain: string | undefined;
+    yes: boolean;
+    starter_id: string | undefined;
+    starter_kind: string;
+};
+export declare function getResolvedCreateTelemetryProperties(finalOptions: Options, cliOptions: CliOptions): {
+    add_on_count: number;
+    add_on_ids: string[];
+    deployment: string | undefined;
+    bundler: string | undefined;
+    examples: boolean;
+    blank: boolean;
+    framework: string | undefined;
+    git: boolean;
+    install: boolean;
+    intent: boolean;
+    package_manager: "npm" | "yarn" | "pnpm" | "bun" | "deno";
+    router_only: boolean;
+    toolchain: string | undefined;
+    starter_kind?: undefined;
+    starter_id?: undefined;
+} | {
+    add_on_count: number;
+    add_on_ids: string[];
+    deployment: string | undefined;
+    bundler: string | undefined;
+    examples: boolean;
+    blank: boolean;
+    framework: string | undefined;
+    git: boolean;
+    install: boolean;
+    intent: boolean;
+    package_manager: "npm" | "yarn" | "pnpm" | "bun" | "deno";
+    router_only: boolean;
+    toolchain: string | undefined;
+    starter_kind: string;
+    starter_id?: undefined;
+} | {
+    add_on_count: number;
+    add_on_ids: string[];
+    deployment: string | undefined;
+    bundler: string | undefined;
+    examples: boolean;
+    blank: boolean;
+    framework: string | undefined;
+    git: boolean;
+    install: boolean;
+    intent: boolean;
+    package_manager: "npm" | "yarn" | "pnpm" | "bun" | "deno";
+    router_only: boolean;
+    toolchain: string | undefined;
+    starter_id: string | undefined;
+    starter_kind: string;
+};
 export declare function cli({ name, appName, forcedAddOns, forcedDeployment, defaultFramework, frameworkDefinitionInitializers, showDeploymentOptions, legacyAutoCreate, defaultRouterOnly, }: {
     name: string;
     appName: string;

package/dist/types/types.d.ts

@@ -1,6 +1,7 @@
 import type { PackageManager } from '@tanstack/create';
 export interface CliOptions {
     framework?: string;
+    buildTool?: string;
     packageManager?: PackageManager;
     toolchain?: string | false;
     deployment?: string;

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

@@ -1,5 +1,6 @@
 import type { AddOn, PackageManager } from '@tanstack/create';
 import type { Framework } from '@tanstack/create/dist/types/types.js';
+export declare function selectBundler(framework: Framework, bundlerId?: string): Promise<string>;
 export declare function selectFramework(frameworks: Array<Framework>, defaultFrameworkId?: string): Promise<Framework>;
 export declare function selectInstall(): Promise<boolean>;
 export declare function getProjectName(): Promise<string>;
@@ -9,7 +10,7 @@ export declare function selectTemplate(templates: Array<{
     name: string;
     description?: string;
 }>): Promise<string | undefined>;
-export declare function selectAddOns(framework: Framework, mode: string, type: string, message: string, forcedAddOns?: Array<string>, allowMultiple?: boolean): Promise<Array<string>>;
+export declare function selectAddOns(framework: Framework, mode: string, type: string, message: string, forcedAddOns?: Array<string>, allowMultiple?: boolean, bundlerId?: string): Promise<Array<string>>;
 export declare function selectGit(): Promise<boolean>;
 export declare function selectExamples(): Promise<boolean>;
 export declare function selectToolchain(framework: Framework, toolchain?: string | false): Promise<string | undefined>;

package/dist/ui-prompts.js

@@ -1,7 +1,30 @@
 import { cancel, confirm, isCancel, multiselect, note, password, select, text, } from '@clack/prompts';
-import { DEFAULT_PACKAGE_MANAGER, SUPPORTED_PACKAGE_MANAGERS, getAllAddOns, } from '@tanstack/create';
+import { DEFAULT_PACKAGE_MANAGER, SUPPORTED_PACKAGE_MANAGERS, getAllAddOns, getBundlers, getDefaultBundler, resolveBundler, } from '@tanstack/create';
 import { isCurrentDirectoryProjectNameInput, validateProjectName, } from './utils.js';
 import { orderAddOnsForPartnerPlacement } from './partner-placement.js';
+export async function selectBundler(framework, bundlerId) {
+    if (bundlerId) {
+        return resolveBundler(framework, bundlerId).id;
+    }
+    const bundlers = getBundlers(framework);
+    if (bundlers.length === 1) {
+        return bundlers[0].id;
+    }
+    const selected = await select({
+        message: 'Select build tool:',
+        options: bundlers.map((bundler) => ({
+            value: bundler.id,
+            label: bundler.name,
+            hint: bundler.description,
+        })),
+        initialValue: getDefaultBundler(framework).id,
+    });
+    if (isCancel(selected)) {
+        cancel('Operation cancelled.');
+        process.exit(0);
+    }
+    return resolveBundler(framework, selected).id;
+}
 export async function selectFramework(frameworks, defaultFrameworkId) {
     const initialValue = (defaultFrameworkId &&
         frameworks.find((f) => f.id.toLowerCase() === defaultFrameworkId.toLowerCase())?.id) ||
@@ -95,8 +118,8 @@ export async function selectTemplate(templates) {
     }
     return selected;
 }
-export async function selectAddOns(framework, mode, type, message, forcedAddOns = [], allowMultiple = true) {
-    const allAddOns = await getAllAddOns(framework, mode);
+export async function selectAddOns(framework, mode, type, message, forcedAddOns = [], allowMultiple = true, bundlerId) {
+    const allAddOns = await getAllAddOns(framework, mode, bundlerId);
     const addOns = allAddOns.filter((addOn) => addOn.type === type);
     if (addOns.length === 0) {
         return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/cli",
-  "version": "0.71.1",
+  "version": "0.72.0",
   "description": "TanStack CLI",
   "type": "module",
   "main": "./dist/index.js",
@@ -44,7 +44,7 @@
     "tempy": "^3.1.0",
     "validate-npm-package-name": "^7.0.0",
     "zod": "^3.24.2",
-    "@tanstack/create": "0.70.1"
+    "@tanstack/create": "0.71.0"
   },
   "devDependencies": {
     "@playwright/test": "^1.58.2",

package/skills/create-app-scaffold/SKILL.md

@@ -1,14 +1,14 @@
 ---
 name: create-app-scaffold
 description: >
-  Scaffold a TanStack app with tanstack create using --framework, --template,
+  Scaffold a TanStack app with tanstack create using --framework, --build-tool, --template,
   --toolchain, --deployment, --add-ons, --blank, and --router-only. Covers flag
   compatibility, non-interactive defaults, and intent-preserving command
   construction.
 metadata:
   type: core
   library: tanstack-cli
-  library_version: "0.70.0"
+  library_version: "0.71.0"
 ---
 
 # Create App Scaffold
@@ -28,6 +28,19 @@ npx @tanstack/cli create acme-web \
 
 ## Core Patterns
 
+### Choose Vite or Rsbuild explicitly
+
+Vite is the default. Use Rsbuild for React or Solid when the requested project
+fits its initial compatibility surface.
+
+```bash
+npx @tanstack/cli create acme-web \
+  --framework react \
+  --build-tool rsbuild \
+  --toolchain biome \
+  -y
+```
+
 ### Build a deterministic non-interactive scaffold
 
 ```bash
@@ -162,5 +175,6 @@ See also: query-docs-library-metadata/SKILL.md § Common Mistakes
 
 - [Create flag compatibility matrix](references/create-flag-compatibility-matrix.md)
 - [Framework adapter options](references/framework-adapters.md)
+- [Build tool options](references/bundlers.md)
 - [Deployment provider options](references/deployment-providers.md)
 - [Toolchain options](references/toolchains.md)

package/skills/create-app-scaffold/references/bundlers.md

@@ -0,0 +1,27 @@
+# Build Tool Options
+
+Targets `@tanstack/cli` v0.71.0.
+
+## Supported values
+
+- `vite` (default)
+- `rsbuild`
+
+## Usage
+
+```bash
+npx @tanstack/cli create app --framework react --build-tool vite -y
+npx @tanstack/cli create app --framework solid --build-tool rsbuild -y
+```
+
+Rsbuild supports full TanStack Start and router-only projects, including the
+standard and `--blank` presets, built-in example pages, Tailwind, ESLint, and
+Biome. It does not currently support templates, deployment adapters, or
+catalog business/example add-ons. `tanstack add` is limited to ESLint/Biome in
+Rsbuild projects.
+
+Use the build-tool-aware catalog view before constructing an Rsbuild command:
+
+```bash
+npx @tanstack/cli create --list-add-ons --build-tool rsbuild --json
+```

package/skills/create-app-scaffold/references/create-flag-compatibility-matrix.md

@@ -1,12 +1,13 @@
 # Create Flag Compatibility Matrix
 
-Targets `@tanstack/cli` v0.70.0.
+Targets `@tanstack/cli` v0.71.0.
 
 ## Compatibility
 
 | Flag | Works with normal create | Works with `--router-only` | Notes |
 |---|---|---|---|
 | `--framework` | yes | yes | Framework is still honored in both modes. |
+| `--build-tool` | yes | yes | `vite` is the default; `rsbuild` supports React and Solid. |
 | `--toolchain` | yes | yes | Toolchain selection remains available. |
 | `--add-ons` | yes | no | Ignored in router-only mode. |
 | `--deployment` | yes | no | Ignored in router-only mode. |
@@ -15,14 +16,18 @@ Targets `@tanstack/cli` v0.70.0.
 | `--blank` | yes | yes | Omits starter UI, examples, Tailwind, devtools, and test tooling unless an explicit integration requires them. Cannot be combined with a template, `--examples`, or `--tailwind`. |
 | `--tailwind` / `--no-tailwind` | deprecated/ignored | deprecated/ignored | Standard scaffolds enable Tailwind; use `--blank` for the supported minimal preset. |
 
+With `--build-tool rsbuild`, only toolchain catalog entries are compatible.
+Templates, deployments, and business/example add-ons are rejected. Built-in
+demo pages controlled by `--examples` remain available.
+
 Source: `packages/cli/src/command-line.ts:337`
 
 ## Recommended command construction order
 
-1. Choose mode (`--router-only` or full scaffold).
-2. If full scaffold, resolve add-ons and deployment first.
-3. Add framework and toolchain.
-4. Pass explicit add-on ids and use `-y` only after flags are final.
+1. Choose framework and build tool.
+2. Choose mode (`--router-only` or full scaffold).
+3. If using Vite full scaffold, resolve add-ons, template, and deployment.
+4. Add the toolchain and use `-y` only after flags are final.
 
 ## Safe presets
 
@@ -35,4 +40,7 @@ npx @tanstack/cli create app --blank --framework react --deployment cloudflare -
 
 # Router-only preset
 npx @tanstack/cli create app --router-only --framework react --toolchain biome -y
+
+# Rsbuild preset
+npx @tanstack/cli create app --framework solid --build-tool rsbuild --toolchain biome -y
 ```

package/skills/create-app-scaffold/references/framework-adapters.md

@@ -1,6 +1,6 @@
 # Framework Adapter Options
 
-Targets `@tanstack/cli` v0.70.0.
+Targets `@tanstack/cli` v0.71.0.
 
 ## Supported values