chore: lots of small fixes

Author: jherr

packages/cta-cli/src/cli.ts

@@ -131,6 +131,7 @@ export function cli({
       },
     )
   }
+
   program
     .option<string>(
       '--framework <type>',

packages/cta-engine/src/config-file.ts

@@ -19,7 +19,9 @@ export async function writeConfigFile(
   targetDir: string,
   options: Options,
 ) {
+  /* eslint-disable unused-imports/no-unused-vars */
   const { addOns, chosenAddOns, framework, ...rest } = options
+  /* eslint-enable unused-imports/no-unused-vars */
   const persistedOptions: PersistedOptions = {
     ...rest,
     version: 1,

packages/cta-engine/src/create-app.ts

@@ -109,8 +109,8 @@ async function runCommandsAndInstallDependencies(
   ) {
     s?.start(`Setting up starter ${options.starter.name}...`)
     await environment.execute(
-      options.starter.command!.command,
-      options.starter.command!.args || [],
+      options.starter.command.command,
+      options.starter.command.args || [],
       resolve(targetDir),
     )
     s?.stop(`Starter ${options.starter.name} setup complete`)
@@ -146,18 +146,13 @@ Errors were encountered during this process:
 ${environment.getErrors().join('\n')}`
   }
 
-  const start = !!options.chosenAddOns.find((a) => a.id === 'start')
-  const { command, args } = getPackageManagerScriptCommand(
-    options.packageManager,
-    start ? ['dev'] : ['start'],
-  )
-  const startCommand = formatCommand(command, args)
-
   environment.outro(`Your ${appName} app is ready in '${basename(targetDir)}'.
 
 Use the following commands to start your app:
 % cd ${options.projectName}
-% ${startCommand}
+% ${formatCommand(
+    getPackageManagerScriptCommand(options.packageManager, ['dev']),
+  )}
 
   Please check the README.md for more information on testing, styling, adding routes, etc.${errorStatement}`)
 }

packages/cta-engine/src/template-file.ts

@@ -28,19 +28,18 @@ export function createTemplateFile(
     packageName: string,
     isDev: boolean = false,
   ) {
-    const { command, args } = getPackageManagerInstallCommand(
-      options.packageManager,
-      packageName,
-      isDev,
+    return formatCommand(
+      getPackageManagerInstallCommand(
+        options.packageManager,
+        packageName,
+        isDev,
+      ),
     )
-    return formatCommand(command, args)
   }
   function getPackageManagerRunScript(scriptName: string) {
-    const { command, args } = getPackageManagerExecuteCommand(
-      options.packageManager,
-      scriptName,
+    return formatCommand(
+      getPackageManagerExecuteCommand(options.packageManager, scriptName),
     )
-    return formatCommand(command, args)
   }
 
   class IgnoreFileError extends Error {
@@ -135,7 +134,7 @@ export function createTemplateFile(
     }
 
     if (!options.typescript) {
-      target = target.replace(/\.tsx?$/, '.jsx').replace(/\.ts$/, '.js')
+      target = target.replace(/\.tsx$/, '.jsx').replace(/\.ts$/, '.js')
     }
 
     if (append) {

packages/cta-engine/src/utils.ts

@@ -16,6 +16,12 @@ export function jsSafeName(name: string) {
     .join('')
 }
 
-export function formatCommand(command: string, args: Array<string>) {
+export function formatCommand({
+  command,
+  args,
+}: {
+  command: string
+  args: Array<string>
+}) {
   return `${command} ${args.join(' ')}`
 }

templates/react-cra/project/base/package.json

@@ -3,6 +3,7 @@
   "private": true,
   "type": "module",
   "scripts": {
+    "dev": "vite --port 3000",
     "start": "vite --port 3000",
     "build": "vite build && tsc",
     "serve": "vite preview",

templates/react-cra/project/base/src/main.tsx.ejs

@@ -12,7 +12,7 @@ import {
   createRouter,
 } from "@tanstack/react-router";
 import { TanStackRouterDevtools } from "@tanstack/react-router-devtools";
-<% for(const route of routes) { %>import <%= route.jsName %> from "<%= route.path %>";
+<% for(const route of routes) { %>import <%= route.jsName %> from "<%= relativePath(route.path) %>";
 <% } %><% if (routes.length > 0) { %>
 import Header from "./components/Header";
 <% } %><% for(const integration of integrations.filter(i => i.type === 'layout' || i.type === 'provider')) { %>

templates/solid/project/base/package.json

@@ -3,6 +3,7 @@
   "private": true,
   "type": "module",
   "scripts": {
+    "dev": "vite --port 3000",
     "start": "vite --port 3000",
     "build": "vite build && tsc",
     "serve": "vite preview",

templates/solid/project/base/src/routes/index.tsx.ejs

@@ -1,7 +1,7 @@
 <% if (codeRouter) { ignoreFile() } %>import * as Solid from 'solid-js'
 import { createFileRoute } from '@tanstack/solid-router'
-
-import Header from '../components/Header'
+<% if (addOns.length || integrations.length || routes.length) { %>
+import Header from '../components/Header'<% } %>
 import logo from '../logo.svg'
 
 export const Route = createFileRoute('/')({
@@ -10,8 +10,8 @@ export const Route = createFileRoute('/')({
 
 function IndexComponent() {
   return (
-    <div class="text-center">
-      <Header />
+    <div class="text-center"><% if (addOns.length || integrations.length || routes.length) { %>
+      <Header /><% } %>
       <header class="min-h-screen flex flex-col items-center justify-center bg-[#282c34] text-white text-[calc(10px+2vmin)]">
         <img
           src={logo}

tests/integration-tests/package.json

@@ -3,7 +3,8 @@
   "version": "0.0.1",
   "private": true,
   "scripts": {
-    "test": "vitest"
+    "test": "vitest run",
+    "test:watch": "vitest"
   },
   "dependencies": {
     "vitest": "^3.0.8",