feat: Update UI components for generated React components

.changeset/better-ways-try.md

@@ -0,0 +1,5 @@
+---
+'@baseplate-dev/react-generators': minor
+---
+
+Refresh all UI components generated by React generators to use ShadCN components

.changeset/lazy-pianos-build.md

@@ -0,0 +1,5 @@
+---
+'@baseplate-dev/project-builder-cli': patch
+---
+
+Refactor template commands to allow listing/deleting of templates from CLI

.changeset/lucky-banks-sell.md

@@ -0,0 +1,5 @@
+---
+'@baseplate-dev/react-generators': patch
+---
+
+Match tsconfig for React projects to newer Vite templates with tsconfig.app and tsconfig.node

.changeset/seven-paws-tell.md

@@ -0,0 +1,5 @@
+---
+'@baseplate-dev/sync': patch
+---
+
+Fix issues with how renames are handled

.changeset/tough-ducks-fall.md

@@ -0,0 +1,7 @@
+---
+'@baseplate-dev/project-builder-server': patch
+'@baseplate-dev/project-builder-cli': patch
+'@baseplate-dev/sync': patch
+---
+
+Add command to list available generators with templates

.github/workflows/test-e2e.yml

@@ -34,7 +34,7 @@ jobs:
           cache: 'pnpm'
 
       - name: Install Dependencies
-        run: pnpm install --frozen-lockfile --filter @baseplate-dev/project-builder-test... --filter @baseplate-dev/project-builder-cli... --filter @baseplate-dev/root
+        run: pnpm install --frozen-lockfile
 
       - name: Get Playwright version
         id: get-playwright-version

.npmrc

@@ -6,3 +6,7 @@ save-prefix=""
 link-workspace-packages=true
 # Defaults to saving as workspace:*
 save-workspace-protocol=rolling
+
+# Hoist prettier-plugin-packagejson to allow husky to prettify all files
+public-hoist-pattern[]=prettier-plugin-packagejson
+public-hoist-pattern[]=prettier-plugin-tailwindcss

.vscode/tasks.json

