chore: massive refactor

Author: jherr

cli/create-start-app/package.json

@@ -28,7 +28,9 @@
   "license": "MIT",
   "packageManager": "[email protected]",
   "dependencies": {
-    "@tanstack/cta-cli": "workspace:*"
+    "@tanstack/cta-cli": "workspace:*",
+    "@tanstack/cta-templates-react-cra": "workspace:*",
+    "@tanstack/cta-templates-solid": "workspace:*"
   },
   "devDependencies": {
     "@types/node": "^22.13.4",

cli/create-start-app/src/index.ts

@@ -1,6 +1,12 @@
 #!/usr/bin/env node
 import { cli } from '@tanstack/cta-cli'
 
+import { register as registerReactCra } from '@tanstack/cta-templates-react-cra'
+import { register as registerSolid } from '@tanstack/cta-templates-solid'
+
+registerReactCra()
+registerSolid()
+
 cli({
   name: 'create-start-app',
   appName: 'TanStack Start',

cli/create-tanstack/package.json

@@ -28,7 +28,9 @@
   "license": "MIT",
   "packageManager": "[email protected]",
   "dependencies": {
-    "@tanstack/cta-cli": "workspace:*"
+    "@tanstack/cta-cli": "workspace:*",
+    "@tanstack/cta-templates-react-cra": "workspace:*",
+    "@tanstack/cta-templates-solid": "workspace:*"
   },
   "devDependencies": {
     "@types/node": "^22.13.4",

cli/create-tanstack/src/index.ts

@@ -1,6 +1,12 @@
 #!/usr/bin/env node
 import { cli } from '@tanstack/cta-cli'
 
+import { register as registerReactCra } from '@tanstack/cta-templates-react-cra'
+import { register as registerSolid } from '@tanstack/cta-templates-solid'
+
+registerReactCra()
+registerSolid()
+
 cli({
   name: 'create-tanstack',
   appName: 'TanStack',

cli/create-tsrouter-app/package.json

@@ -28,7 +28,9 @@
   "license": "MIT",
   "packageManager": "[email protected]",
   "dependencies": {
-    "@tanstack/cta-cli": "workspace:*"
+    "@tanstack/cta-cli": "workspace:*",
+    "@tanstack/cta-templates-react-cra": "workspace:*",
+    "@tanstack/cta-templates-solid": "workspace:*"
   },
   "devDependencies": {
     "@types/node": "^22.13.4",

cli/create-tsrouter-app/src/index.ts

@@ -1,6 +1,12 @@
 #!/usr/bin/env node
 import { cli } from '@tanstack/cta-cli'
 
+import { register as registerReactCra } from '@tanstack/cta-templates-react-cra'
+import { register as registerSolid } from '@tanstack/cta-templates-solid'
+
+registerReactCra()
+registerSolid()
+
 cli({
   name: 'create-tsrouter-app',
   appName: 'TanStack',

package.json

@@ -5,8 +5,9 @@
   "type": "module",
   "scripts": {
     "cleanNodeModules": "pnpm -r exec rm -rf node_modules",
-    "build": "nx run-many --target=build",
+    "build": "nx run-many --target=build --parallel 5",
     "cipublish": "node scripts/publish.js",
+    "dev": "nx run-many --target=dev --parallel 10",
     "test": "nx run-many -t test"
   },
   "repository": {
@@ -28,15 +29,18 @@
       "create-tanstack": "workspace:*",
       "create-tsrouter-app": "workspace:*",
       "@tanstack/cta-cli": "workspace:*",
+      "@tanstack/cta-core": "workspace:*",
       "@tanstack/cta-engine": "workspace:*",
       "@tanstack/cta-mcp": "workspace:*",
-      "@tanstack/cta-ui": "workspace:*"
+      "@tanstack/cta-ui": "workspace:*",
+      "@tanstack/cta-templates-react-cra": "workspace:*",
+      "@tanstack/cta-templates-solid": "workspace:*"
     }
   },
   "workspaces": [
-    "./apps/*",
     "./cli/*",
-    "./packages/*"
+    "./packages/*",
+    "./templates/*"
   ],
   "dependencies": {
     "@tanstack/config": "^0.16.2"

packages/cta-cli/package.json

@@ -8,7 +8,6 @@
   "scripts": {
     "build": "tsc",
     "dev": "tsc --watch",
-    "cipublish": "node scripts/publish.js",
     "test:lint": "eslint ./src"
   },
   "repository": {
@@ -30,6 +29,7 @@
   "license": "MIT",
   "packageManager": "[email protected]",
   "dependencies": {
+    "@tanstack/cta-core": "workspace:*",
     "@tanstack/cta-engine": "workspace:*",
     "@tanstack/cta-mcp": "workspace:*",
     "@tanstack/cta-ui": "workspace:*",

packages/cta-cli/src/cli.ts

@@ -3,16 +3,15 @@ import { intro, log } from '@clack/prompts'
 import chalk from 'chalk'
 
 import {
-  DEFAULT_FRAMEWORK,
-  SUPPORTED_FRAMEWORKS,
   SUPPORTED_PACKAGE_MANAGERS,
   SUPPORTED_TOOLCHAINS,
-  addToApp,
-  createApp,
   createDefaultEnvironment,
   getAllAddOns,
-  initAddOn,
-} from '@tanstack/cta-engine'
+  getFrameworkById,
+  getFrameworkByName,
+  getFrameworks,
+} from '@tanstack/cta-core'
+import { addToApp, createApp, initAddOn } from '@tanstack/cta-engine'
 
 import { runMCPServer } from '@tanstack/cta-mcp'
 
@@ -23,12 +22,11 @@ import { normalizeOptions, promptForOptions } from './options.js'
 import { createUIEnvironment } from './ui-environment.js'
 
 import type {
-  Framework,
   Mode,
   PackageManager,
   TemplateOptions,
   ToolChain,
-} from '@tanstack/cta-engine'
+} from '@tanstack/cta-core'
 
 import type { CliOptions } from './types.js'
 
@@ -43,7 +41,7 @@ async function listAddOns(
   },
 ) {
   const addOns = await getAllAddOns(
-    options.framework || DEFAULT_FRAMEWORK,
+    getFrameworkById(options.framework || 'react-cra')!,
     forcedMode || options.template || 'typescript',
   )
   for (const addOn of addOns.filter((a) => !forcedAddOns.includes(a.id))) {
@@ -66,6 +64,8 @@ export function cli({
 
   const program = new Command()
 
+  const availableFrameworks = getFrameworks().map((f) => f.name)
+
   program.name(name).description(`CLI to create a new ${appName} application`)
 
   program
@@ -124,20 +124,18 @@ export function cli({
     )
   }
   program
-    .option<Framework>(
+    .option<string>(
       '--framework <type>',
-      'project framework (solid, react)',
+      `project framework (${availableFrameworks.join(', ')})`,
       (value) => {
-        if (!SUPPORTED_FRAMEWORKS.includes(value as Framework)) {
+        if (!availableFrameworks.includes(value)) {
           throw new InvalidArgumentError(
-            `Invalid framework: ${value}. Only the following are allowed: ${SUPPORTED_FRAMEWORKS.join(
-              ', ',
-            )}`,
+            `Invalid framework: ${value}. Only the following are allowed: ${availableFrameworks.join(', ')}`,
           )
         }
-        return value as Framework
+        return value
       },
-      DEFAULT_FRAMEWORK,
+      'react',
     )
     .option(
       '--starter [url]',
@@ -212,6 +210,10 @@ export function cli({
           ...options,
         } as CliOptions
 
+        cliOptions.framework = getFrameworkByName(
+          options.framework || 'react',
+        )!.id
+
         if (forcedMode) {
           cliOptions.template = forcedMode as TemplateOptions
         }
@@ -231,7 +233,7 @@ export function cli({
           })
         }
         await createApp(finalOptions, {
-          environment: createDefaultEnvironment(),
+          environment: createUIEnvironment(),
           cwd: options.targetDir || undefined,
           name,
           appName,

packages/cta-cli/src/options.ts

@@ -9,17 +9,17 @@ import {
 
 import {
   CODE_ROUTER,
-  DEFAULT_FRAMEWORK,
   DEFAULT_PACKAGE_MANAGER,
   DEFAULT_TOOLCHAIN,
   FILE_ROUTER,
   SUPPORTED_PACKAGE_MANAGERS,
   SUPPORTED_TOOLCHAINS,
   finalizeAddOns,
   getAllAddOns,
+  getFrameworkById,
   getPackageManager,
   loadRemoteAddOn,
-} from '@tanstack/cta-engine'
+} from '@tanstack/cta-core'
 
 import type {
   AddOn,
@@ -28,7 +28,7 @@ import type {
   Starter,
   TemplateOptions,
   Variable,
-} from '@tanstack/cta-engine'
+} from '@tanstack/cta-core'
 
 import type { CliOptions } from './types.js'
 
@@ -93,8 +93,9 @@ export async function normalizeOptions(
           ]),
         )
       }
+      const framework = getFrameworkById(cliOptions.framework || 'react-cra')!
       chosenAddOns = await finalizeAddOns(
-        cliOptions.framework || DEFAULT_FRAMEWORK,
+        framework,
         forcedMode || cliOptions.template === 'file-router'
           ? FILE_ROUTER
           : CODE_ROUTER,
@@ -105,7 +106,8 @@ export async function normalizeOptions(
     }
 
     return {
-      framework: cliOptions.framework || 'react',
+      // TODO: This is a bit to fix the default framework
+      framework: getFrameworkById(cliOptions.framework || 'react-cra')!,
       projectName: cliOptions.projectName,
       typescript,
       tailwind,
@@ -176,8 +178,10 @@ export async function promptForOptions(
 ): Promise<Required<Options>> {
   const options = {} as Required<Options>
 
-  options.framework = cliOptions.framework || DEFAULT_FRAMEWORK
-  if (options.framework === 'solid') {
+  const framework = getFrameworkById(cliOptions.framework || 'react-cra')!
+  options.framework = framework
+  // TODO: This is a bit of a hack to ensure that the framework is solid
+  if (options.framework.id === 'solid') {
     options.typescript = true
     options.tailwind = true
   }
@@ -253,7 +257,7 @@ export async function promptForOptions(
   }
 
   // Tailwind selection
-  if (!cliOptions.tailwind && options.framework === 'react') {
+  if (!cliOptions.tailwind && options.framework.id === 'react-cra') {
     const tailwind = await confirm({
       message: 'Would you like to use Tailwind CSS?',
       initialValue: true,
@@ -264,7 +268,8 @@ export async function promptForOptions(
     }
     options.tailwind = tailwind
   } else {
-    options.tailwind = options.framework === 'solid' || !!cliOptions.tailwind
+    // TODO: This is a bit of a hack to ensure that the framework is solid
+    options.tailwind = options.framework.id === 'solid' || !!cliOptions.tailwind
   }
 
   // Package manager selection