feat(create): rename bundler option to build tool

Author: SyMind

.agents/index.md

@@ -49,7 +49,7 @@ node ../cli/packages/cli/dist/index.js create my-app
 | Add-on    | Plugin that extends apps (auth, DB, etc) | `--add-ons`   |
 | Template  | Reusable project template                  | `--template`  |
 | Framework | React or Solid                           | `--framework` |
-| Bundler   | Vite (default) or Rsbuild                | `--bundler`   |
+| Build tool | Vite (default) or Rsbuild               | `--build-tool` |
 
 ## CLI Commands
 
@@ -71,7 +71,7 @@ node ../cli/packages/cli/dist/index.js create my-app
 | -------------------- | ------------------------------------------------------- |
 | `--add-ons <ids>`    | Comma-separated add-on IDs                              |
 | `--framework <name>` | React or Solid                                          |
-| `--bundler <name>`   | Vite (default) or Rsbuild                               |
+| `--build-tool <name>` | Vite (default) or Rsbuild                              |
 | `--toolchain <id>`   | Toolchain (use `--list-add-ons` to see options)         |
 | `--deployment <id>`  | Deployment target (use `--list-add-ons` to see options) |
 | `--template <url-or-id>` | Use template URL/path or built-in ID               |
@@ -134,7 +134,7 @@ This project uses [TanStack Intent](https://github.com/TanStack/intent). Run `np
 <!-- intent-skills:start -->
 # Skill mappings — when working in these areas, load the linked skill file into context.
 skills:
-  - task: "scaffold a new TanStack app with create command, framework, bundler, template, toolchain, deployment, or add-on flags"
+  - task: "scaffold a new TanStack app with create command, framework, build tool, template, toolchain, deployment, or add-on flags"
     load: "packages/cli/skills/create-app-scaffold/SKILL.md"
   - task: "add add-ons to an existing project using tanstack add"
     load: "packages/cli/skills/add-addons-existing-app/SKILL.md"
@@ -145,4 +145,3 @@ skills:
   - task: "author, compile, or dev-watch custom add-ons or templates"
     load: "packages/cli/skills/maintain-custom-addons-dev-watch/SKILL.md"
 <!-- intent-skills:end -->
-

.changeset/green-builders-rise.md

@@ -3,5 +3,5 @@
 '@tanstack/cli': minor
 ---
 
-Add first-class Rsbuild bundler support for React and Solid TanStack Start and
+Add first-class Rsbuild build tool support for React and Solid TanStack Start and
 router-only scaffolds, including Tailwind and ESLint/Biome toolchains.

README.md

@@ -44,7 +44,7 @@ npx @tanstack/cli create my-app
 
 - **TanStack Start** - Full-stack SSR framework (default)
 - **TanStack Router** - Type-safe routing (`--router-only` for SPA)
-- **Vite or Rsbuild** - Choose the bundler for React and Solid projects
+- **Vite or Rsbuild** - Choose the build tool for React and Solid projects
 - **Add-ons** - Auth, database, deployment, monitoring, and more
 - **CLI Introspection** - Agent-friendly discovery via JSON CLI output
 
@@ -61,7 +61,7 @@ npx @tanstack/cli create my-app --blank -y
 npx @tanstack/cli create my-app --router-only
 
 # Create with Rsbuild
-npx @tanstack/cli create my-app --bundler rsbuild -y
+npx @tanstack/cli create my-app --build-tool rsbuild -y
 
 # With add-ons
 npx @tanstack/cli create my-app --add-ons clerk,drizzle,tanstack-query
@@ -88,7 +88,7 @@ npx @tanstack/cli search-docs "loaders" --library router --framework react --jso
 
 TanStack CLI sends anonymous usage telemetry by default.
 
-- Sent: command usage, durations, selected framework/bundler/package manager/add-on ids, and coarse result metadata
+- Sent: command usage, durations, selected framework/build tool/package manager/add-on ids, and coarse result metadata
 - Never sent: project names, file paths, target directories, raw search queries, raw template URLs/paths, add-on config values, env vars, or raw error messages
 - Disabled automatically in `CI`, or when `DO_NOT_TRACK=1` or `TANSTACK_CLI_TELEMETRY_DISABLED=1`
 

docs/cli-reference.md

@@ -18,7 +18,7 @@ tanstack create [project-name] [options]
 | `--blank` | Create a minimal one-route Start project without default starter UI, examples, Tailwind, devtools, or a test stack |
 | `--package-manager <pm>` | `npm`, `pnpm`, `yarn`, `bun`, `deno` |
 | `--framework <name>` | `React`, `Solid` |
-| `--bundler <name>` | `vite` (default), `rsbuild` |
+| `--build-tool <name>` | `vite` (default), `rsbuild` |
 | `--router-only` | Create file-based Router-only app without TanStack Start (add-ons/deployment/template disabled) |
 | `--toolchain <id>` | Toolchain add-on (use `--list-add-ons` to see options) |
 | `--deployment <id>` | Deployment add-on (use `--list-add-ons` to see options) |
@@ -42,8 +42,8 @@ tanstack create my-app --blank -y
 tanstack create my-app --blank --deployment cloudflare -y
 tanstack create my-app --add-ons clerk,drizzle,tanstack-query
 tanstack create my-app --router-only --toolchain eslint --no-examples
-tanstack create my-app --bundler rsbuild -y
-tanstack create my-app --framework Solid --bundler rsbuild --router-only --blank --toolchain biome -y
+tanstack create my-app --build-tool rsbuild -y
+tanstack create my-app --framework Solid --build-tool rsbuild --router-only --blank --toolchain biome -y
 tanstack create my-app --template https://example.com/template.json
 tanstack create my-app --template ecommerce
 tanstack create --list-add-ons --framework React --json

docs/quick-start.md

@@ -29,11 +29,11 @@ npx @tanstack/cli create my-app --add-ons tanstack-query,clerk,drizzle -y
 # Router-only SPA (no SSR)
 npx @tanstack/cli create my-app --router-only -y
 
-# Rsbuild instead of the default Vite bundler
-npx @tanstack/cli create my-app --bundler rsbuild -y
+# Rsbuild instead of the default Vite build tool
+npx @tanstack/cli create my-app --build-tool rsbuild -y
 
 # Minimal router-only Rsbuild app
-npx @tanstack/cli create my-app --bundler rsbuild --router-only --blank -y
+npx @tanstack/cli create my-app --build-tool rsbuild --router-only --blank -y
 ```
 
 Blank projects omit the default starter interface, examples, Tailwind,

packages/cli/skills/create-app-scaffold/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: create-app-scaffold
 description: >
-  Scaffold a TanStack app with tanstack create using --framework, --bundler, --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.
@@ -36,7 +36,7 @@ fits its initial compatibility surface.
 ```bash
 npx @tanstack/cli create acme-web \
   --framework react \
-  --bundler rsbuild \
+  --build-tool rsbuild \
   --toolchain biome \
   -y
 ```
@@ -175,6 +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)
-- [Bundler options](references/bundlers.md)
+- [Build tool options](references/bundlers.md)
 - [Deployment provider options](references/deployment-providers.md)
 - [Toolchain options](references/toolchains.md)

packages/cli/skills/create-app-scaffold/references/bundlers.md

@@ -1,4 +1,4 @@
-# Bundler Options
+# Build Tool Options
 
 Targets `@tanstack/cli` v0.71.0.
 
@@ -10,8 +10,8 @@ Targets `@tanstack/cli` v0.71.0.
 ## Usage
 
 ```bash
-npx @tanstack/cli create app --framework react --bundler vite -y
-npx @tanstack/cli create app --framework solid --bundler rsbuild -y
+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
@@ -20,8 +20,8 @@ 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 bundler-aware catalog view before constructing an Rsbuild command:
+Use the build-tool-aware catalog view before constructing an Rsbuild command:
 
 ```bash
-npx @tanstack/cli create --list-add-ons --bundler rsbuild --json
+npx @tanstack/cli create --list-add-ons --build-tool rsbuild --json
 ```

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

@@ -7,7 +7,7 @@ Targets `@tanstack/cli` v0.71.0.
 | Flag | Works with normal create | Works with `--router-only` | Notes |
 |---|---|---|---|
 | `--framework` | yes | yes | Framework is still honored in both modes. |
-| `--bundler` | yes | yes | `vite` is the default; `rsbuild` supports React and Solid. |
+| `--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. |
@@ -16,15 +16,15 @@ Targets `@tanstack/cli` v0.71.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 `--bundler rsbuild`, only toolchain catalog entries are compatible.
+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 framework and bundler.
+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.
@@ -42,5 +42,5 @@ npx @tanstack/cli create app --blank --framework react --deployment cloudflare -
 npx @tanstack/cli create app --router-only --framework react --toolchain biome -y
 
 # Rsbuild preset
-npx @tanstack/cli create app --framework solid --bundler rsbuild --toolchain biome -y
+npx @tanstack/cli create app --framework solid --build-tool rsbuild --toolchain biome -y
 ```

packages/cli/src/cli.ts

@@ -183,7 +183,7 @@ export function getCreateTelemetryProperties(projectName: string, options: CliOp
       : undefined,
     command_variant: getCreateCommandVariant(options),
     deployment: options.deployment ? sanitizeId(options.deployment) : undefined,
-    bundler: options.bundler ? sanitizeId(options.bundler) : undefined,
+    bundler: options.buildTool ? sanitizeId(options.buildTool) : undefined,
     examples: options.examples,
     blank: !!options.blank,
     framework: options.framework ? sanitizeId(options.framework) : undefined,
@@ -311,7 +311,7 @@ export function cli({
     lines.push(`  Location:        ${finalOptions.targetDir}`)
     lines.push(`  Framework:       ${finalOptions.framework.name}`)
     lines.push(
-      `  Bundler:         ${resolveBundler(finalOptions.framework, finalOptions.bundler).name}`,
+      `  Build tool:      ${resolveBundler(finalOptions.framework, finalOptions.bundler).name}`,
     )
     lines.push(`  Mode:            ${finalOptions.mode}`)
     if (finalOptions.projectPreset === 'blank') {
@@ -674,7 +674,7 @@ export function cli({
             const addOns = await getAllAddOns(
               getFrameworkByName(options.framework || defaultFramework || 'React')!,
               defaultMode,
-              options.bundler,
+              options.buildTool,
             )
             const visibleAddOns = addOns.filter((a) => !forcedAddOns.includes(a.id))
             telemetry.mergeProperties({
@@ -720,7 +720,7 @@ export function cli({
             const addOns = await getAllAddOns(
               getFrameworkByName(options.framework || defaultFramework || 'React')!,
               defaultMode,
-              options.bundler,
+              options.buildTool,
             )
             const addOn =
               addOns.find((a) => a.id === options.addonDetails) ??
@@ -975,20 +975,20 @@ export function cli({
 
     cmd
       .option<string>(
-        `--bundler <${Array.from(bundlers).join('|')}>`,
-        'select the project bundler',
+        `--build-tool <${Array.from(bundlers).join('|')}>`,
+        'select the project build tool',
         (value) => {
-          const bundler = Array.from(bundlers).find(
+          const buildTool = Array.from(bundlers).find(
             (item) => item.toLowerCase() === value.toLowerCase(),
           )
-          if (!bundler) {
+          if (!buildTool) {
             throw new InvalidArgumentError(
-              `Invalid bundler: ${value}. The following are allowed: ${Array.from(
+              `Invalid build tool: ${value}. The following are allowed: ${Array.from(
                 bundlers,
               ).join(', ')}`,
             )
           }
-          return bundler
+          return buildTool
         },
       )
       .option(

packages/cli/src/command-line.ts

@@ -325,7 +325,7 @@ export function validateLegacyCreateFlags(cliOptions: CliOptions): {
     legacyTemplate !== undefined &&
     SUPPORTED_LEGACY_TEMPLATES.has(legacyTemplate)
 
-  if (cliOptions.bundler?.toLowerCase() === 'rsbuild') {
+  if (cliOptions.buildTool?.toLowerCase() === 'rsbuild') {
     if (
       cliOptions.starter ||
       (cliOptions.template && !isSupportedLegacyTemplate) ||
@@ -513,8 +513,8 @@ export async function normalizeOptions(
   const initialFramework = getFrameworkById(preferredFramework)
   let framework = initialFramework!
   const bundler = initialFramework
-    ? resolveBundler(initialFramework, cliOptions.bundler).id
-    : (cliOptions.bundler ?? 'vite')
+    ? resolveBundler(initialFramework, cliOptions.buildTool).id
+    : (cliOptions.buildTool ?? 'vite')
 
   if (bundler === 'rsbuild') {
     if (