@@ -39,6 +39,7 @@
       "group": "build",
       "problemMatcher": {
         "base": "$tsc-watch",
+        "owner": "typescript",
         "pattern": {
           "regexp": "^//:watch:tsc:root: (.+):(\\d+):(\\d+) - (error|warning|info) TS(\\d+): (.*)$",
           "file": 1,

CLAUDE.md

@@ -30,6 +30,7 @@ Note: Make sure to run the commands in the sub-packages if only modifying files
 - If a particular interface or type is not exported, change the file so it is exported
 - We use the prefer using nullish coalescing operator (`??`) ESLint rule instead of a logical or (`||`), as it is a safer operator
 - Prefer barrel exports e.g. export \* from './foo.js' instead of individual named exports
+- Use console.info/warn/error instead of console.log
 
 ## UI Development Guidelines
 

knip.config.js

@@ -35,11 +35,6 @@ export default {
     'packages/fastify-generators': {
       entry: ['src/index.{ts,tsx}'],
       project: 'src/**/*.{ts,tsx}',
-      ignoreDependencies: [
-        // Tricky bug where @tailwlindcss/forms is being used by prettier-plugin-tailwindcss
-        // so must be included to not bug the build
-        '@tailwindcss/forms',
-      ],
     },
     'packages/project-builder-web': {
       entry: ['src/index.{ts,tsx}'],

packages/core-generators/src/generators/node/typescript/typescript.generator.ts

@@ -162,6 +162,7 @@ const [setupTask, typescriptSetupProvider, typescriptSetupValuesProvider] =
       exclude: t.array<string>(['**/node_modules', '**/dist', '**/lib']),
       references: t.array<TypescriptConfigReference>(),
       extraSections: t.array<Record<string, unknown>>(),
+      tsconfigPath: t.scalar<string>('tsconfig.json'),
     }),
     {
       prefix: 'typescript',
@@ -206,7 +207,7 @@ export const typescriptGenerator = createGenerator({
 
             writeJsonToBuilder(builder, {
               id: 'tsconfig',
-              destination: 'tsconfig.json',
+              destination: typescriptConfig.tsconfigPath,
               contents: {
                 compilerOptions,
                 include,

packages/core-generators/src/generators/node/typescript/typescript.generator.unit.test.ts

@@ -22,6 +22,7 @@ describe('typescriptGenerator', () => {
       exclude: ['**/node_modules', '**/dist'],
       references: [],
       extraSections: [],
+      tsconfigPath: 'tsconfig.json',
     };
 
     const testTemplateFile = createTsTemplateFile({

packages/core-generators/src/renderers/typescript/extractor/get-resolver-factory.ts

@@ -1,3 +1,4 @@
+import { existsSync } from 'node:fs';
 import path from 'node:path';
 import { ResolverFactory } from 'oxc-resolver';
 
@@ -7,9 +8,16 @@ import { ResolverFactory } from 'oxc-resolver';
  * @returns A resolver factory for the given working directory.
  */
 export function getResolverFactory(workingDirectory: string): ResolverFactory {
+  // Slight hack to support tsconfig.app.json instead of tsconfig.json
+  const tsconfigAppExists = existsSync(
+    path.join(workingDirectory, 'tsconfig.app.json'),
+  );
+  const tsconfigPath = tsconfigAppExists
+    ? path.join(workingDirectory, 'tsconfig.app.json')
+    : path.join(workingDirectory, 'tsconfig.json');
   return new ResolverFactory({
     tsconfig: {
-      configFile: path.join(workingDirectory, 'tsconfig.json'),
+      configFile: tsconfigPath,
     },
     conditionNames: ['node', 'require', 'types'],
     extensions: ['.ts', '.tsx', '.d.ts', '.js', '.jsx', '.json', '.node'],

packages/core-generators/src/renderers/typescript/extractor/organize-ts-template-imports.unit.test.ts

@@ -72,6 +72,8 @@ export function capitalizeString(str: string) {
 
 import { A } from "test";
 
+
+
 export function capitalizeString(str: string) {
     A();
 }

packages/core-generators/src/renderers/typescript/imports/ts-morph-operations.ts

@@ -160,7 +160,7 @@ export function replaceImportDeclarationsInSourceFile(
           const child = children[0];
           return !Node.isStringLiteral(child);
         });
-  const insertionPosition = firstNonDirectiveNode?.getNonWhitespaceStart() ?? 0;
+  const insertionPosition = firstNonDirectiveNode?.getFullStart() ?? 0;
 
   // special case shebang to remove the first line if it's a shebang
   const firstNonDirectiveNodeHasShebang = firstNonDirectiveNode
@@ -175,6 +175,9 @@ export function replaceImportDeclarationsInSourceFile(
     if (beforeImportsWriter) {
       beforeImportsWriter(writer);
     }
+    if (insertionPosition > 0) {
+      writer.blankLineIfLastNot();
+    }
     writeGroupedImportDeclarationsWithCodeBlockWriter(
       writer,
       newImportDeclarations,

packages/core-generators/src/renderers/typescript/imports/ts-morph-operations.unit.test.ts

@@ -503,8 +503,13 @@ const x = A();`,
     it('should preserve client directives', () => {
       // Arrange
       sourceFile.replaceWithText(
-        `"use client";
-import React from "react";
+        `'use client';
+
+import type React from 'react';
+
+import { Toaster as Sonner } from 'sonner';
+
+import { buttonVariants } from '@src/styles/button.js';
 
 const x = A();`,
       );
@@ -528,7 +533,7 @@ const x = A();`,
 
       // Assert
       expect(sourceFile.getFullText()).toBe(
-        '"use client";\n' + 'import React from "react";\n\nconst x = A();',
+        "'use client';\n\n" + 'import React from "react";\n\n\nconst x = A();',
       );
     });
 

packages/core-generators/src/renderers/typescript/utils/ts-code-utils.ts

@@ -581,3 +581,6 @@ export const TsCodeUtils = {
 
 // Shortcut for template function
 export const tsTemplate = TsCodeUtils.template.bind(TsCodeUtils);
+
+export const tsTemplateWithImports =
+  TsCodeUtils.templateWithImports.bind(TsCodeUtils);

packages/fastify-generators/package.json

@@ -58,7 +58,6 @@
   },
   "devDependencies": {
     "@baseplate-dev/tools": "workspace:*",
-    "@tailwindcss/forms": "0.5.9",
     "concurrently": "9.0.1",
     "cpx2": "catalog:",
     "eslint": "catalog:",

packages/project-builder-cli/package.json

@@ -44,7 +44,7 @@
     "clean": "rm -rf ./dist",
     "dev": "tsx watch --tsconfig ./tsconfig.app.json --exclude /**/node_modules/** -r dotenv/config -C development ./src/cli.ts",
     "dev:serve": "pnpm dev serve",
-    "extract:templates": "pnpm start extract-templates",
+    "extract:templates": "pnpm start templates extract",
     "lint": "eslint .",
     "prettier:check": "prettier --check .",
     "prettier:write": "prettier -w .",

packages/project-builder-cli/src/commands/build.ts

@@ -30,6 +30,7 @@ export function addBuildCommand(program: Command): void {
         logger,
         context,
         userConfig,
+        cliFilePath: process.argv[1],
       });
     });
 }

packages/project-builder-cli/src/commands/server.ts

@@ -55,6 +55,7 @@ export async function serveWebServer(
     builtInPlugins,
     userConfig,
     skipCommands,
+    cliFilePath: process.argv[1],
   });
 
   const fastifyInstance = await startWebServer({