better-ts-stack 2.0.2 → 2.1.1

package/templates/modules/docker/Dockerfile.hbs

@@ -1,136 +1,147 @@
-{{#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 useAuth}}
-# next build loads the auth route, which initializes Better Auth. The build gets
-# a placeholder secret for this command only; the real one is supplied at runtime.
-{{/if}}
-{{#if (eq database 'prisma')}}
-RUN {{#if useAuth}}BETTER_AUTH_SECRET="build-only-placeholder-secret-not-used-at-runtime" {{/if}}DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres" npm run build
-{{else if (eq database 'mongoose')}}
-RUN {{#if useAuth}}BETTER_AUTH_SECRET="build-only-placeholder-secret-not-used-at-runtime" {{/if}}MONGODB_URI="mongodb://localhost:27017/build" npm run build
-{{else}}
-RUN {{#if useAuth}}BETTER_AUTH_SECRET="build-only-placeholder-secret-not-used-at-runtime" {{/if}}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 . .
-
-{{#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 ./
-# Clear the npm cache in the same layer so it does not ship in the image
-RUN if [ -f package-lock.json ]; then npm ci --omit=dev; else npm install --omit=dev; fi \
-    && npm cache clean --force
-
-# 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 . .
-
-{{#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 appuser
-
-COPY package*.json ./
-# Clear the npm cache in the same layer so it does not ship in the image
-RUN if [ -f package-lock.json ]; then npm ci --omit=dev; else npm install --omit=dev; fi \
-    && npm cache clean --force
-
-# Copy the compiled output
-COPY --from=builder --chown=appuser:nodejs /app/dist ./dist
-
-USER appuser
-EXPOSE {{port}}
-ENV PORT={{port}}
-
-{{#if (eq framework 'nestjs')}}
-CMD ["node", "dist/main.js"]
-{{else}}
-CMD ["node", "dist/index.js"]
-{{/if}}
-{{/if}}
+{{#if (eq framework 'nextjs')}}
+# Base stage
+FROM node:24-alpine AS base
+WORKDIR /app
+RUN apk add --no-cache libc6-compat
+{{#if docker.setup}}
+{{docker.setup}}
+{{/if}}
+
+# Dependencies stage
+FROM base AS deps
+COPY {{docker.manifests}} ./
+RUN {{docker.install}}
+
+# Build stage
+FROM base AS builder
+COPY --from=deps /app/node_modules ./node_modules
+COPY . .
+{{#if useAuth}}
+# next build loads the auth route, which initializes Better Auth. The build gets
+# a placeholder secret for this command only; the real one is supplied at runtime.
+{{/if}}
+{{#if (eq database 'prisma')}}
+RUN {{#if useAuth}}BETTER_AUTH_SECRET="build-only-placeholder-secret-not-used-at-runtime" {{/if}}DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres" {{docker.run}} build
+{{else if (eq database 'mongoose')}}
+RUN {{#if useAuth}}BETTER_AUTH_SECRET="build-only-placeholder-secret-not-used-at-runtime" {{/if}}MONGODB_URI="mongodb://localhost:27017/build" {{docker.run}} build
+{{else}}
+RUN {{#if useAuth}}BETTER_AUTH_SECRET="build-only-placeholder-secret-not-used-at-runtime" {{/if}}{{docker.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
+
+HEALTHCHECK --interval=30s --timeout=5s --start-period=20s --retries=3 \
+    CMD wget -q -O /dev/null http://127.0.0.1:{{port}}/ || exit 1
+
+CMD ["node", "server.js"]
+
+{{else if (eq framework 'tanstack')}}
+# Build stage
+FROM node:24-alpine AS builder
+WORKDIR /app
+{{#if docker.setup}}
+{{docker.setup}}
+{{/if}}
+
+COPY {{docker.manifests}} ./
+RUN {{docker.install}}
+
+COPY . .
+
+{{#if (eq database 'prisma')}}
+RUN DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres" {{docker.run}} build
+{{else if (eq database 'mongoose')}}
+RUN MONGODB_URI="mongodb://localhost:27017/build" {{docker.run}} build
+{{else}}
+RUN {{docker.run}} build
+{{/if}}
+
+# Production stage. Nitro bundles the server and the dependencies it needs
+# into .output, so no install is needed here
+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 --from=builder --chown=tanstackuser:nodejs /app/.output ./.output
+
+USER tanstackuser
+EXPOSE {{port}}
+ENV PORT={{port}}
+
+HEALTHCHECK --interval=30s --timeout=5s --start-period=20s --retries=3 \
+    CMD wget -q -O /dev/null http://127.0.0.1:{{port}}/ || exit 1
+
+CMD ["node", ".output/server/index.mjs"]
+
+{{else}}
+# Build stage
+FROM node:24-alpine AS builder
+WORKDIR /app
+{{#if docker.setup}}
+{{docker.setup}}
+{{/if}}
+
+COPY {{docker.manifests}} ./
+RUN {{docker.install}}
+
+COPY . .
+
+{{#if (eq database 'prisma')}}
+RUN DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres" {{docker.run}} build
+{{else if (eq database 'mongoose')}}
+RUN MONGODB_URI="mongodb://localhost:27017/build" {{docker.run}} build
+{{else}}
+RUN {{docker.run}} build
+{{/if}}
+
+# Production stage
+FROM node:24-alpine
+WORKDIR /app
+ENV NODE_ENV=production
+{{#if docker.setup}}
+{{docker.setup}}
+{{/if}}
+
+# Create non-root user for security
+RUN addgroup --system --gid 1001 nodejs && \
+    adduser --system --uid 1001 appuser
+
+COPY {{docker.manifests}} ./
+# Clear the download cache in the same layer so it does not ship in the image
+RUN {{docker.installProduction}} \
+    && {{docker.cleanCache}}
+
+# Copy the compiled output
+COPY --from=builder --chown=appuser:nodejs /app/dist ./dist
+
+USER appuser
+EXPOSE {{port}}
+ENV PORT={{port}}
+
+HEALTHCHECK --interval=30s --timeout=5s --start-period=20s --retries=3 \
+    CMD wget -q -O /dev/null http://127.0.0.1:{{port}}/health || exit 1
+
+{{#if (eq framework 'nestjs')}}
+CMD ["node", "dist/main.js"]
+{{else}}
+CMD ["node", "dist/index.js"]
+{{/if}}
+{{/if}}

package/templates/modules/docker/docker-compose.yml.hbs

@@ -1,5 +1,5 @@
 services:
-  {{projectName}}:
+  app:
     build: .
     ports:
       - "{{port}}:{{port}}"
@@ -7,4 +7,99 @@ services:
       - .env
     environment:
       - NODE_ENV=production
-    restart: unless-stopped
+{{#if (eq database 'prisma')}}
+      # Inside Docker the database is the "db" service, not localhost
+      - DATABASE_URL=postgresql://postgres:postgres@db:5432/postgres
+{{/if}}
+{{#if (eq database 'drizzle')}}
+      # Inside Docker the database is the "db" service, not localhost
+      - DATABASE_URL=postgresql://postgres:postgres@db:5432/postgres
+{{/if}}
+{{#if (eq database 'mongoose')}}
+      # Inside Docker the database is the "db" service, not localhost
+      - MONGODB_URI=mongodb://db:27017/myapp?directConnection=true
+{{/if}}
+{{#unless (eq database 'none')}}
+    depends_on:
+      db:
+        condition: service_healthy
+{{/unless}}
+    restart: unless-stopped
+{{#if (eq database 'prisma')}}
+
+  # PostgreSQL for local development. The port is published so migrations and
+  # the app can also reach it from your machine at localhost:5432
+  db:
+    image: postgres:17-alpine
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: postgres
+    ports:
+      - "5432:5432"
+    volumes:
+      - db-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+    restart: unless-stopped
+
+volumes:
+  db-data:
+{{/if}}
+{{#if (eq database 'drizzle')}}
+
+  # PostgreSQL for local development. The port is published so migrations and
+  # the app can also reach it from your machine at localhost:5432
+  db:
+    image: postgres:17-alpine
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: postgres
+    ports:
+      - "5432:5432"
+    volumes:
+      - db-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+    restart: unless-stopped
+
+volumes:
+  db-data:
+{{/if}}
+{{#if (eq database 'mongoose')}}
+
+  # MongoDB for local development, run as a one-node replica set because
+  # transactions need one. The health check starts the replica set on first
+  # run. The port is published so the app can also reach it from your machine
+  # at localhost:27017
+  db:
+    image: mongo:8
+    command: ["--replSet", "rs0", "--bind_ip_all"]
+    ports:
+      - "27017:27017"
+    volumes:
+      - db-data:/data/db
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "mongosh",
+          "--quiet",
+          "--eval",
+          "try { rs.status().ok } catch (e) { rs.initiate({ _id: 'rs0', members: [{ _id: 0, host: 'localhost:27017' }] }).ok }",
+        ]
+      interval: 5s
+      timeout: 10s
+      retries: 20
+    restart: unless-stopped
+
+volumes:
+  db-data:
+{{/if}}

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

@@ -4,12 +4,12 @@
   "description": "Drizzle ORM for Express with PostgreSQL",
   "type": "database",
   "dependencies": {
-    "drizzle-orm": "^0.45.2",
-    "pg": "^8.23.0",
+    "drizzle-orm": "^0.45.4",
+    "pg": "^8.23.1",
     "dotenv": "^17.4.2"
   },
   "devDependencies": {
-    "drizzle-kit": "^0.31.10",
+    "drizzle-kit": "^0.31.11",
     "@types/pg": "^8.23.1"
   },
   "scripts": {

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

@@ -4,12 +4,12 @@
   "description": "Drizzle ORM for NestJS with PostgreSQL",
   "type": "database",
   "dependencies": {
-    "drizzle-orm": "^0.45.2",
-    "pg": "^8.23.0",
+    "drizzle-orm": "^0.45.4",
+    "pg": "^8.23.1",
     "dotenv": "^17.4.2"
   },
   "devDependencies": {
-    "drizzle-kit": "^0.31.10",
+    "drizzle-kit": "^0.31.11",
     "@types/pg": "^8.23.1"
   },
   "scripts": {

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

@@ -4,12 +4,12 @@
   "description": "Drizzle ORM for Next.js with PostgreSQL",
   "type": "database",
   "dependencies": {
-    "drizzle-orm": "^0.45.2",
-    "pg": "^8.23.0",
+    "drizzle-orm": "^0.45.4",
+    "pg": "^8.23.1",
     "dotenv": "^17.4.2"
   },
   "devDependencies": {
-    "drizzle-kit": "^0.31.10",
+    "drizzle-kit": "^0.31.11",
     "@types/pg": "^8.23.1"
   },
   "scripts": {

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

@@ -4,12 +4,12 @@
   "description": "Drizzle ORM for TanStack Start with PostgreSQL",
   "type": "database",
   "dependencies": {
-    "drizzle-orm": "^0.45.2",
-    "pg": "^8.23.0",
+    "drizzle-orm": "^0.45.4",
+    "pg": "^8.23.1",
     "dotenv": "^17.4.2"
   },
   "devDependencies": {
-    "drizzle-kit": "^0.31.10",
+    "drizzle-kit": "^0.31.11",
     "@types/pg": "^8.23.1"
   },
   "scripts": {

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

@@ -4,8 +4,8 @@
   "description": "MongoDB database integration for Express using Mongoose ODM",
   "type": "database",
   "dependencies": {
-    "mongoose": "^9.9.5",
-    "mongodb": "^7.6.0"
+    "mongoose": "^9.11.4",
+    "mongodb": "^7.8.0"
   },
   "devDependencies": {},
   "scripts": {},

package/templates/modules/mongoose/nestjs/config.json

@@ -5,7 +5,7 @@
   "type": "database",
   "dependencies": {
     "@nestjs/mongoose": "^12.0.0",
-    "mongoose": "^9.9.5"
+    "mongoose": "^9.11.4"
   },
   "devDependencies": {},
   "scripts": {},

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

@@ -4,8 +4,8 @@
   "description": "MongoDB database integration for Next.js using Mongoose ODM",
   "type": "database",
   "dependencies": {
-    "mongoose": "^9.9.5",
-    "mongodb": "^7.6.0"
+    "mongoose": "^9.11.4",
+    "mongodb": "^7.8.0"
   },
   "devDependencies": {},
   "scripts": {},

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

@@ -4,8 +4,8 @@
   "description": "MongoDB database integration for TanStack Start using Mongoose ODM",
   "type": "database",
   "dependencies": {
-    "mongoose": "^9.9.5",
-    "mongodb": "^7.6.0",
+    "mongoose": "^9.11.4",
+    "mongodb": "^7.8.0",
     "dotenv": "^17.4.2"
   },
   "devDependencies": {},

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

@@ -4,11 +4,11 @@
   "description": "Prisma ORM with PostgreSQL database support",
   "type": "database",
   "dependencies": {
-    "@prisma/adapter-pg": "^7.10.0",
-    "@prisma/client": "^7.10.0"
+    "@prisma/adapter-pg": "^7.10.1",
+    "@prisma/client": "^7.10.1"
   },
   "devDependencies": {
-    "prisma": "^7.10.0"
+    "prisma": "^7.10.1"
   },
   "scripts": {
     "prisma:generate": "prisma generate",
@@ -22,6 +22,6 @@
   },
   "overrides": {
     "deepmerge-ts": "^8.0.2",
-    "mysql2": "^3.24.3"
+    "mysql2": "^3.24.6"
   }
 }

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

@@ -1,5 +1,5 @@
 import "dotenv/config";
-import { defineConfig, env } from "prisma/config";
+import { defineConfig } from "prisma/config";
 
 export default defineConfig({
   schema: "prisma/schema.prisma",
@@ -7,6 +7,8 @@ export default defineConfig({
     path: "prisma/migrations",
   },
   datasource: {
-    url: env("DATABASE_URL"),
+    // prisma generate needs no URL, so a build without .env (CI, a host) works.
+    // Commands that connect report the empty URL
+    url: process.env.DATABASE_URL ?? "",
   },
 });

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

@@ -4,11 +4,11 @@
   "description": "Prisma ORM for NestJS with PostgreSQL",
   "type": "database",
   "dependencies": {
-    "@prisma/adapter-pg": "^7.10.0",
-    "@prisma/client": "^7.10.0"
+    "@prisma/adapter-pg": "^7.10.1",
+    "@prisma/client": "^7.10.1"
   },
   "devDependencies": {
-    "prisma": "^7.10.0"
+    "prisma": "^7.10.1"
   },
   "scripts": {
     "prisma:generate": "prisma generate",
@@ -22,6 +22,6 @@
   },
   "overrides": {
     "deepmerge-ts": "^8.0.2",
-    "mysql2": "^3.24.3"
+    "mysql2": "^3.24.6"
   }
 }

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

@@ -1,5 +1,5 @@
 import "dotenv/config";
-import { defineConfig, env } from "prisma/config";
+import { defineConfig } from "prisma/config";
 
 export default defineConfig({
   schema: "prisma/schema.prisma",
@@ -7,6 +7,8 @@ export default defineConfig({
     path: "prisma/migrations",
   },
   datasource: {
-    url: env("DATABASE_URL"),
+    // prisma generate needs no URL, so a build without .env (CI, a host) works.
+    // Commands that connect report the empty URL
+    url: process.env.DATABASE_URL ?? "",
   },
 });

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

@@ -4,11 +4,11 @@
   "description": "Prisma ORM for Next.js with PostgreSQL",
   "type": "database",
   "dependencies": {
-    "@prisma/client": "^7.10.0",
-    "@prisma/adapter-pg": "^7.10.0"
+    "@prisma/client": "^7.10.1",
+    "@prisma/adapter-pg": "^7.10.1"
   },
   "devDependencies": {
-    "prisma": "^7.10.0",
+    "prisma": "^7.10.1",
     "dotenv": "^17.4.2"
   },
   "scripts": {
@@ -23,6 +23,6 @@
   },
   "overrides": {
     "deepmerge-ts": "^8.0.2",
-    "mysql2": "^3.24.3"
+    "mysql2": "^3.24.6"
   }
 }

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

@@ -1,5 +1,5 @@
 import "dotenv/config";
-import { defineConfig, env } from "prisma/config";
+import { defineConfig } from "prisma/config";
 
 export default defineConfig({
   schema: "prisma/schema.prisma",
@@ -7,6 +7,8 @@ export default defineConfig({
     path: "prisma/migrations",
   },
   datasource: {
-    url: env("DATABASE_URL"),
+    // prisma generate needs no URL, so a build without .env (CI, a host) works.
+    // Commands that connect report the empty URL
+    url: process.env.DATABASE_URL ?? "",
   },
 });

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

@@ -4,11 +4,11 @@
   "description": "Prisma ORM for TanStack Start with PostgreSQL",
   "type": "database",
   "dependencies": {
-    "@prisma/client": "^7.10.0",
-    "@prisma/adapter-pg": "^7.10.0"
+    "@prisma/client": "^7.10.1",
+    "@prisma/adapter-pg": "^7.10.1"
   },
   "devDependencies": {
-    "prisma": "^7.10.0",
+    "prisma": "^7.10.1",
     "dotenv": "^17.4.2"
   },
   "scripts": {
@@ -23,6 +23,6 @@
   },
   "overrides": {
     "deepmerge-ts": "^8.0.2",
-    "mysql2": "^3.24.3"
+    "mysql2": "^3.24.6"
   }
 }