Rename packages directory to apps for consistent monorepo structure

.changeset/loose-otters-yell.md

@@ -0,0 +1,5 @@
+---
+"create-better-t-stack": patch
+---
+
+rename packages folder to apps

apps/cli/src/helpers/addons-setup.ts

@@ -87,7 +87,7 @@ async function setupPwa(projectDir: string) {
 		await fs.copy(pwaTemplateDir, projectDir, { overwrite: true });
 	}
 
-	const clientPackageDir = path.join(projectDir, "packages/client");
+	const clientPackageDir = path.join(projectDir, "apps/client");
 
 	addPackageDependency({
 		dependencies: ["vite-plugin-pwa"],

apps/cli/src/helpers/auth-setup.ts

@@ -22,8 +22,8 @@ export async function setupAuth(
 		return;
 	}
 
-	const serverDir = path.join(projectDir, "packages/server");
-	const clientDir = path.join(projectDir, "packages/client");
+	const serverDir = path.join(projectDir, "apps/server");
+	const clientDir = path.join(projectDir, "apps/client");
 
 	try {
 		addPackageDependency({

apps/cli/src/helpers/create-readme.ts

@@ -57,7 +57,7 @@ The API is running at [http://localhost:3000](http://localhost:3000).
 
 \`\`\`
 ${projectName}/
-├── packages/
+├── apps/
 │   ├── client/         # Frontend application (React, TanStack Router)
 │   └── server/         # Backend API (Hono, tRPC)
 \`\`\`
@@ -122,16 +122,16 @@ function generateDatabaseSetup(
 
 1. Start the local SQLite database:
 \`\`\`bash
-cd packages/server && ${packageManagerRunCmd} db:local
+cd apps/server && ${packageManagerRunCmd} db:local
 \`\`\`
 
-2. Update your \`.env\` file in the \`packages/server\` directory with the appropriate connection details if needed.
+2. Update your \`.env\` file in the \`apps/server\` directory with the appropriate connection details if needed.
 `;
 	} else if (database === "postgres") {
 		setup += `This project uses PostgreSQL${orm === "drizzle" ? " with Drizzle ORM" : " with Prisma"}.
 
 1. Make sure you have a PostgreSQL database set up.
-2. Update your \`packages/server/.env\` file with your PostgreSQL connection details.
+2. Update your \`apps/server/.env\` file with your PostgreSQL connection details.
 `;
 	}
 
@@ -162,7 +162,7 @@ function generateScriptsList(
 - \`${packageManagerRunCmd} build\`: Build both client and server
 - \`${packageManagerRunCmd} dev:client\`: Start only the client
 - \`${packageManagerRunCmd} dev:server\`: Start only the server
-- \`${packageManagerRunCmd} check-types\`: Check TypeScript types across all packages`;
+- \`${packageManagerRunCmd} check-types\`: Check TypeScript types across all apps`;
 
 	if (database !== "none") {
 		scripts += `
@@ -170,7 +170,7 @@ function generateScriptsList(
 - \`${packageManagerRunCmd} db:studio\`: Open database studio UI`;
 
 		if (database === "sqlite" && orm === "drizzle") {
-			scripts += `\n- \`cd packages/server && ${packageManagerRunCmd} db:local\`: Start the local SQLite database`;
+			scripts += `\n- \`cd apps/server && ${packageManagerRunCmd} db:local\`: Start the local SQLite database`;
 		}
 	}
 

apps/cli/src/helpers/db-setup.ts

@@ -13,7 +13,7 @@ export async function setupDatabase(
 	setupTursoDb = true,
 ): Promise<void> {
 	const s = spinner();
-	const serverDir = path.join(projectDir, "packages/server");
+	const serverDir = path.join(projectDir, "apps/server");
 
 	if (databaseType === "none") {
 		await fs.remove(path.join(serverDir, "src/db"));

apps/cli/src/helpers/env-setup.ts

@@ -7,8 +7,8 @@ export async function setupEnvironmentVariables(
 	projectDir: string,
 	options: ProjectConfig,
 ): Promise<void> {
-	const serverDir = path.join(projectDir, "packages/server");
-	const clientDir = path.join(projectDir, "packages/client");
+	const serverDir = path.join(projectDir, "apps/server");
+	const clientDir = path.join(projectDir, "apps/client");
 
 	const envPath = path.join(serverDir, ".env");
 	let envContent = "";

apps/cli/src/helpers/examples-setup.ts

@@ -23,21 +23,18 @@ async function setupTodoExample(
 ): Promise<void> {
 	const todoExampleDir = path.join(PKG_ROOT, "template/examples/todo");
 	if (await fs.pathExists(todoExampleDir)) {
-		const todoRouteDir = path.join(
-			todoExampleDir,
-			"packages/client/src/routes",
-		);
-		const targetRouteDir = path.join(projectDir, "packages/client/src/routes");
+		const todoRouteDir = path.join(todoExampleDir, "apps/client/src/routes");
+		const targetRouteDir = path.join(projectDir, "apps/client/src/routes");
 		await fs.copy(todoRouteDir, targetRouteDir, { overwrite: true });
 
 		if (orm !== "none") {
 			const todoRouterSourceFile = path.join(
 				todoExampleDir,
-				`packages/server/src/routers/with-${orm}-todo.ts`,
+				`apps/server/src/routers/with-${orm}-todo.ts`,
 			);
 			const todoRouterTargetFile = path.join(
 				projectDir,
-				"packages/server/src/routers/todo.ts",
+				"apps/server/src/routers/todo.ts",
 			);
 
 			if (await fs.pathExists(todoRouterSourceFile)) {
@@ -58,7 +55,7 @@ async function updateHeaderWithTodoLink(
 ): Promise<void> {
 	const headerPath = path.join(
 		projectDir,
-		"packages/client/src/components/header.tsx",
+		"apps/client/src/components/header.tsx",
 	);
 
 	if (await fs.pathExists(headerPath)) {
@@ -87,7 +84,7 @@ async function cleanupTodoFiles(
 	if (orm === "drizzle") {
 		const todoSchemaFile = path.join(
 			projectDir,
-			"packages/server/src/db/schema/todo.ts",
+			"apps/server/src/db/schema/todo.ts",
 		);
 		if (await fs.pathExists(todoSchemaFile)) {
 			await fs.remove(todoSchemaFile);
@@ -95,7 +92,7 @@ async function cleanupTodoFiles(
 	} else if (orm === "prisma") {
 		const todoPrismaFile = path.join(
 			projectDir,
-			"packages/server/prisma/schema/todo.prisma",
+			"apps/server/prisma/schema/todo.prisma",
 		);
 		if (await fs.pathExists(todoPrismaFile)) {
 			await fs.remove(todoPrismaFile);
@@ -104,7 +101,7 @@ async function cleanupTodoFiles(
 
 	const todoRouterFile = path.join(
 		projectDir,
-		"packages/server/src/routers/todo.ts",
+		"apps/server/src/routers/todo.ts",
 	);
 	if (await fs.pathExists(todoRouterFile)) {
 		await fs.remove(todoRouterFile);
@@ -114,10 +111,7 @@ async function cleanupTodoFiles(
 }
 
 async function updateRouterIndex(projectDir: string): Promise<void> {
-	const routerFile = path.join(
-		projectDir,
-		"packages/server/src/routers/index.ts",
-	);
+	const routerFile = path.join(projectDir, "apps/server/src/routers/index.ts");
 
 	if (await fs.pathExists(routerFile)) {
 		let routerContent = await fs.readFile(routerFile, "utf8");
@@ -131,10 +125,7 @@ async function updateRouterIndex(projectDir: string): Promise<void> {
 }
 
 async function addTodoButtonToHomepage(projectDir: string): Promise<void> {
-	const indexPath = path.join(
-		projectDir,
-		"packages/client/src/routes/index.tsx",
-	);
+	const indexPath = path.join(projectDir, "apps/client/src/routes/index.tsx");
 
 	if (await fs.pathExists(indexPath)) {
 		let indexContent = await fs.readFile(indexPath, "utf8");

apps/cli/src/helpers/post-installation.ts

@@ -68,7 +68,7 @@ function getDatabaseInstructions(
 	} else if (orm === "drizzle") {
 		if (database === "sqlite") {
 			instructions.push(
-				`${pc.cyan("•")} Start local DB: ${pc.dim(`cd packages/server && ${runCmd} db:local`)}`,
+				`${pc.cyan("•")} Start local DB: ${pc.dim(`cd apps/server && ${runCmd} db:local`)}`,
 			);
 		}
 		instructions.push(
@@ -85,5 +85,5 @@ function getDatabaseInstructions(
 }
 
 function getTauriInstructions(runCmd?: string): string {
-	return `${pc.bold("Desktop app with Tauri:")}\n${pc.cyan("•")} Start desktop app: ${pc.dim(`cd packages/client && ${runCmd} desktop:dev`)}\n${pc.cyan("•")} Build desktop app: ${pc.dim(`cd packages/client && ${runCmd} desktop:build`)}\n${pc.yellow("NOTE:")} Tauri requires Rust and platform-specific dependencies. See: ${pc.dim("https://v2.tauri.app/start/prerequisites/")}\n\n`;
+	return `${pc.bold("Desktop app with Tauri:")}\n${pc.cyan("•")} Start desktop app: ${pc.dim(`cd apps/client && ${runCmd} desktop:dev`)}\n${pc.cyan("•")} Build desktop app: ${pc.dim(`cd apps/client && ${runCmd} desktop:build`)}\n${pc.yellow("NOTE:")} Tauri requires Rust and platform-specific dependencies. See: ${pc.dim("https://v2.tauri.app/start/prerequisites/")}\n\n`;
 }

apps/cli/src/helpers/project-config.ts

@@ -52,7 +52,7 @@ async function updateServerPackageJson(
 ): Promise<void> {
 	const serverPackageJsonPath = path.join(
 		projectDir,
-		"packages/server/package.json",
+		"apps/server/package.json",
 	);
 
 	if (await fs.pathExists(serverPackageJsonPath)) {

apps/cli/src/helpers/tauri-setup.ts

@@ -11,7 +11,7 @@ export async function setupTauri(
 	packageManager: PackageManager,
 ): Promise<void> {
 	const s = spinner();
-	const clientPackageDir = path.join(projectDir, "packages/client");
+	const clientPackageDir = path.join(projectDir, "apps/client");
 
 	try {
 		s.start("Setting up Tauri desktop app support...");

apps/cli/src/helpers/template-manager.ts

@@ -36,7 +36,7 @@ export async function setupOrmTemplate(
 	if (await fs.pathExists(ormTemplateDir)) {
 		await fs.copy(ormTemplateDir, projectDir, { overwrite: true });
 
-		const serverSrcPath = path.join(projectDir, "packages/server/src");
+		const serverSrcPath = path.join(projectDir, "apps/server/src");
 		const libPath = path.join(serverSrcPath, "lib");
 		const withAuthLibPath = path.join(serverSrcPath, "with-auth-lib");
 
@@ -54,8 +54,8 @@ export async function setupOrmTemplate(
 export async function fixGitignoreFiles(projectDir: string): Promise<void> {
 	const gitignorePaths = [
 		path.join(projectDir, "_gitignore"),
-		path.join(projectDir, "packages/client/_gitignore"),
-		path.join(projectDir, "packages/server/_gitignore"),
+		path.join(projectDir, "apps/client/_gitignore"),
+		path.join(projectDir, "apps/server/_gitignore"),
 	];
 
 	for (const gitignorePath of gitignorePaths) {

apps/cli/src/helpers/turso-setup.ts

@@ -159,7 +159,7 @@ async function createTursoDatabase(
 }
 
 async function writeEnvFile(projectDir: string, config?: TursoConfig) {
-	const envPath = path.join(projectDir, "packages/server", ".env");
+	const envPath = path.join(projectDir, "apps/server", ".env");
 	const envContent = config
 		? `TURSO_CONNECTION_URL="${config.dbUrl}"
 TURSO_AUTH_TOKEN="${config.authToken}"`
@@ -175,7 +175,7 @@ function displayManualSetupInstructions() {
 1. Visit https://turso.tech and create an account
 2. Create a new database from the dashboard
 3. Get your database URL and authentication token
-4. Add these credentials to the .env file in packages/server/.env
+4. Add these credentials to the .env file in apps/server/.env
 
 TURSO_CONNECTION_URL=your_database_url
 TURSO_AUTH_TOKEN=your_auth_token`);

apps/cli/template/base/apps/client/package.json

@@ -11,8 +11,10 @@
 		"check-types": "tsc --noEmit"
 	},
 	"devDependencies": {
+		"@tanstack/react-query-devtools": "^5.69.0",
+		"@tanstack/react-router-devtools": "^1.114.27",
 		"@tanstack/router-plugin": "^1.114.27",
-		"@types/node": "^22.13.11",
+		"@types/node": "^22.13.13",
 		"@types/react": "^19.0.12",
 		"@types/react-dom": "^19.0.4",
 		"@vitejs/plugin-react": "^4.3.4",
@@ -29,9 +31,7 @@
 		"@tanstack/react-form": "^1.0.5",
 		"@tailwindcss/vite": "^4.0.15",
 		"@tanstack/react-query": "^5.69.0",
-		"@tanstack/react-query-devtools": "^5.69.0",
 		"@tanstack/react-router": "^1.114.25",
-		"@tanstack/router-devtools": "^1.114.25",
 		"@trpc/client": "^11.0.0",
 		"@trpc/react-query": "^11.0.0",
 		"@trpc/server": "^11.0.0",

apps/cli/template/base/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "better-t-stack",
 	"private": true,
-	"workspaces": ["packages/*"],
+	"workspaces": ["apps/*"],
 	"scripts": {
 		"dev": "turbo dev",
 		"build": "turbo build",

apps/cli/template/with-pnpm/pnpm-workspace.yaml

@@ -1,2 +1,2 @@
 packages:
-  - "packages/*"
+  - "apps/*"