better-ts-stack 1.0.8 → 1.1.1

package/templates/modules/docker/Dockerfile.hbs

@@ -1,81 +1,126 @@
-{{#if (eq framework 'nextjs')}}
-# Base stage
-FROM node:24-alpine AS base
-WORKDIR /app
-RUN apk add --no-cache libc6-compat
-
-# Dependencies stage
-FROM base AS deps
-COPY package*.json ./
-RUN if [ -f package-lock.json ]; then npm ci; else npm install; fi
-
-# Build stage
-FROM base AS builder
-COPY --from=deps /app/node_modules ./node_modules
-COPY . .
-{{#if (eq database 'prisma')}}
-RUN DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres" npm run build
-{{else if (eq database 'mongoose')}}
-RUN MONGODB_URI="mongodb://localhost:27017/build" npm run build
-{{else}}
-RUN npm run build
-{{/if}}
-
-# Production stage
-FROM node:24-alpine AS runner
-WORKDIR /app
-ENV NODE_ENV=production
-
-RUN addgroup --system --gid 1001 nodejs && \
-    adduser --system --uid 1001 nextjs
-
-COPY --from=builder /app/public ./public
-COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
-COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
-
-USER nextjs
-EXPOSE {{port}}
-ENV PORT={{port}} HOSTNAME=0.0.0.0
-
-CMD ["node", "server.js"]
-
-{{else}}
-# Build stage
-FROM node:24-alpine AS builder
-WORKDIR /app
-
-COPY package*.json ./
-RUN if [ -f package-lock.json ]; then npm ci; else npm install; fi
-
-COPY . .
-
-# Only build if package.json has a build script
-{{#if (eq database 'prisma')}}
-RUN DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres" npm run build
-{{else if (eq database 'mongoose')}}
-RUN MONGODB_URI="mongodb://localhost:27017/build" npm run build
-{{else}}
-RUN npm run build
-{{/if}}
-
-# Production stage
-FROM node:24-alpine
-WORKDIR /app
-ENV NODE_ENV=production
-
-# Create non-root user for security
-RUN addgroup --system --gid 1001 nodejs && \
-    adduser --system --uid 1001 expressuser
-
-COPY package*.json ./
-RUN if [ -f package-lock.json ]; then npm ci --omit=dev; else npm install --omit=dev; fi
-
-# Copy built files (if TypeScript) or source files (if JavaScript)
-COPY --from=builder --chown=expressuser:nodejs /app/dist ./dist
-
-USER expressuser
-EXPOSE {{port}}
-ENV PORT={{port}}
-
-CMD ["node", "dist/index.js"]
+{{#if (eq framework 'nextjs')}}
+# Base stage
+FROM node:24-alpine AS base
+WORKDIR /app
+RUN apk add --no-cache libc6-compat
+
+# Dependencies stage
+FROM base AS deps
+COPY package*.json ./
+RUN if [ -f package-lock.json ]; then npm ci; else npm install; fi
+
+# Build stage
+FROM base AS builder
+COPY --from=deps /app/node_modules ./node_modules
+COPY . .
+{{#if (eq database 'prisma')}}
+RUN DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres" npm run build
+{{else if (eq database 'mongoose')}}
+RUN MONGODB_URI="mongodb://localhost:27017/build" npm run build
+{{else}}
+RUN npm run build
+{{/if}}
+
+# Production stage
+FROM node:24-alpine AS runner
+WORKDIR /app
+ENV NODE_ENV=production
+
+RUN addgroup --system --gid 1001 nodejs && \
+    adduser --system --uid 1001 nextjs
+
+COPY --from=builder /app/public ./public
+COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
+COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
+
+USER nextjs
+EXPOSE {{port}}
+ENV PORT={{port}} HOSTNAME=0.0.0.0
+
+CMD ["node", "server.js"]
+
+{{else if (eq framework 'tanstack')}}
+# Build stage
+FROM node:24-alpine AS builder
+WORKDIR /app
+
+COPY package*.json ./
+RUN if [ -f package-lock.json ]; then npm ci; else npm install; fi
+
+COPY . .
+
+# Only build if package.json has a build script
+{{#if (eq database 'prisma')}}
+RUN DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres" npm run build
+{{else if (eq database 'mongoose')}}
+RUN MONGODB_URI="mongodb://localhost:27017/build" npm run build
+{{else}}
+RUN npm run build
+{{/if}}
+
+# Production stage
+FROM node:24-alpine
+WORKDIR /app
+ENV NODE_ENV=production
+
+# Create non-root user for security
+RUN addgroup --system --gid 1001 nodejs && \
+    adduser --system --uid 1001 tanstackuser
+
+COPY package*.json ./
+RUN if [ -f package-lock.json ]; then npm ci --omit=dev; else npm install --omit=dev; fi
+
+# Copy built output (dist/server/server.js + dist/client)
+COPY --from=builder --chown=tanstackuser:nodejs /app/dist ./dist
+
+# Include the Prisma client generated during the build stage
+{{#if (eq database 'prisma')}}
+COPY --from=builder --chown=tanstackuser:nodejs /app/generated ./generated
+{{/if}}
+
+USER tanstackuser
+EXPOSE {{port}}
+ENV PORT={{port}}
+
+CMD ["node_modules/.bin/srvx", "--prod", "-s", "../client", "dist/server/server.js"]
+
+{{else}}
+# Build stage
+FROM node:24-alpine AS builder
+WORKDIR /app
+
+COPY package*.json ./
+RUN if [ -f package-lock.json ]; then npm ci; else npm install; fi
+
+COPY . .
+
+# Only build if package.json has a build script
+{{#if (eq database 'prisma')}}
+RUN DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres" npm run build
+{{else if (eq database 'mongoose')}}
+RUN MONGODB_URI="mongodb://localhost:27017/build" npm run build
+{{else}}
+RUN npm run build
+{{/if}}
+
+# Production stage
+FROM node:24-alpine
+WORKDIR /app
+ENV NODE_ENV=production
+
+# Create non-root user for security
+RUN addgroup --system --gid 1001 nodejs && \
+    adduser --system --uid 1001 expressuser
+
+COPY package*.json ./
+RUN if [ -f package-lock.json ]; then npm ci --omit=dev; else npm install --omit=dev; fi
+
+# Copy built files (if TypeScript) or source files (if JavaScript)
+COPY --from=builder --chown=expressuser:nodejs /app/dist ./dist
+
+USER expressuser
+EXPOSE {{port}}
+ENV PORT={{port}}
+
+CMD ["node", "dist/index.js"]
 {{/if}}

package/templates/modules/drizzle/tanstack/config.json

@@ -0,0 +1,26 @@
+{
+  "id": "drizzle",
+  "name": "Drizzle ORM",
+  "description": "Drizzle ORM for TanStack Start with PostgreSQL",
+  "type": "database",
+  "dependencies": {
+    "drizzle-orm": "^0.45.2",
+    "pg": "^8.23.0",
+    "dotenv": "^17.4.2"
+  },
+  "devDependencies": {
+    "drizzle-kit": "^0.31.10",
+    "@types/pg": "^8.23.1"
+  },
+  "scripts": {
+    "db:generate": "drizzle-kit generate",
+    "db:migrate": "drizzle-kit migrate",
+    "db:studio": "drizzle-kit studio"
+  },
+  "envVars": {
+    "DATABASE_URL": "postgresql://user:password@localhost:5432/mydb?schema=public"
+  },
+  "templateFiles": [
+    "src/lib/schema.ts.hbs"
+  ]
+}

package/templates/modules/drizzle/tanstack/drizzle.config.ts

@@ -0,0 +1,13 @@
+import { defineConfig } from "drizzle-kit";
+import { config } from "dotenv";
+
+config({ path: ".env" });
+
+export default defineConfig({
+  schema: "./src/lib/schema.ts",
+  out: "./migrations",
+  dialect: "postgresql",
+  dbCredentials: {
+    url: process.env.DATABASE_URL!,
+  },
+});

package/templates/modules/drizzle/tanstack/src/lib/db.ts

@@ -0,0 +1,13 @@
+import { config } from "dotenv";
+import { drizzle } from "drizzle-orm/node-postgres";
+import { Pool } from "pg";
+
+import * as schema from "./schema";
+
+config({ path: ".env" }); // or .env.local
+
+const pool = new Pool({
+  connectionString: process.env.DATABASE_URL,
+});
+
+export const db = drizzle(pool, { schema });

package/templates/modules/drizzle/tanstack/src/lib/schema.ts.hbs

@@ -0,0 +1,84 @@
+{{#if useAuth}}
+import { boolean, pgTable, text, timestamp, uniqueIndex } from "drizzle-orm/pg-core";
+
+export const user = pgTable("user", {
+  id: text("id").primaryKey(),
+  name: text("name").notNull(),
+  email: text("email").notNull().unique(),
+  emailVerified: boolean("email_verified").notNull().default(false),
+  image: text("image"),
+  createdAt: timestamp("created_at", { withTimezone: true })
+    .notNull()
+    .defaultNow(),
+  updatedAt: timestamp("updated_at", { withTimezone: true })
+    .notNull()
+    .defaultNow(),
+});
+
+export const session = pgTable("session", {
+  id: text("id").primaryKey(),
+  expiresAt: timestamp("expires_at", { withTimezone: true }).notNull(),
+  token: text("token").notNull().unique(),
+  createdAt: timestamp("created_at", { withTimezone: true })
+    .notNull()
+    .defaultNow(),
+  updatedAt: timestamp("updated_at", { withTimezone: true })
+    .notNull()
+    .defaultNow(),
+  ipAddress: text("ip_address"),
+  userAgent: text("user_agent"),
+  userId: text("user_id")
+    .notNull()
+    .references(() => user.id, { onDelete: "cascade" }),
+});
+
+export const account = pgTable("account", {
+  id: text("id").primaryKey(),
+  accountId: text("account_id").notNull(),
+  providerId: text("provider_id").notNull(),
+  userId: text("user_id")
+    .notNull()
+    .references(() => user.id, { onDelete: "cascade" }),
+  accessToken: text("access_token"),
+  refreshToken: text("refresh_token"),
+  idToken: text("id_token"),
+  accessTokenExpiresAt: timestamp("access_token_expires_at", {
+    withTimezone: true,
+  }),
+  refreshTokenExpiresAt: timestamp("refresh_token_expires_at", {
+    withTimezone: true,
+  }),
+  scope: text("scope"),
+  password: text("password"),
+  createdAt: timestamp("created_at", { withTimezone: true })
+    .notNull()
+    .defaultNow(),
+  updatedAt: timestamp("updated_at", { withTimezone: true })
+    .notNull()
+    .defaultNow(),
+}, (table) => [uniqueIndex("account_provider_account_id_unique").on(table.providerId, table.accountId)]);
+
+export const verification = pgTable("verification", {
+  id: text("id").primaryKey(),
+  identifier: text("identifier").notNull(),
+  value: text("value").notNull(),
+  expiresAt: timestamp("expires_at", { withTimezone: true }).notNull(),
+  createdAt: timestamp("created_at", { withTimezone: true })
+    .notNull()
+    .defaultNow(),
+  updatedAt: timestamp("updated_at", { withTimezone: true })
+    .notNull()
+    .defaultNow(),
+});
+{{else}}
+import { pgTable, text, timestamp, uuid } from "drizzle-orm/pg-core";
+
+export const users = pgTable("users", {
+  id: uuid("id").primaryKey().defaultRandom(),
+  email: text("email").notNull().unique(),
+  name: text("name"),
+  password: text("password").notNull(),
+  createdAt: timestamp("created_at", { withTimezone: true }).defaultNow(),
+  updatedAt: timestamp("updated_at", { withTimezone: true }).defaultNow(),
+});
+{{/if}}

package/templates/modules/prisma/express/config.json

@@ -14,6 +14,7 @@
     "prisma:generate": "prisma generate",
     "prisma:migrate": "prisma migrate dev",
     "prisma:studio": "prisma studio",
+    "pretype:check": "prisma generate",
     "prebuild": "prisma generate"
   },
   "envVars": {

package/templates/modules/prisma/nextjs/config.json

@@ -15,6 +15,7 @@
     "prisma:generate": "prisma generate",
     "prisma:migrate": "prisma migrate dev",
     "prisma:studio": "prisma studio",
+    "pretype:check": "prisma generate",
     "prebuild": "prisma generate"
   },
   "envVars": {

package/templates/modules/prisma/tanstack/config.json

@@ -0,0 +1,29 @@
+{
+  "id": "prisma",
+  "name": "Prisma ORM",
+  "description": "Prisma ORM for TanStack Start with PostgreSQL",
+  "type": "database",
+  "dependencies": {
+    "@prisma/client": "^7.10.0",
+    "@prisma/adapter-pg": "^7.10.0"
+  },
+  "devDependencies": {
+    "prisma": "^7.10.0",
+    "dotenv": "^17.4.2"
+  },
+  "scripts": {
+    "prisma:generate": "prisma generate",
+    "prisma:migrate": "prisma migrate dev",
+    "prisma:studio": "prisma studio",
+    "pretype:check": "prisma generate",
+    "prebuild": "prisma generate"
+  },
+  "envVars": {
+    "DATABASE_URL": "postgresql://postgres:postgres@localhost:5432/postgres?schema=public"
+  },
+  "templateFiles": ["prisma/schema.prisma.hbs"],
+  "overrides": {
+    "deepmerge-ts": "^8.0.2",
+    "mysql2": "^3.24.3"
+  }
+}

package/templates/modules/prisma/tanstack/prisma/schema.prisma.hbs

@@ -0,0 +1,91 @@
+// Prisma schema file
+// Learn more: https://pris.ly/d/prisma-schema
+
+generator client {
+  provider = "prisma-client"
+  output   = "../generated"
+}
+
+datasource db {
+  provider = "postgresql"
+}
+
+{{#if useAuth}}
+
+model User {
+  id            String    @id
+  name          String
+  email         String
+  emailVerified Boolean   @default(false)
+  image         String?
+  createdAt     DateTime  @default(now())
+  updatedAt     DateTime  @updatedAt
+  sessions      Session[]
+  accounts      Account[]
+
+  @@unique([email])
+  @@map("user")
+}
+
+model Session {
+  id        String   @id
+  expiresAt DateTime
+  token     String
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+  ipAddress String?
+  userAgent String?
+  userId    String
+  user      User     @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  @@unique([token])
+  @@index([userId])
+  @@map("session")
+}
+
+model Account {
+  id                    String    @id
+  accountId             String
+  providerId            String
+  userId                String
+  user                  User      @relation(fields: [userId], references: [id], onDelete: Cascade)
+  accessToken           String?
+  refreshToken          String?
+  idToken               String?
+  accessTokenExpiresAt  DateTime?
+  refreshTokenExpiresAt DateTime?
+  scope                 String?
+  password              String?
+  createdAt             DateTime  @default(now())
+  updatedAt             DateTime  @updatedAt
+
+  @@index([userId])
+  @@unique([providerId, accountId])
+  @@map("account")
+}
+
+model Verification {
+  id         String   @id
+  identifier String
+  value      String
+  expiresAt  DateTime
+  createdAt  DateTime @default(now())
+  updatedAt  DateTime @updatedAt
+
+  @@index([identifier])
+  @@map("verification")
+}
+
+{{else}}
+// Sample User model
+model User {
+  id        String   @id @default(uuid())
+  email     String   @unique
+  name      String?
+  password  String
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  @@map("users")
+}
+{{/if}}

package/templates/modules/prisma/tanstack/prisma.config.ts

@@ -0,0 +1,12 @@
+import "dotenv/config";
+import { defineConfig, env } from "prisma/config";
+
+export default defineConfig({
+  schema: "prisma/schema.prisma",
+  migrations: {
+    path: "prisma/migrations",
+  },
+  datasource: {
+    url: env("DATABASE_URL"),
+  },
+});

package/templates/modules/prisma/tanstack/src/lib/prisma.ts

@@ -0,0 +1,18 @@
+import { PrismaPg } from "@prisma/adapter-pg";
+
+import { PrismaClient } from "../../generated/client";
+
+const globalForPrisma = global as unknown as {
+  prisma: PrismaClient;
+};
+const adapter = new PrismaPg({
+  connectionString: process.env.DATABASE_URL,
+});
+const prisma =
+  globalForPrisma.prisma ||
+  new PrismaClient({
+    adapter,
+  });
+if (process.env.NODE_ENV !== "production") globalForPrisma.prisma = prisma;
+
+export default prisma;