better-ts-stack 2.1.0 → 2.1.2

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

@@ -1,27 +1,27 @@
-{
-  "id": "prisma",
-  "name": "Prisma ORM",
-  "description": "Prisma ORM with PostgreSQL database support",
-  "type": "database",
-  "dependencies": {
-    "@prisma/adapter-pg": "^7.10.0",
-    "@prisma/client": "^7.10.0"
-  },
-  "devDependencies": {
-    "prisma": "^7.10.0"
-  },
-  "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"
-  },
-  "overrides": {
-    "deepmerge-ts": "^8.0.2",
-    "mysql2": "^3.24.3"
-  }
-}
+{
+  "id": "prisma",
+  "name": "Prisma ORM",
+  "description": "Prisma ORM with PostgreSQL database support",
+  "type": "database",
+  "dependencies": {
+    "@prisma/adapter-pg": "^7.10.1",
+    "@prisma/client": "^7.10.1"
+  },
+  "devDependencies": {
+    "prisma": "^7.10.1"
+  },
+  "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"
+  },
+  "overrides": {
+    "deepmerge-ts": "^8.0.2",
+    "mysql2": "^3.24.6"
+  }
+}

package/templates/modules/prisma/express/prisma/schema.prisma

@@ -1,24 +1,24 @@
-// Prisma schema file
-// Learn more: https://pris.ly/d/prisma-schema
-
-generator client {
+// Prisma schema file
+// Learn more: https://pris.ly/d/prisma-schema
+
+generator client {
   provider = "prisma-client"
-  moduleFormat = "cjs"
-  output   = "../src/generated/prisma"
-}
-
-datasource db {
-  provider = "postgresql"
-}
-
-// 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")
-}
+  moduleFormat = "cjs"
+  output   = "../src/generated/prisma"
+}
+
+datasource db {
+  provider = "postgresql"
+}
+
+// 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")
+}

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

@@ -1,27 +1,27 @@
-{
-  "id": "prisma",
-  "name": "Prisma ORM",
-  "description": "Prisma ORM for NestJS with PostgreSQL",
-  "type": "database",
-  "dependencies": {
-    "@prisma/adapter-pg": "^7.10.0",
-    "@prisma/client": "^7.10.0"
-  },
-  "devDependencies": {
-    "prisma": "^7.10.0"
-  },
-  "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"
-  },
-  "overrides": {
-    "deepmerge-ts": "^8.0.2",
-    "mysql2": "^3.24.3"
-  }
-}
+{
+  "id": "prisma",
+  "name": "Prisma ORM",
+  "description": "Prisma ORM for NestJS with PostgreSQL",
+  "type": "database",
+  "dependencies": {
+    "@prisma/adapter-pg": "^7.10.1",
+    "@prisma/client": "^7.10.1"
+  },
+  "devDependencies": {
+    "prisma": "^7.10.1"
+  },
+  "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"
+  },
+  "overrides": {
+    "deepmerge-ts": "^8.0.2",
+    "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

@@ -1,28 +1,28 @@
-{
-  "id": "prisma",
-  "name": "Prisma ORM",
-  "description": "Prisma ORM for Next.js 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"
-  },
-  "overrides": {
-    "deepmerge-ts": "^8.0.2",
-    "mysql2": "^3.24.3"
-  }
-}
+{
+  "id": "prisma",
+  "name": "Prisma ORM",
+  "description": "Prisma ORM for Next.js with PostgreSQL",
+  "type": "database",
+  "dependencies": {
+    "@prisma/client": "^7.10.1",
+    "@prisma/adapter-pg": "^7.10.1"
+  },
+  "devDependencies": {
+    "prisma": "^7.10.1",
+    "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"
+  },
+  "overrides": {
+    "deepmerge-ts": "^8.0.2",
+    "mysql2": "^3.24.6"
+  }
+}

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

@@ -1,18 +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;
+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;

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

@@ -1,12 +1,14 @@
-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"),
-  },
-});
+import "dotenv/config";
+import { defineConfig } from "prisma/config";
+
+export default defineConfig({
+  schema: "prisma/schema.prisma",
+  migrations: {
+    path: "prisma/migrations",
+  },
+  datasource: {
+    // 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

@@ -1,28 +1,28 @@
-{
-  "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"
-  },
-  "overrides": {
-    "deepmerge-ts": "^8.0.2",
-    "mysql2": "^3.24.3"
-  }
-}
+{
+  "id": "prisma",
+  "name": "Prisma ORM",
+  "description": "Prisma ORM for TanStack Start with PostgreSQL",
+  "type": "database",
+  "dependencies": {
+    "@prisma/client": "^7.10.1",
+    "@prisma/adapter-pg": "^7.10.1"
+  },
+  "devDependencies": {
+    "prisma": "^7.10.1",
+    "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"
+  },
+  "overrides": {
+    "deepmerge-ts": "^8.0.2",
+    "mysql2": "^3.24.6"
+  }
+}

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

@@ -1,91 +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}}
+// 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

@@ -1,12 +1,14 @@
-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"),
-  },
-});
+import "dotenv/config";
+import { defineConfig } from "prisma/config";
+
+export default defineConfig({
+  schema: "prisma/schema.prisma",
+  migrations: {
+    path: "prisma/migrations",
+  },
+  datasource: {
+    // 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/src/lib/prisma.ts

@@ -1,18 +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;
-
+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;

package/templates/modules/rate-limit/express/config.json

@@ -4,7 +4,7 @@
   "description": "Per-IP request limits for Express with express-rate-limit",
   "type": "feature",
   "dependencies": {
-    "express-rate-limit": "^8.7.1"
+    "express-rate-limit": "^8.7.2"
   },
   "devDependencies": {},
   "scripts": {},

package/templates/modules/rate-limit/express/src/middleware/rateLimit.ts

@@ -4,12 +4,14 @@ import { rateLimit } from "express-rate-limit";
 // balancer, set app.set("trust proxy", 1) so the real client IP is used.
 const FIFTEEN_MINUTES = 15 * 60 * 1000;
 
-// Every route: 100 requests per IP in 15 minutes
+// Every route: 100 requests per IP in 15 minutes. The health check is left out
+// because Docker and load balancers call it on a schedule
 export const apiLimiter = rateLimit({
   windowMs: FIFTEEN_MINUTES,
   limit: 100,
   standardHeaders: "draft-8",
   legacyHeaders: false,
+  skip: (req) => req.path === "/health",
 });
 
 // Sign-up and login: 10 attempts per IP in 15 minutes, against password guessing