From d0133f3b6477b131ec7ff7f3593d050ec4525cf2 Mon Sep 17 00:00:00 2001 From: Aman Varshney Date: Mon, 24 Mar 2025 23:20:14 +0530 Subject: [PATCH] Rename packages directory to apps for consistent monorepo structure --- .changeset/loose-otters-yell.md | 5 +++ apps/cli/src/helpers/addons-setup.ts | 2 +- apps/cli/src/helpers/auth-setup.ts | 4 +-- apps/cli/src/helpers/create-readme.ts | 12 ++++---- apps/cli/src/helpers/db-setup.ts | 2 +- apps/cli/src/helpers/env-setup.ts | 4 +-- apps/cli/src/helpers/examples-setup.ts | 29 ++++++------------ apps/cli/src/helpers/post-installation.ts | 4 +-- apps/cli/src/helpers/project-config.ts | 2 +- apps/cli/src/helpers/tauri-setup.ts | 2 +- apps/cli/src/helpers/template-manager.ts | 6 ++-- apps/cli/src/helpers/turso-setup.ts | 4 +-- .../base/{packages => apps}/client/_gitignore | 0 .../{packages => apps}/client/components.json | 0 .../base/{packages => apps}/client/index.html | 0 .../{packages => apps}/client/package.json | 6 ++-- .../client/src/components/header.tsx | 0 .../client/src/components/loader.tsx | 0 .../client/src/components/mode-toggle.tsx | 0 .../client/src/components/theme-provider.tsx | 0 .../client/src/components/ui/button.tsx | 0 .../client/src/components/ui/card.tsx | 0 .../client/src/components/ui/checkbox.tsx | 0 .../src/components/ui/dropdown-menu.tsx | 0 .../client/src/components/ui/input.tsx | 0 .../client/src/components/ui/label.tsx | 0 .../client/src/components/ui/skeleton.tsx | 0 .../client/src/components/ui/sonner.tsx | 0 .../{packages => apps}/client/src/index.css | 0 .../client/src/lib/utils.ts | 0 .../{packages => apps}/client/src/main.tsx | 0 .../client/src/routes/__root.tsx | 0 .../client/src/routes/index.tsx | 0 .../client/src/utils/trpc.ts | 0 .../{packages => apps}/client/tsconfig.json | 0 .../{packages => apps}/client/vite.config.ts | 0 .../base/{packages => apps}/server/_gitignore | 0 .../{packages => apps}/server/package.json | 0 .../{packages => apps}/server/src/index.ts | 0 .../server/src/lib/context.ts | 0 .../{packages => apps}/server/src/lib/trpc.ts | 0 .../server/src/routers/index.ts | 0 .../{packages => apps}/server/tsconfig.json | 0 apps/cli/template/base/package.json | 2 +- .../client/src/routes/todos.tsx | 0 .../server/src/routers/with-drizzle-todo.ts | 0 .../server/src/routers/with-prisma-todo.ts | 0 .../client/src/components/auth-forms.tsx | 0 .../client/src/components/header.tsx | 0 .../client/src/components/sign-in-form.tsx | 0 .../client/src/components/sign-up-form.tsx | 0 .../client/src/components/user-menu.tsx | 0 .../client/src/lib/auth-client.ts | 0 .../{packages => apps}/client/src/main.tsx | 0 .../client/src/routes/dashboard.tsx | 0 .../client/src/routes/login.tsx | 0 .../{packages => apps}/server/src/index.ts | 0 .../{packages => apps}/server/src/lib/trpc.ts | 0 .../server/src/routers/index.ts | 0 .../server/drizzle.config.ts | 0 .../{packages => apps}/server/src/db/index.ts | 0 .../server/src/db/schema/auth.ts | 0 .../server/src/db/schema/todo.ts | 0 .../server/src/routers/todo.ts | 0 .../server/src/with-auth-lib/auth.ts | 0 .../server/src/with-auth-lib/context.ts | 0 .../server/src/with-auth-lib/trpc.ts | 0 .../server/drizzle.config.ts | 0 .../{packages => apps}/server/src/db/index.ts | 0 .../server/src/db/schema/auth.ts | 0 .../server/src/db/schema/todo.ts | 0 .../server/src/with-auth-lib/auth.ts | 0 .../server/src/with-auth-lib/context.ts | 0 .../server/src/with-auth-lib/trpc.ts | 0 .../template/with-pnpm/pnpm-workspace.yaml | 2 +- .../{packages => apps}/server/prisma/index.ts | 0 .../server/prisma/schema/auth.prisma | 0 .../server/prisma/schema/schema.prisma | 0 .../server/prisma/schema/todo.prisma | 0 .../server/src/with-auth-lib/auth.ts | 0 .../server/src/with-auth-lib/context.ts | 0 .../server/src/with-auth-lib/trpc.ts | 0 .../{packages => apps}/server/prisma/index.ts | 0 .../server/prisma/schema/auth.prisma | 0 .../server/prisma/schema/schema.prisma | 0 .../server/prisma/schema/todo.prisma | 0 .../server/src/with-auth-lib/auth.ts | 0 .../server/src/with-auth-lib/context.ts | 0 .../server/src/with-auth-lib/trpc.ts | 0 .../{packages => apps}/client/public/logo.png | Bin .../client/pwa-assets.config.ts | 0 .../{packages => apps}/client/vite.config.ts | 0 92 files changed, 41 insertions(+), 45 deletions(-) create mode 100644 .changeset/loose-otters-yell.md rename apps/cli/template/base/{packages => apps}/client/_gitignore (100%) rename apps/cli/template/base/{packages => apps}/client/components.json (100%) rename apps/cli/template/base/{packages => apps}/client/index.html (100%) rename apps/cli/template/base/{packages => apps}/client/package.json (93%) rename apps/cli/template/base/{packages => apps}/client/src/components/header.tsx (100%) rename apps/cli/template/base/{packages => apps}/client/src/components/loader.tsx (100%) rename apps/cli/template/base/{packages => apps}/client/src/components/mode-toggle.tsx (100%) rename apps/cli/template/base/{packages => apps}/client/src/components/theme-provider.tsx (100%) rename apps/cli/template/base/{packages => apps}/client/src/components/ui/button.tsx (100%) rename apps/cli/template/base/{packages => apps}/client/src/components/ui/card.tsx (100%) rename apps/cli/template/base/{packages => apps}/client/src/components/ui/checkbox.tsx (100%) rename apps/cli/template/base/{packages => apps}/client/src/components/ui/dropdown-menu.tsx (100%) rename apps/cli/template/base/{packages => apps}/client/src/components/ui/input.tsx (100%) rename apps/cli/template/base/{packages => apps}/client/src/components/ui/label.tsx (100%) rename apps/cli/template/base/{packages => apps}/client/src/components/ui/skeleton.tsx (100%) rename apps/cli/template/base/{packages => apps}/client/src/components/ui/sonner.tsx (100%) rename apps/cli/template/base/{packages => apps}/client/src/index.css (100%) rename apps/cli/template/base/{packages => apps}/client/src/lib/utils.ts (100%) rename apps/cli/template/base/{packages => apps}/client/src/main.tsx (100%) rename apps/cli/template/base/{packages => apps}/client/src/routes/__root.tsx (100%) rename apps/cli/template/base/{packages => apps}/client/src/routes/index.tsx (100%) rename apps/cli/template/base/{packages => apps}/client/src/utils/trpc.ts (100%) rename apps/cli/template/base/{packages => apps}/client/tsconfig.json (100%) rename apps/cli/template/base/{packages => apps}/client/vite.config.ts (100%) rename apps/cli/template/base/{packages => apps}/server/_gitignore (100%) rename apps/cli/template/base/{packages => apps}/server/package.json (100%) rename apps/cli/template/base/{packages => apps}/server/src/index.ts (100%) rename apps/cli/template/base/{packages => apps}/server/src/lib/context.ts (100%) rename apps/cli/template/base/{packages => apps}/server/src/lib/trpc.ts (100%) rename apps/cli/template/base/{packages => apps}/server/src/routers/index.ts (100%) rename apps/cli/template/base/{packages => apps}/server/tsconfig.json (100%) rename apps/cli/template/examples/todo/{packages => apps}/client/src/routes/todos.tsx (100%) rename apps/cli/template/examples/todo/{packages => apps}/server/src/routers/with-drizzle-todo.ts (100%) rename apps/cli/template/examples/todo/{packages => apps}/server/src/routers/with-prisma-todo.ts (100%) rename apps/cli/template/with-auth/{packages => apps}/client/src/components/auth-forms.tsx (100%) rename apps/cli/template/with-auth/{packages => apps}/client/src/components/header.tsx (100%) rename apps/cli/template/with-auth/{packages => apps}/client/src/components/sign-in-form.tsx (100%) rename apps/cli/template/with-auth/{packages => apps}/client/src/components/sign-up-form.tsx (100%) rename apps/cli/template/with-auth/{packages => apps}/client/src/components/user-menu.tsx (100%) rename apps/cli/template/with-auth/{packages => apps}/client/src/lib/auth-client.ts (100%) rename apps/cli/template/with-auth/{packages => apps}/client/src/main.tsx (100%) rename apps/cli/template/with-auth/{packages => apps}/client/src/routes/dashboard.tsx (100%) rename apps/cli/template/with-auth/{packages => apps}/client/src/routes/login.tsx (100%) rename apps/cli/template/with-auth/{packages => apps}/server/src/index.ts (100%) rename apps/cli/template/with-auth/{packages => apps}/server/src/lib/trpc.ts (100%) rename apps/cli/template/with-auth/{packages => apps}/server/src/routers/index.ts (100%) rename apps/cli/template/with-drizzle-postgres/{packages => apps}/server/drizzle.config.ts (100%) rename apps/cli/template/with-drizzle-postgres/{packages => apps}/server/src/db/index.ts (100%) rename apps/cli/template/with-drizzle-postgres/{packages => apps}/server/src/db/schema/auth.ts (100%) rename apps/cli/template/with-drizzle-postgres/{packages => apps}/server/src/db/schema/todo.ts (100%) rename apps/cli/template/with-drizzle-postgres/{packages => apps}/server/src/routers/todo.ts (100%) rename apps/cli/template/with-drizzle-postgres/{packages => apps}/server/src/with-auth-lib/auth.ts (100%) rename apps/cli/template/with-drizzle-postgres/{packages => apps}/server/src/with-auth-lib/context.ts (100%) rename apps/cli/template/with-drizzle-postgres/{packages => apps}/server/src/with-auth-lib/trpc.ts (100%) rename apps/cli/template/with-drizzle-sqlite/{packages => apps}/server/drizzle.config.ts (100%) rename apps/cli/template/with-drizzle-sqlite/{packages => apps}/server/src/db/index.ts (100%) rename apps/cli/template/with-drizzle-sqlite/{packages => apps}/server/src/db/schema/auth.ts (100%) rename apps/cli/template/with-drizzle-sqlite/{packages => apps}/server/src/db/schema/todo.ts (100%) rename apps/cli/template/with-drizzle-sqlite/{packages => apps}/server/src/with-auth-lib/auth.ts (100%) rename apps/cli/template/with-drizzle-sqlite/{packages => apps}/server/src/with-auth-lib/context.ts (100%) rename apps/cli/template/with-drizzle-sqlite/{packages => apps}/server/src/with-auth-lib/trpc.ts (100%) rename apps/cli/template/with-prisma-postgres/{packages => apps}/server/prisma/index.ts (100%) rename apps/cli/template/with-prisma-postgres/{packages => apps}/server/prisma/schema/auth.prisma (100%) rename apps/cli/template/with-prisma-postgres/{packages => apps}/server/prisma/schema/schema.prisma (100%) rename apps/cli/template/with-prisma-postgres/{packages => apps}/server/prisma/schema/todo.prisma (100%) rename apps/cli/template/with-prisma-postgres/{packages => apps}/server/src/with-auth-lib/auth.ts (100%) rename apps/cli/template/with-prisma-postgres/{packages => apps}/server/src/with-auth-lib/context.ts (100%) rename apps/cli/template/with-prisma-postgres/{packages => apps}/server/src/with-auth-lib/trpc.ts (100%) rename apps/cli/template/with-prisma-sqlite/{packages => apps}/server/prisma/index.ts (100%) rename apps/cli/template/with-prisma-sqlite/{packages => apps}/server/prisma/schema/auth.prisma (100%) rename apps/cli/template/with-prisma-sqlite/{packages => apps}/server/prisma/schema/schema.prisma (100%) rename apps/cli/template/with-prisma-sqlite/{packages => apps}/server/prisma/schema/todo.prisma (100%) rename apps/cli/template/with-prisma-sqlite/{packages => apps}/server/src/with-auth-lib/auth.ts (100%) rename apps/cli/template/with-prisma-sqlite/{packages => apps}/server/src/with-auth-lib/context.ts (100%) rename apps/cli/template/with-prisma-sqlite/{packages => apps}/server/src/with-auth-lib/trpc.ts (100%) rename apps/cli/template/with-pwa/{packages => apps}/client/public/logo.png (100%) rename apps/cli/template/with-pwa/{packages => apps}/client/pwa-assets.config.ts (100%) rename apps/cli/template/with-pwa/{packages => apps}/client/vite.config.ts (100%) diff --git a/.changeset/loose-otters-yell.md b/.changeset/loose-otters-yell.md new file mode 100644 index 0000000..c922227 --- /dev/null +++ b/.changeset/loose-otters-yell.md @@ -0,0 +1,5 @@ +--- +"create-better-t-stack": patch +--- + +rename packages folder to apps diff --git a/apps/cli/src/helpers/addons-setup.ts b/apps/cli/src/helpers/addons-setup.ts index 6598b81..8d435eb 100644 --- a/apps/cli/src/helpers/addons-setup.ts +++ b/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"], diff --git a/apps/cli/src/helpers/auth-setup.ts b/apps/cli/src/helpers/auth-setup.ts index 168a07e..b365116 100644 --- a/apps/cli/src/helpers/auth-setup.ts +++ b/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({ diff --git a/apps/cli/src/helpers/create-readme.ts b/apps/cli/src/helpers/create-readme.ts index ffbdbb0..e0d9052 100644 --- a/apps/cli/src/helpers/create-readme.ts +++ b/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`; } } diff --git a/apps/cli/src/helpers/db-setup.ts b/apps/cli/src/helpers/db-setup.ts index 62fac98..2498745 100644 --- a/apps/cli/src/helpers/db-setup.ts +++ b/apps/cli/src/helpers/db-setup.ts @@ -13,7 +13,7 @@ export async function setupDatabase( setupTursoDb = true, ): Promise { 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")); diff --git a/apps/cli/src/helpers/env-setup.ts b/apps/cli/src/helpers/env-setup.ts index 846010e..126454b 100644 --- a/apps/cli/src/helpers/env-setup.ts +++ b/apps/cli/src/helpers/env-setup.ts @@ -7,8 +7,8 @@ export async function setupEnvironmentVariables( projectDir: string, options: ProjectConfig, ): Promise { - 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 = ""; diff --git a/apps/cli/src/helpers/examples-setup.ts b/apps/cli/src/helpers/examples-setup.ts index 3962fed..f32a31a 100644 --- a/apps/cli/src/helpers/examples-setup.ts +++ b/apps/cli/src/helpers/examples-setup.ts @@ -23,21 +23,18 @@ async function setupTodoExample( ): Promise { 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 { 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 { - 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 { } async function addTodoButtonToHomepage(projectDir: string): Promise { - 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"); diff --git a/apps/cli/src/helpers/post-installation.ts b/apps/cli/src/helpers/post-installation.ts index f5c8012..9ac2b07 100644 --- a/apps/cli/src/helpers/post-installation.ts +++ b/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`; } diff --git a/apps/cli/src/helpers/project-config.ts b/apps/cli/src/helpers/project-config.ts index 2f68673..adce235 100644 --- a/apps/cli/src/helpers/project-config.ts +++ b/apps/cli/src/helpers/project-config.ts @@ -52,7 +52,7 @@ async function updateServerPackageJson( ): Promise { const serverPackageJsonPath = path.join( projectDir, - "packages/server/package.json", + "apps/server/package.json", ); if (await fs.pathExists(serverPackageJsonPath)) { diff --git a/apps/cli/src/helpers/tauri-setup.ts b/apps/cli/src/helpers/tauri-setup.ts index 33a42ce..6063766 100644 --- a/apps/cli/src/helpers/tauri-setup.ts +++ b/apps/cli/src/helpers/tauri-setup.ts @@ -11,7 +11,7 @@ export async function setupTauri( packageManager: PackageManager, ): Promise { 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..."); diff --git a/apps/cli/src/helpers/template-manager.ts b/apps/cli/src/helpers/template-manager.ts index 8527feb..12ab85e 100644 --- a/apps/cli/src/helpers/template-manager.ts +++ b/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 { 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) { diff --git a/apps/cli/src/helpers/turso-setup.ts b/apps/cli/src/helpers/turso-setup.ts index 6acc570..60a3760 100644 --- a/apps/cli/src/helpers/turso-setup.ts +++ b/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`); diff --git a/apps/cli/template/base/packages/client/_gitignore b/apps/cli/template/base/apps/client/_gitignore similarity index 100% rename from apps/cli/template/base/packages/client/_gitignore rename to apps/cli/template/base/apps/client/_gitignore diff --git a/apps/cli/template/base/packages/client/components.json b/apps/cli/template/base/apps/client/components.json similarity index 100% rename from apps/cli/template/base/packages/client/components.json rename to apps/cli/template/base/apps/client/components.json diff --git a/apps/cli/template/base/packages/client/index.html b/apps/cli/template/base/apps/client/index.html similarity index 100% rename from apps/cli/template/base/packages/client/index.html rename to apps/cli/template/base/apps/client/index.html diff --git a/apps/cli/template/base/packages/client/package.json b/apps/cli/template/base/apps/client/package.json similarity index 93% rename from apps/cli/template/base/packages/client/package.json rename to apps/cli/template/base/apps/client/package.json index 2ab9a0d..5f59015 100644 --- a/apps/cli/template/base/packages/client/package.json +++ b/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", diff --git a/apps/cli/template/base/packages/client/src/components/header.tsx b/apps/cli/template/base/apps/client/src/components/header.tsx similarity index 100% rename from apps/cli/template/base/packages/client/src/components/header.tsx rename to apps/cli/template/base/apps/client/src/components/header.tsx diff --git a/apps/cli/template/base/packages/client/src/components/loader.tsx b/apps/cli/template/base/apps/client/src/components/loader.tsx similarity index 100% rename from apps/cli/template/base/packages/client/src/components/loader.tsx rename to apps/cli/template/base/apps/client/src/components/loader.tsx diff --git a/apps/cli/template/base/packages/client/src/components/mode-toggle.tsx b/apps/cli/template/base/apps/client/src/components/mode-toggle.tsx similarity index 100% rename from apps/cli/template/base/packages/client/src/components/mode-toggle.tsx rename to apps/cli/template/base/apps/client/src/components/mode-toggle.tsx diff --git a/apps/cli/template/base/packages/client/src/components/theme-provider.tsx b/apps/cli/template/base/apps/client/src/components/theme-provider.tsx similarity index 100% rename from apps/cli/template/base/packages/client/src/components/theme-provider.tsx rename to apps/cli/template/base/apps/client/src/components/theme-provider.tsx diff --git a/apps/cli/template/base/packages/client/src/components/ui/button.tsx b/apps/cli/template/base/apps/client/src/components/ui/button.tsx similarity index 100% rename from apps/cli/template/base/packages/client/src/components/ui/button.tsx rename to apps/cli/template/base/apps/client/src/components/ui/button.tsx diff --git a/apps/cli/template/base/packages/client/src/components/ui/card.tsx b/apps/cli/template/base/apps/client/src/components/ui/card.tsx similarity index 100% rename from apps/cli/template/base/packages/client/src/components/ui/card.tsx rename to apps/cli/template/base/apps/client/src/components/ui/card.tsx diff --git a/apps/cli/template/base/packages/client/src/components/ui/checkbox.tsx b/apps/cli/template/base/apps/client/src/components/ui/checkbox.tsx similarity index 100% rename from apps/cli/template/base/packages/client/src/components/ui/checkbox.tsx rename to apps/cli/template/base/apps/client/src/components/ui/checkbox.tsx diff --git a/apps/cli/template/base/packages/client/src/components/ui/dropdown-menu.tsx b/apps/cli/template/base/apps/client/src/components/ui/dropdown-menu.tsx similarity index 100% rename from apps/cli/template/base/packages/client/src/components/ui/dropdown-menu.tsx rename to apps/cli/template/base/apps/client/src/components/ui/dropdown-menu.tsx diff --git a/apps/cli/template/base/packages/client/src/components/ui/input.tsx b/apps/cli/template/base/apps/client/src/components/ui/input.tsx similarity index 100% rename from apps/cli/template/base/packages/client/src/components/ui/input.tsx rename to apps/cli/template/base/apps/client/src/components/ui/input.tsx diff --git a/apps/cli/template/base/packages/client/src/components/ui/label.tsx b/apps/cli/template/base/apps/client/src/components/ui/label.tsx similarity index 100% rename from apps/cli/template/base/packages/client/src/components/ui/label.tsx rename to apps/cli/template/base/apps/client/src/components/ui/label.tsx diff --git a/apps/cli/template/base/packages/client/src/components/ui/skeleton.tsx b/apps/cli/template/base/apps/client/src/components/ui/skeleton.tsx similarity index 100% rename from apps/cli/template/base/packages/client/src/components/ui/skeleton.tsx rename to apps/cli/template/base/apps/client/src/components/ui/skeleton.tsx diff --git a/apps/cli/template/base/packages/client/src/components/ui/sonner.tsx b/apps/cli/template/base/apps/client/src/components/ui/sonner.tsx similarity index 100% rename from apps/cli/template/base/packages/client/src/components/ui/sonner.tsx rename to apps/cli/template/base/apps/client/src/components/ui/sonner.tsx diff --git a/apps/cli/template/base/packages/client/src/index.css b/apps/cli/template/base/apps/client/src/index.css similarity index 100% rename from apps/cli/template/base/packages/client/src/index.css rename to apps/cli/template/base/apps/client/src/index.css diff --git a/apps/cli/template/base/packages/client/src/lib/utils.ts b/apps/cli/template/base/apps/client/src/lib/utils.ts similarity index 100% rename from apps/cli/template/base/packages/client/src/lib/utils.ts rename to apps/cli/template/base/apps/client/src/lib/utils.ts diff --git a/apps/cli/template/base/packages/client/src/main.tsx b/apps/cli/template/base/apps/client/src/main.tsx similarity index 100% rename from apps/cli/template/base/packages/client/src/main.tsx rename to apps/cli/template/base/apps/client/src/main.tsx diff --git a/apps/cli/template/base/packages/client/src/routes/__root.tsx b/apps/cli/template/base/apps/client/src/routes/__root.tsx similarity index 100% rename from apps/cli/template/base/packages/client/src/routes/__root.tsx rename to apps/cli/template/base/apps/client/src/routes/__root.tsx diff --git a/apps/cli/template/base/packages/client/src/routes/index.tsx b/apps/cli/template/base/apps/client/src/routes/index.tsx similarity index 100% rename from apps/cli/template/base/packages/client/src/routes/index.tsx rename to apps/cli/template/base/apps/client/src/routes/index.tsx diff --git a/apps/cli/template/base/packages/client/src/utils/trpc.ts b/apps/cli/template/base/apps/client/src/utils/trpc.ts similarity index 100% rename from apps/cli/template/base/packages/client/src/utils/trpc.ts rename to apps/cli/template/base/apps/client/src/utils/trpc.ts diff --git a/apps/cli/template/base/packages/client/tsconfig.json b/apps/cli/template/base/apps/client/tsconfig.json similarity index 100% rename from apps/cli/template/base/packages/client/tsconfig.json rename to apps/cli/template/base/apps/client/tsconfig.json diff --git a/apps/cli/template/base/packages/client/vite.config.ts b/apps/cli/template/base/apps/client/vite.config.ts similarity index 100% rename from apps/cli/template/base/packages/client/vite.config.ts rename to apps/cli/template/base/apps/client/vite.config.ts diff --git a/apps/cli/template/base/packages/server/_gitignore b/apps/cli/template/base/apps/server/_gitignore similarity index 100% rename from apps/cli/template/base/packages/server/_gitignore rename to apps/cli/template/base/apps/server/_gitignore diff --git a/apps/cli/template/base/packages/server/package.json b/apps/cli/template/base/apps/server/package.json similarity index 100% rename from apps/cli/template/base/packages/server/package.json rename to apps/cli/template/base/apps/server/package.json diff --git a/apps/cli/template/base/packages/server/src/index.ts b/apps/cli/template/base/apps/server/src/index.ts similarity index 100% rename from apps/cli/template/base/packages/server/src/index.ts rename to apps/cli/template/base/apps/server/src/index.ts diff --git a/apps/cli/template/base/packages/server/src/lib/context.ts b/apps/cli/template/base/apps/server/src/lib/context.ts similarity index 100% rename from apps/cli/template/base/packages/server/src/lib/context.ts rename to apps/cli/template/base/apps/server/src/lib/context.ts diff --git a/apps/cli/template/base/packages/server/src/lib/trpc.ts b/apps/cli/template/base/apps/server/src/lib/trpc.ts similarity index 100% rename from apps/cli/template/base/packages/server/src/lib/trpc.ts rename to apps/cli/template/base/apps/server/src/lib/trpc.ts diff --git a/apps/cli/template/base/packages/server/src/routers/index.ts b/apps/cli/template/base/apps/server/src/routers/index.ts similarity index 100% rename from apps/cli/template/base/packages/server/src/routers/index.ts rename to apps/cli/template/base/apps/server/src/routers/index.ts diff --git a/apps/cli/template/base/packages/server/tsconfig.json b/apps/cli/template/base/apps/server/tsconfig.json similarity index 100% rename from apps/cli/template/base/packages/server/tsconfig.json rename to apps/cli/template/base/apps/server/tsconfig.json diff --git a/apps/cli/template/base/package.json b/apps/cli/template/base/package.json index 68a97f5..d483dc8 100644 --- a/apps/cli/template/base/package.json +++ b/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", diff --git a/apps/cli/template/examples/todo/packages/client/src/routes/todos.tsx b/apps/cli/template/examples/todo/apps/client/src/routes/todos.tsx similarity index 100% rename from apps/cli/template/examples/todo/packages/client/src/routes/todos.tsx rename to apps/cli/template/examples/todo/apps/client/src/routes/todos.tsx diff --git a/apps/cli/template/examples/todo/packages/server/src/routers/with-drizzle-todo.ts b/apps/cli/template/examples/todo/apps/server/src/routers/with-drizzle-todo.ts similarity index 100% rename from apps/cli/template/examples/todo/packages/server/src/routers/with-drizzle-todo.ts rename to apps/cli/template/examples/todo/apps/server/src/routers/with-drizzle-todo.ts diff --git a/apps/cli/template/examples/todo/packages/server/src/routers/with-prisma-todo.ts b/apps/cli/template/examples/todo/apps/server/src/routers/with-prisma-todo.ts similarity index 100% rename from apps/cli/template/examples/todo/packages/server/src/routers/with-prisma-todo.ts rename to apps/cli/template/examples/todo/apps/server/src/routers/with-prisma-todo.ts diff --git a/apps/cli/template/with-auth/packages/client/src/components/auth-forms.tsx b/apps/cli/template/with-auth/apps/client/src/components/auth-forms.tsx similarity index 100% rename from apps/cli/template/with-auth/packages/client/src/components/auth-forms.tsx rename to apps/cli/template/with-auth/apps/client/src/components/auth-forms.tsx diff --git a/apps/cli/template/with-auth/packages/client/src/components/header.tsx b/apps/cli/template/with-auth/apps/client/src/components/header.tsx similarity index 100% rename from apps/cli/template/with-auth/packages/client/src/components/header.tsx rename to apps/cli/template/with-auth/apps/client/src/components/header.tsx diff --git a/apps/cli/template/with-auth/packages/client/src/components/sign-in-form.tsx b/apps/cli/template/with-auth/apps/client/src/components/sign-in-form.tsx similarity index 100% rename from apps/cli/template/with-auth/packages/client/src/components/sign-in-form.tsx rename to apps/cli/template/with-auth/apps/client/src/components/sign-in-form.tsx diff --git a/apps/cli/template/with-auth/packages/client/src/components/sign-up-form.tsx b/apps/cli/template/with-auth/apps/client/src/components/sign-up-form.tsx similarity index 100% rename from apps/cli/template/with-auth/packages/client/src/components/sign-up-form.tsx rename to apps/cli/template/with-auth/apps/client/src/components/sign-up-form.tsx diff --git a/apps/cli/template/with-auth/packages/client/src/components/user-menu.tsx b/apps/cli/template/with-auth/apps/client/src/components/user-menu.tsx similarity index 100% rename from apps/cli/template/with-auth/packages/client/src/components/user-menu.tsx rename to apps/cli/template/with-auth/apps/client/src/components/user-menu.tsx diff --git a/apps/cli/template/with-auth/packages/client/src/lib/auth-client.ts b/apps/cli/template/with-auth/apps/client/src/lib/auth-client.ts similarity index 100% rename from apps/cli/template/with-auth/packages/client/src/lib/auth-client.ts rename to apps/cli/template/with-auth/apps/client/src/lib/auth-client.ts diff --git a/apps/cli/template/with-auth/packages/client/src/main.tsx b/apps/cli/template/with-auth/apps/client/src/main.tsx similarity index 100% rename from apps/cli/template/with-auth/packages/client/src/main.tsx rename to apps/cli/template/with-auth/apps/client/src/main.tsx diff --git a/apps/cli/template/with-auth/packages/client/src/routes/dashboard.tsx b/apps/cli/template/with-auth/apps/client/src/routes/dashboard.tsx similarity index 100% rename from apps/cli/template/with-auth/packages/client/src/routes/dashboard.tsx rename to apps/cli/template/with-auth/apps/client/src/routes/dashboard.tsx diff --git a/apps/cli/template/with-auth/packages/client/src/routes/login.tsx b/apps/cli/template/with-auth/apps/client/src/routes/login.tsx similarity index 100% rename from apps/cli/template/with-auth/packages/client/src/routes/login.tsx rename to apps/cli/template/with-auth/apps/client/src/routes/login.tsx diff --git a/apps/cli/template/with-auth/packages/server/src/index.ts b/apps/cli/template/with-auth/apps/server/src/index.ts similarity index 100% rename from apps/cli/template/with-auth/packages/server/src/index.ts rename to apps/cli/template/with-auth/apps/server/src/index.ts diff --git a/apps/cli/template/with-auth/packages/server/src/lib/trpc.ts b/apps/cli/template/with-auth/apps/server/src/lib/trpc.ts similarity index 100% rename from apps/cli/template/with-auth/packages/server/src/lib/trpc.ts rename to apps/cli/template/with-auth/apps/server/src/lib/trpc.ts diff --git a/apps/cli/template/with-auth/packages/server/src/routers/index.ts b/apps/cli/template/with-auth/apps/server/src/routers/index.ts similarity index 100% rename from apps/cli/template/with-auth/packages/server/src/routers/index.ts rename to apps/cli/template/with-auth/apps/server/src/routers/index.ts diff --git a/apps/cli/template/with-drizzle-postgres/packages/server/drizzle.config.ts b/apps/cli/template/with-drizzle-postgres/apps/server/drizzle.config.ts similarity index 100% rename from apps/cli/template/with-drizzle-postgres/packages/server/drizzle.config.ts rename to apps/cli/template/with-drizzle-postgres/apps/server/drizzle.config.ts diff --git a/apps/cli/template/with-drizzle-postgres/packages/server/src/db/index.ts b/apps/cli/template/with-drizzle-postgres/apps/server/src/db/index.ts similarity index 100% rename from apps/cli/template/with-drizzle-postgres/packages/server/src/db/index.ts rename to apps/cli/template/with-drizzle-postgres/apps/server/src/db/index.ts diff --git a/apps/cli/template/with-drizzle-postgres/packages/server/src/db/schema/auth.ts b/apps/cli/template/with-drizzle-postgres/apps/server/src/db/schema/auth.ts similarity index 100% rename from apps/cli/template/with-drizzle-postgres/packages/server/src/db/schema/auth.ts rename to apps/cli/template/with-drizzle-postgres/apps/server/src/db/schema/auth.ts diff --git a/apps/cli/template/with-drizzle-postgres/packages/server/src/db/schema/todo.ts b/apps/cli/template/with-drizzle-postgres/apps/server/src/db/schema/todo.ts similarity index 100% rename from apps/cli/template/with-drizzle-postgres/packages/server/src/db/schema/todo.ts rename to apps/cli/template/with-drizzle-postgres/apps/server/src/db/schema/todo.ts diff --git a/apps/cli/template/with-drizzle-postgres/packages/server/src/routers/todo.ts b/apps/cli/template/with-drizzle-postgres/apps/server/src/routers/todo.ts similarity index 100% rename from apps/cli/template/with-drizzle-postgres/packages/server/src/routers/todo.ts rename to apps/cli/template/with-drizzle-postgres/apps/server/src/routers/todo.ts diff --git a/apps/cli/template/with-drizzle-postgres/packages/server/src/with-auth-lib/auth.ts b/apps/cli/template/with-drizzle-postgres/apps/server/src/with-auth-lib/auth.ts similarity index 100% rename from apps/cli/template/with-drizzle-postgres/packages/server/src/with-auth-lib/auth.ts rename to apps/cli/template/with-drizzle-postgres/apps/server/src/with-auth-lib/auth.ts diff --git a/apps/cli/template/with-drizzle-postgres/packages/server/src/with-auth-lib/context.ts b/apps/cli/template/with-drizzle-postgres/apps/server/src/with-auth-lib/context.ts similarity index 100% rename from apps/cli/template/with-drizzle-postgres/packages/server/src/with-auth-lib/context.ts rename to apps/cli/template/with-drizzle-postgres/apps/server/src/with-auth-lib/context.ts diff --git a/apps/cli/template/with-drizzle-postgres/packages/server/src/with-auth-lib/trpc.ts b/apps/cli/template/with-drizzle-postgres/apps/server/src/with-auth-lib/trpc.ts similarity index 100% rename from apps/cli/template/with-drizzle-postgres/packages/server/src/with-auth-lib/trpc.ts rename to apps/cli/template/with-drizzle-postgres/apps/server/src/with-auth-lib/trpc.ts diff --git a/apps/cli/template/with-drizzle-sqlite/packages/server/drizzle.config.ts b/apps/cli/template/with-drizzle-sqlite/apps/server/drizzle.config.ts similarity index 100% rename from apps/cli/template/with-drizzle-sqlite/packages/server/drizzle.config.ts rename to apps/cli/template/with-drizzle-sqlite/apps/server/drizzle.config.ts diff --git a/apps/cli/template/with-drizzle-sqlite/packages/server/src/db/index.ts b/apps/cli/template/with-drizzle-sqlite/apps/server/src/db/index.ts similarity index 100% rename from apps/cli/template/with-drizzle-sqlite/packages/server/src/db/index.ts rename to apps/cli/template/with-drizzle-sqlite/apps/server/src/db/index.ts diff --git a/apps/cli/template/with-drizzle-sqlite/packages/server/src/db/schema/auth.ts b/apps/cli/template/with-drizzle-sqlite/apps/server/src/db/schema/auth.ts similarity index 100% rename from apps/cli/template/with-drizzle-sqlite/packages/server/src/db/schema/auth.ts rename to apps/cli/template/with-drizzle-sqlite/apps/server/src/db/schema/auth.ts diff --git a/apps/cli/template/with-drizzle-sqlite/packages/server/src/db/schema/todo.ts b/apps/cli/template/with-drizzle-sqlite/apps/server/src/db/schema/todo.ts similarity index 100% rename from apps/cli/template/with-drizzle-sqlite/packages/server/src/db/schema/todo.ts rename to apps/cli/template/with-drizzle-sqlite/apps/server/src/db/schema/todo.ts diff --git a/apps/cli/template/with-drizzle-sqlite/packages/server/src/with-auth-lib/auth.ts b/apps/cli/template/with-drizzle-sqlite/apps/server/src/with-auth-lib/auth.ts similarity index 100% rename from apps/cli/template/with-drizzle-sqlite/packages/server/src/with-auth-lib/auth.ts rename to apps/cli/template/with-drizzle-sqlite/apps/server/src/with-auth-lib/auth.ts diff --git a/apps/cli/template/with-drizzle-sqlite/packages/server/src/with-auth-lib/context.ts b/apps/cli/template/with-drizzle-sqlite/apps/server/src/with-auth-lib/context.ts similarity index 100% rename from apps/cli/template/with-drizzle-sqlite/packages/server/src/with-auth-lib/context.ts rename to apps/cli/template/with-drizzle-sqlite/apps/server/src/with-auth-lib/context.ts diff --git a/apps/cli/template/with-drizzle-sqlite/packages/server/src/with-auth-lib/trpc.ts b/apps/cli/template/with-drizzle-sqlite/apps/server/src/with-auth-lib/trpc.ts similarity index 100% rename from apps/cli/template/with-drizzle-sqlite/packages/server/src/with-auth-lib/trpc.ts rename to apps/cli/template/with-drizzle-sqlite/apps/server/src/with-auth-lib/trpc.ts diff --git a/apps/cli/template/with-pnpm/pnpm-workspace.yaml b/apps/cli/template/with-pnpm/pnpm-workspace.yaml index dee51e9..06b6051 100644 --- a/apps/cli/template/with-pnpm/pnpm-workspace.yaml +++ b/apps/cli/template/with-pnpm/pnpm-workspace.yaml @@ -1,2 +1,2 @@ packages: - - "packages/*" + - "apps/*" diff --git a/apps/cli/template/with-prisma-postgres/packages/server/prisma/index.ts b/apps/cli/template/with-prisma-postgres/apps/server/prisma/index.ts similarity index 100% rename from apps/cli/template/with-prisma-postgres/packages/server/prisma/index.ts rename to apps/cli/template/with-prisma-postgres/apps/server/prisma/index.ts diff --git a/apps/cli/template/with-prisma-postgres/packages/server/prisma/schema/auth.prisma b/apps/cli/template/with-prisma-postgres/apps/server/prisma/schema/auth.prisma similarity index 100% rename from apps/cli/template/with-prisma-postgres/packages/server/prisma/schema/auth.prisma rename to apps/cli/template/with-prisma-postgres/apps/server/prisma/schema/auth.prisma diff --git a/apps/cli/template/with-prisma-postgres/packages/server/prisma/schema/schema.prisma b/apps/cli/template/with-prisma-postgres/apps/server/prisma/schema/schema.prisma similarity index 100% rename from apps/cli/template/with-prisma-postgres/packages/server/prisma/schema/schema.prisma rename to apps/cli/template/with-prisma-postgres/apps/server/prisma/schema/schema.prisma diff --git a/apps/cli/template/with-prisma-postgres/packages/server/prisma/schema/todo.prisma b/apps/cli/template/with-prisma-postgres/apps/server/prisma/schema/todo.prisma similarity index 100% rename from apps/cli/template/with-prisma-postgres/packages/server/prisma/schema/todo.prisma rename to apps/cli/template/with-prisma-postgres/apps/server/prisma/schema/todo.prisma diff --git a/apps/cli/template/with-prisma-postgres/packages/server/src/with-auth-lib/auth.ts b/apps/cli/template/with-prisma-postgres/apps/server/src/with-auth-lib/auth.ts similarity index 100% rename from apps/cli/template/with-prisma-postgres/packages/server/src/with-auth-lib/auth.ts rename to apps/cli/template/with-prisma-postgres/apps/server/src/with-auth-lib/auth.ts diff --git a/apps/cli/template/with-prisma-postgres/packages/server/src/with-auth-lib/context.ts b/apps/cli/template/with-prisma-postgres/apps/server/src/with-auth-lib/context.ts similarity index 100% rename from apps/cli/template/with-prisma-postgres/packages/server/src/with-auth-lib/context.ts rename to apps/cli/template/with-prisma-postgres/apps/server/src/with-auth-lib/context.ts diff --git a/apps/cli/template/with-prisma-postgres/packages/server/src/with-auth-lib/trpc.ts b/apps/cli/template/with-prisma-postgres/apps/server/src/with-auth-lib/trpc.ts similarity index 100% rename from apps/cli/template/with-prisma-postgres/packages/server/src/with-auth-lib/trpc.ts rename to apps/cli/template/with-prisma-postgres/apps/server/src/with-auth-lib/trpc.ts diff --git a/apps/cli/template/with-prisma-sqlite/packages/server/prisma/index.ts b/apps/cli/template/with-prisma-sqlite/apps/server/prisma/index.ts similarity index 100% rename from apps/cli/template/with-prisma-sqlite/packages/server/prisma/index.ts rename to apps/cli/template/with-prisma-sqlite/apps/server/prisma/index.ts diff --git a/apps/cli/template/with-prisma-sqlite/packages/server/prisma/schema/auth.prisma b/apps/cli/template/with-prisma-sqlite/apps/server/prisma/schema/auth.prisma similarity index 100% rename from apps/cli/template/with-prisma-sqlite/packages/server/prisma/schema/auth.prisma rename to apps/cli/template/with-prisma-sqlite/apps/server/prisma/schema/auth.prisma diff --git a/apps/cli/template/with-prisma-sqlite/packages/server/prisma/schema/schema.prisma b/apps/cli/template/with-prisma-sqlite/apps/server/prisma/schema/schema.prisma similarity index 100% rename from apps/cli/template/with-prisma-sqlite/packages/server/prisma/schema/schema.prisma rename to apps/cli/template/with-prisma-sqlite/apps/server/prisma/schema/schema.prisma diff --git a/apps/cli/template/with-prisma-sqlite/packages/server/prisma/schema/todo.prisma b/apps/cli/template/with-prisma-sqlite/apps/server/prisma/schema/todo.prisma similarity index 100% rename from apps/cli/template/with-prisma-sqlite/packages/server/prisma/schema/todo.prisma rename to apps/cli/template/with-prisma-sqlite/apps/server/prisma/schema/todo.prisma diff --git a/apps/cli/template/with-prisma-sqlite/packages/server/src/with-auth-lib/auth.ts b/apps/cli/template/with-prisma-sqlite/apps/server/src/with-auth-lib/auth.ts similarity index 100% rename from apps/cli/template/with-prisma-sqlite/packages/server/src/with-auth-lib/auth.ts rename to apps/cli/template/with-prisma-sqlite/apps/server/src/with-auth-lib/auth.ts diff --git a/apps/cli/template/with-prisma-sqlite/packages/server/src/with-auth-lib/context.ts b/apps/cli/template/with-prisma-sqlite/apps/server/src/with-auth-lib/context.ts similarity index 100% rename from apps/cli/template/with-prisma-sqlite/packages/server/src/with-auth-lib/context.ts rename to apps/cli/template/with-prisma-sqlite/apps/server/src/with-auth-lib/context.ts diff --git a/apps/cli/template/with-prisma-sqlite/packages/server/src/with-auth-lib/trpc.ts b/apps/cli/template/with-prisma-sqlite/apps/server/src/with-auth-lib/trpc.ts similarity index 100% rename from apps/cli/template/with-prisma-sqlite/packages/server/src/with-auth-lib/trpc.ts rename to apps/cli/template/with-prisma-sqlite/apps/server/src/with-auth-lib/trpc.ts diff --git a/apps/cli/template/with-pwa/packages/client/public/logo.png b/apps/cli/template/with-pwa/apps/client/public/logo.png similarity index 100% rename from apps/cli/template/with-pwa/packages/client/public/logo.png rename to apps/cli/template/with-pwa/apps/client/public/logo.png diff --git a/apps/cli/template/with-pwa/packages/client/pwa-assets.config.ts b/apps/cli/template/with-pwa/apps/client/pwa-assets.config.ts similarity index 100% rename from apps/cli/template/with-pwa/packages/client/pwa-assets.config.ts rename to apps/cli/template/with-pwa/apps/client/pwa-assets.config.ts diff --git a/apps/cli/template/with-pwa/packages/client/vite.config.ts b/apps/cli/template/with-pwa/apps/client/vite.config.ts similarity index 100% rename from apps/cli/template/with-pwa/packages/client/vite.config.ts rename to apps/cli/template/with-pwa/apps/client/vite.config.ts