feat: split marketing site & main app with Astro integration (#2098)

Author: koistya

.gitignore

@@ -56,6 +56,9 @@ override.tf.json
 .terraformrc
 terraform.rc
 
+# Astro
+.astro/
+
 # TanStack Router
 # Generated route tree files should not be committed
 */lib/routeTree.gen.ts

.vscode/extensions.json

@@ -1,6 +1,7 @@
 {
   "recommendations": [
     "anthropic.claude-code",
+    "astro-build.vscode-astro",
     "bradlc.vscode-tailwindcss",
     "dbaeumer.vscode-eslint",
     "dbcode.dbcode",

CLAUDE.md

@@ -4,11 +4,11 @@ Full-stack React application template optimized for Cloudflare Workers deploymen
 
 ## Monorepo Structure
 
-- `apps/web/` - React 19 frontend (Vite, TanStack Router, Jotai, ShadCN UI, Tailwind CSS v4)
+- `apps/web/` - React 19 frontend (Vite, TanStack Router, Jotai, shadcn/ui, Tailwind CSS v4)
 - `apps/api/` - tRPC API server
 - `apps/edge/` - Cloudflare Workers edge deployment
 - `packages/core/` - Shared core utilities and WebSocket functionality
-- `packages/ui/` - Shared UI components and ShadCN management scripts
+- `packages/ui/` - Shared UI components and shadcn/ui management scripts
 - `db/` - Drizzle ORM schemas and migrations
 - `infra/` - Terraform infrastructure configuration
 - `docs/` - VitePress documentation site
@@ -17,7 +17,7 @@ Full-stack React application template optimized for Cloudflare Workers deploymen
 ## Tech Stack
 
 - **Runtime:** Bun (>=1.2.0), TypeScript 5.8
-- **Frontend:** React 19, TanStack Router, Jotai, ShadCN UI, Tailwind CSS v4, Better Auth
+- **Frontend:** React 19, TanStack Router, Jotai, shadcn/ui, Tailwind CSS v4, Better Auth
 - **Backend:** Hono framework, tRPC
 - **Database:** Neon PostgreSQL, Drizzle ORM
 - **Testing:** Vitest, Happy DOM
@@ -45,7 +45,7 @@ bun test:api                   # Test API (shortcut)
 bun test:edge                  # Test edge (shortcut)
 
 # UI Components
-bun ui:add <component>         # Add ShadCN component
+bun ui:add <component>         # Add shadcn/ui component
 bun ui:list                    # List installed components
 bun ui:update                  # Update all components
 bun ui:essentials              # Install essential components

README.md

@@ -3,7 +3,7 @@
 <a href="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/kriasoft/react-starter-kit?sponsor=1"><img src="https://img.shields.io/badge/-GitHub-%23555.svg?logo=github-sponsors" height="20"></a>
 <a href="https://discord.gg/2nKEnKq"><img src="https://img.shields.io/discord/643523529131950086?label=Chat" height="20"></a>
 <a href="https://github.com/kriasoft/react-starter-kit/stargazers"><img src="https://img.shields.io/github/stars/kriasoft/react-starter-kit.svg?style=social&label=Star&maxAge=3600" height="20"></a>
-<a href="https://twitter.com/koistya"><img src="https://img.shields.io/twitter/follow/koistya.svg?style=social&label=Follow&maxAge=3600" height="20"></a>
+<a href="https://x.com/ReactStarter"><img src="https://img.shields.io/twitter/follow/ReactStarter.svg?style=social&label=Follow&maxAge=3600" height="20"></a>
 
 Building modern web applications shouldn't require weeks of configuration hell. This React Starter Kit eliminates the tedious setup work so you can focus on what matters: shipping great products.
 
@@ -29,16 +29,17 @@ Be sure to join our [Discord channel](https://discord.gg/2nKEnKq) for assistance
 
 This starter kit uses a thoughtfully organized monorepo structure that promotes code reuse and maintainability:
 
-- [`apps/web/`](./apps/web) — React frontend with Vite, TanStack Router, and Tailwind CSS
+- [`apps/app/`](./apps/app) — React 19 application with TanStack Router, Jotai, and Tailwind CSS v4
+- [`apps/web/`](./apps/web) — Astro marketing website for static site generation
 - [`apps/api/`](./apps/api) — tRPC API server powered by Hono framework
 - [`apps/edge/`](./apps/edge) — Cloudflare Workers entry point for edge deployment
 - [`packages/core/`](./packages/core) — Shared TypeScript types and utilities
+- [`packages/ui/`](./packages/ui) — Shared UI components with shadcn/ui management utilities
 - [`packages/ws-protocol/`](./packages/ws-protocol) — WebSocket protocol template with type-safe messaging
 - [`db/`](./db) — Database schemas, migrations, and seed data
 - [`docs/`](./docs) — VitePress documentation site
 - [`infra/`](./infra) — Terraform infrastructure configurations for multi-environment deployment
 - [`scripts/`](./scripts) — Build automation and development tools
-- [`packages/ui/`](./packages/ui) — Shared UI components with ShadCN management utilities
 
 **Why Monorepo?** This structure enables seamless code sharing between frontend and backend, ensures type consistency across your entire stack, and simplifies dependency management. When you update a type definition, both client and server stay in sync automatically.
 
@@ -59,26 +60,27 @@ This starter kit uses a thoughtfully organized monorepo structure that promotes
 - [Bun](https://bun.sh/) — Lightning-fast JavaScript runtime and package manager
 - [Cloudflare Workers](https://workers.cloudflare.com/) — Edge computing platform
 
-**Frontend & UI**
+### Frontend & UI
 
 - [React 19](https://react.dev/) — Latest React with concurrent features
 - [TanStack Router](https://tanstack.com/router) — Type-safe routing with data loading
 - [Tailwind CSS v4](https://tailwindcss.com/) — Utility-first CSS framework
-- [ShadCN UI](https://ui.shadcn.com/) — Beautiful, accessible components
+- [shadcn/ui](https://ui.shadcn.com/) — Beautiful, accessible components
 - [Jotai](https://jotai.org/) — Atomic state management
+- [Astro](https://astro.build/) — Static site generator for marketing pages
 
-**Backend & API**
+### Backend & API
 
-- [Hono](https://hono.dev/) — Ultrafast web framework for the edge
+- [Hono](https://hono.dev/) — Ultra-fast web framework for the edge
 - [tRPC](https://trpc.io/) — End-to-end type safety for APIs
 - [Better Auth](https://www.better-auth.com/) — Modern authentication solution
 
-**Database & ORM**
+### Database & ORM
 
 - [Drizzle ORM](https://orm.drizzle.team/) — TypeScript ORM with excellent DX
 - [Neon PostgreSQL](https://neon.tech/) — Serverless PostgreSQL database
 
-**Development Tools**
+### Development Tools
 
 - [Vite](https://vitejs.dev/) — Next-generation frontend tooling
 - [Vitest](https://vitest.dev/) — Blazing fast unit testing
@@ -117,10 +119,10 @@ Update environment variables in [`.env`](./.env) and `.env.local` files as well
 
 Open two terminals and run these commands:
 
-**Terminal 1 - Frontend:**
+**Terminal 1 - Application (React):**
 
 ```bash
-bun --filter @repo/web dev
+bun --filter @repo/app dev
 ```
 
 **Terminal 2 - Backend:**
@@ -130,6 +132,12 @@ bun --filter @repo/edge build --watch
 bun wrangler dev
 ```
 
+For the marketing website:
+
+```bash
+bun --filter @repo/web dev
+```
+
 ### 5. Initialize Database
 
 ```bash
@@ -138,7 +146,7 @@ bun --filter @repo/db migrate
 bun --filter @repo/db seed  # Optional: add sample data
 ```
 
-Open <http://localhost:5173> to see your app running. The backend API will be available at the port shown by `wrangler dev` (typically 8787).
+Open <http://localhost:5173> to see your React app running. The marketing website runs on <http://localhost:4321>. The backend API will be available at the port shown by `wrangler dev` (typically 8787).
 
 ## Production Deployment
 
@@ -156,6 +164,7 @@ bun wrangler secret put OPENAI_API_KEY --env=production
 
 ```bash
 # Build all packages
+bun --filter @repo/app build
 bun --filter @repo/web build
 bun --filter @repo/edge build
 
@@ -167,7 +176,7 @@ Your application will be live on your Cloudflare Workers domain within seconds.
 
 ## Contributors 👨‍💻
 
-<a href="https://reactstarter.com/c/1"><img src="https://reactstarter.com/c/1.png" height="60" /></a>&nbsp;&nbsp;<a href="https://reactstarter.com/c/2"><img src="https://reactstarter.com/c/2.png" height="60" /></a>&nbsp;&nbsp;<a href="https://reactstarter.com/c/3"><img src="https://reactstarter.com/c/3.png" height="60" /></a>&nbsp;&nbsp;<a href="https://reactstarter.com/c/4"><img src="https://reactstarter.com/c/4.png" height="60" /></a>&nbsp;&nbsp;<a href="https://reactstarter.com/c/5"><img src="https://reactstarter.com/c/5.png" height="60" /></a>&nbsp;&nbsp;<a href="https://reactstarter.com/c/6"><img src="https://reactstarter.com/c/6.png" height="60" /></a>&nbsp;&nbsp;<a href="https://reactstarter.com/c/7"><img src="https://reactstarter.com/c/7.png" height="60" /></a>&nbsp;&nbsp;<a href="https://reactstarter.com/c/8"><img src="https://reactstarter.com/c/8.png" height="60" /></a>
+<a href="https://reactstarter.com/c/1"><img src="https://reactstarter.com/c/1.png" height="60" /></a>&nbsp;&nbsp;<a href="https://reactstarter.com/c/2"><img src="https://reactstarter.com/c/2.png" height="60" /></a>&nbsp;&nbsp;<a href="https://reactstarter.com/c/3"><img src="https://reactstarter.com/c/3.png" height="60" /></a>&nbsp;&nbsp;<a href="https://reactstarter.com/c/4"><img src="https://reactstarter.com/c/4.png" height="60" /></a>&nbsp;&nbsp;<a href="https://reactstarter.com/c/5"><img src="https://reactstarter.com/c/5.png" height="60" /></a>&nbsp;&nbsp;<a href="https://reactstarter.com/c/6"><img src="https://reactstarter.com/c/6.png" height="60" /></a>&nbsp;&nbsp;<a href="https://reactstarter.com/c/7"><img src="https://reactstarter.com/c/7.png" height="60" /></a>&nbsp;&nbsp;<a href="https://reactstarter.com/c/8"><img src="https://reactstarter.com/c/8.png" height="60" /></a>&nbsp;&nbsp;<a href="https://reactstarter.com/c/9"><img src="https://reactstarter.com/c/9.png" height="60" /></a>&nbsp;&nbsp;<a href="https://reactstarter.com/c/10"><img src="https://reactstarter.com/c/10.png" height="60" /></a>&nbsp;&nbsp;<a href="https://reactstarter.com/c/11"><img src="https://reactstarter.com/c/11.png" height="60" /></a>&nbsp;&nbsp;<a href="https://reactstarter.com/c/12"><img src="https://reactstarter.com/c/12.png" height="60" /></a>&nbsp;&nbsp;<a href="https://reactstarter.com/c/13"><img src="https://reactstarter.com/c/13.png" height="60" /></a>
 
 ## Backers 💰
 

apps/api/package.json

@@ -15,7 +15,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@ai-sdk/openai": "^2.0.6",
+    "@ai-sdk/openai": "^2.0.8",
     "@repo/core": "workspace:*",
     "@repo/db": "workspace:*",
     "@trpc/server": "^11.4.4",
@@ -27,15 +27,15 @@
   },
   "peerDependencies": {
     "hono": "^4.9.0",
-    "zod": "^4.0.15"
+    "zod": "^4.0.17"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250807.0",
+    "@cloudflare/workers-types": "^4.20250809.0",
     "@repo/typescript-config": "workspace:*",
     "@types/bun": "^1.2.19",
     "hono": "^4.9.0",
     "typescript": "~5.9.2",
     "vitest": "~3.2.4",
-    "zod": "^4.0.15"
+    "zod": "^4.0.17"
   }
 }

apps/web/CLAUDE.md renamed to apps/app/CLAUDE.md

@@ -1,6 +1,6 @@
 ## Tech Stack
 
-React 19, TypeScript, Vite, TanStack Router, ShadCN UI, Tailwind CSS v4, Jotai, Better Auth.
+React 19, TypeScript, Vite, TanStack Router, shadcn/ui, Tailwind CSS v4, Jotai, Better Auth.
 
 ## Commands