create-better-t-stack 3.11.0 → 3.12.0

package/templates/backend/server/hono/src/index.ts.hbs

@@ -1,9 +1,4 @@
-{{#if (or (eq runtime "bun") (eq runtime "node"))}}
-import "dotenv/config";
-{{/if}}
-{{#if (eq runtime "workers")}}
-import { env } from "cloudflare:workers";
-{{/if}}
+import { env } from "@{{projectName}}/env/server";
 {{#if (eq api "orpc")}}
 import { OpenAPIHandler } from "@orpc/openapi/fetch";
 import { OpenAPIReferencePlugin } from "@orpc/openapi/plugins";
@@ -37,20 +32,15 @@ const app = new Hono();
 
 app.use(logger());
 app.use(
-  "/*",
-  cors({
-    {{#if (or (eq runtime "bun") (eq runtime "node"))}}
-    origin: process.env.CORS_ORIGIN || "",
-    {{/if}}
-    {{#if (eq runtime "workers")}}
-    origin: env.CORS_ORIGIN || "",
-    {{/if}}
-    allowMethods: ["GET", "POST", "OPTIONS"],
-    {{#if (eq auth "better-auth")}}
-    allowHeaders: ["Content-Type", "Authorization"],
-    credentials: true,
-    {{/if}}
-  })
+	"/*",
+	cors({
+		origin: env.CORS_ORIGIN,
+		allowMethods: ["GET", "POST", "OPTIONS"],
+{{#if (eq auth "better-auth")}}
+		allowHeaders: ["Content-Type", "Authorization"],
+		credentials: true,
+{{/if}}
+	})
 );
 
 {{#if (eq auth "better-auth")}}
@@ -59,107 +49,107 @@ app.on(["POST", "GET"], "/api/auth/*", (c) => auth.handler(c.req.raw));
 
 {{#if (eq api "orpc")}}
 export const apiHandler = new OpenAPIHandler(appRouter, {
-  plugins: [
-    new OpenAPIReferencePlugin({
-      schemaConverters: [new ZodToJsonSchemaConverter()],
-    }),
-  ],
-  interceptors: [
-    onError((error) => {
-      console.error(error);
-    }),
-  ],
+	plugins: [
+		new OpenAPIReferencePlugin({
+			schemaConverters: [new ZodToJsonSchemaConverter()],
+		}),
+	],
+	interceptors: [
+		onError((error) => {
+			console.error(error);
+		}),
+	],
 });
 
 export const rpcHandler = new RPCHandler(appRouter, {
-  interceptors: [
-    onError((error) => {
-      console.error(error);
-    }),
-  ],
+	interceptors: [
+		onError((error) => {
+			console.error(error);
+		}),
+	],
 });
 
 app.use("/*", async (c, next) => {
-  const context = await createContext({ context: c });
+	const context = await createContext({ context: c });
 
-  const rpcResult = await rpcHandler.handle(c.req.raw, {
-    prefix: "/rpc",
-    context: context,
-  });
+	const rpcResult = await rpcHandler.handle(c.req.raw, {
+		prefix: "/rpc",
+		context: context,
+	});
 
-  if (rpcResult.matched) {
-    return c.newResponse(rpcResult.response.body, rpcResult.response);
-  }
+	if (rpcResult.matched) {
+		return c.newResponse(rpcResult.response.body, rpcResult.response);
+	}
 
-  const apiResult = await apiHandler.handle(c.req.raw, {
-    prefix: "/api-reference",
-    context: context,
-  });
+	const apiResult = await apiHandler.handle(c.req.raw, {
+		prefix: "/api-reference",
+		context: context,
+	});
 
-  if (apiResult.matched) {
-    return c.newResponse(apiResult.response.body, apiResult.response);
-  }
+	if (apiResult.matched) {
+		return c.newResponse(apiResult.response.body, apiResult.response);
+	}
 
-  await next();
+	await next();
 });
 {{/if}}
 
 {{#if (eq api "trpc")}}
 app.use(
-  "/trpc/*",
-  trpcServer({
-    router: appRouter,
-    createContext: (_opts, context) => {
-      return createContext({ context });
-    },
-  })
+	"/trpc/*",
+	trpcServer({
+		router: appRouter,
+		createContext: (_opts, context) => {
+			return createContext({ context });
+		},
+	})
 );
 {{/if}}
 
 {{#if (and (includes examples "ai") (or (eq runtime "bun") (eq runtime "node")))}}
 app.post("/ai", async (c) => {
-  const body = await c.req.json();
-  const uiMessages = body.messages || [];
-  const result = streamText({
-    model: google("gemini-2.5-flash"),
-    messages: convertToModelMessages(uiMessages),
-  });
-
-  return result.toUIMessageStreamResponse();
+	const body = await c.req.json();
+	const uiMessages = body.messages || [];
+	const result = streamText({
+		model: google("gemini-2.5-flash"),
+		messages: convertToModelMessages(uiMessages),
+	});
+
+	return result.toUIMessageStreamResponse();
 });
 {{/if}}
 
 {{#if (and (includes examples "ai") (eq runtime "workers"))}}
 app.post("/ai", async (c) => {
-  const body = await c.req.json();
-  const uiMessages = body.messages || [];
-  const google = createGoogleGenerativeAI({
-    apiKey: env.GOOGLE_GENERATIVE_AI_API_KEY,
-  });
-  const result = streamText({
-    model: google("gemini-2.5-flash"),
-    messages: convertToModelMessages(uiMessages),
-  });
-
-  return result.toUIMessageStreamResponse();
+	const body = await c.req.json();
+	const uiMessages = body.messages || [];
+	const google = createGoogleGenerativeAI({
+		apiKey: env.GOOGLE_GENERATIVE_AI_API_KEY,
+	});
+	const result = streamText({
+		model: google("gemini-2.5-flash"),
+		messages: convertToModelMessages(uiMessages),
+	});
+
+	return result.toUIMessageStreamResponse();
 });
 {{/if}}
 
 app.get("/", (c) => {
-  return c.text("OK");
+	return c.text("OK");
 });
 
 {{#if (eq runtime "node")}}
 import { serve } from "@hono/node-server";
 
 serve(
-  {
-    fetch: app.fetch,
-    port: 3000,
-  },
-  (info) => {
-    console.log(`Server is running on http://localhost:${info.port}`);
-  }
+	{
+		fetch: app.fetch,
+		port: 3000,
+	},
+	(info) => {
+		console.log(`Server is running on http://localhost:${info.port}`);
+	}
 );
 {{else}}
 {{#if (eq runtime "bun")}}

package/templates/base/tsconfig.json.hbs

@@ -0,0 +1,3 @@
+{
+  "extends": "@{{projectName}}/config/tsconfig.base.json",
+}

package/templates/db/drizzle/mysql/src/index.ts.hbs

@@ -1,33 +1,26 @@
 {{#if (or (eq runtime "bun") (eq runtime "node") (eq runtime "none"))}}
-{{#if (and (ne backend "self") (includes frontend "next"))}}
-import dotenv from "dotenv";
-
-dotenv.config({
-	path: "../../apps/server/.env",
-});
-
-{{/if}}
+import { env } from "@{{projectName}}/env/server";
 import * as schema from "./schema";
 
 {{#if (eq dbSetup "planetscale")}}
 import { drizzle } from "drizzle-orm/planetscale-serverless";
 
 export const db = drizzle({
-  connection: {
-    host: process.env.DATABASE_HOST,
-    username: process.env.DATABASE_USERNAME,
-    password: process.env.DATABASE_PASSWORD,
-  },
-  schema,
+	connection: {
+		host: env.DATABASE_HOST,
+		username: env.DATABASE_USERNAME,
+		password: env.DATABASE_PASSWORD,
+	},
+	schema,
 });
 {{else}}
 import { drizzle } from "drizzle-orm/mysql2";
 
 export const db = drizzle({
-  connection: {
-    uri: process.env.DATABASE_URL,
-  },
-  schema,
+	connection: {
+		uri: env.DATABASE_URL,
+	},
+	schema,
 });
 {{/if}}
 {{/if}}
@@ -37,25 +30,25 @@ import * as schema from "./schema";
 
 {{#if (eq dbSetup "planetscale")}}
 import { drizzle } from "drizzle-orm/planetscale-serverless";
-import { env } from "cloudflare:workers";
+import { env } from "@{{projectName}}/env/server";
 
 export const db = drizzle({
-  connection: {
-    host: env.DATABASE_HOST,
-    username: env.DATABASE_USERNAME,
-    password: env.DATABASE_PASSWORD,
-  },
-  schema,
+	connection: {
+		host: env.DATABASE_HOST,
+		username: env.DATABASE_USERNAME,
+		password: env.DATABASE_PASSWORD,
+	},
+	schema,
 });
 {{else}}
 import { drizzle } from "drizzle-orm/mysql2";
-import { env } from "cloudflare:workers";
+import { env } from "@{{projectName}}/env/server";
 
 export const db = drizzle({
-  connection: {
-    uri: env.DATABASE_URL,
-  },
-  schema,
+	connection: {
+		uri: env.DATABASE_URL,
+	},
+	schema,
 });
 {{/if}}
 {{/if}}

package/templates/db/drizzle/postgres/src/index.ts.hbs

@@ -1,12 +1,5 @@
 {{#if (or (eq runtime "bun") (eq runtime "node") (eq runtime "none"))}}
-{{#if (and (ne backend "self") (includes frontend "next"))}}
-import dotenv from "dotenv";
-
-dotenv.config({
-	path: "../../apps/server/.env",
-});
-
-{{/if}}
+import { env } from "@{{projectName}}/env/server";
 import * as schema from "./schema";
 
 {{#if (eq dbSetup "neon")}}
@@ -19,12 +12,12 @@ neonConfig.webSocketConstructor = ws;
 // To work in edge environments (Cloudflare Workers, Vercel Edge, etc.), enable querying over fetch
 // neonConfig.poolQueryViaFetch = true
 
-const sql = neon(process.env.DATABASE_URL || "");
+const sql = neon(env.DATABASE_URL);
 export const db = drizzle(sql, { schema });
 {{else}}
 import { drizzle } from "drizzle-orm/node-postgres";
 
-export const db = drizzle(process.env.DATABASE_URL || "", { schema });
+export const db = drizzle(env.DATABASE_URL, { schema });
 {{/if}}
 {{/if}}
 
@@ -34,7 +27,7 @@ import * as schema from "./schema";
 {{#if (eq dbSetup "neon")}}
 import { neon, neonConfig } from '@neondatabase/serverless';
 import { drizzle } from 'drizzle-orm/neon-http';
-import { env } from "cloudflare:workers";
+import { env } from "@{{projectName}}/env/server";
 import ws from "ws";
 
 neonConfig.webSocketConstructor = ws;
@@ -44,8 +37,8 @@ const sql = neon(env.DATABASE_URL || "");
 export const db = drizzle(sql, { schema });
 {{else}}
 import { drizzle } from "drizzle-orm/node-postgres";
-import { env } from "cloudflare:workers";
+import { env } from "@{{projectName}}/env/server";
 
 export const db = drizzle(env.DATABASE_URL || "", { schema });
 {{/if}}
-{{/if}}
+{{/if}}

package/templates/db/drizzle/sqlite/src/index.ts.hbs

@@ -1,21 +1,14 @@
 {{#if (or (eq runtime "bun") (eq runtime "node") (eq runtime "none"))}}
-{{#if (and (ne backend "self") (includes frontend "next"))}}
-import dotenv from "dotenv";
-
-dotenv.config({
-	path: "../../apps/server/.env",
-});
-
-{{/if}}
+import { env } from "@{{projectName}}/env/server";
 import * as schema from "./schema";
 import { drizzle } from "drizzle-orm/libsql";
 import { createClient } from "@libsql/client";
 
 const client = createClient({
-  url: process.env.DATABASE_URL || "",
-  {{#if (eq dbSetup "turso")}}
-  authToken: process.env.DATABASE_AUTH_TOKEN,
-  {{/if}}
+	url: env.DATABASE_URL,
+{{#if (eq dbSetup "turso")}}
+	authToken: env.DATABASE_AUTH_TOKEN,
+{{/if}}
 });
 
 export const db = drizzle({ client, schema });
@@ -26,19 +19,19 @@ import * as schema from "./schema";
 
 {{#if (eq dbSetup "d1")}}
 import { drizzle } from "drizzle-orm/d1";
-import { env } from "cloudflare:workers";
+import { env } from "@{{projectName}}/env/server";
 
 export const db = drizzle(env.DB, { schema });
 {{else}}
 import { drizzle } from "drizzle-orm/libsql";
-import { env } from "cloudflare:workers";
+import { env } from "@{{projectName}}/env/server";
 import { createClient } from "@libsql/client";
 
 const client = createClient({
-  url: env.DATABASE_URL || "",
-  {{#if (eq dbSetup "turso")}}
-  authToken: env.DATABASE_AUTH_TOKEN,
-  {{/if}}
+	url: env.DATABASE_URL || "",
+{{#if (eq dbSetup "turso")}}
+	authToken: env.DATABASE_AUTH_TOKEN,
+{{/if}}
 });
 
 export const db = drizzle({ client, schema });

package/templates/db/mongoose/mongodb/src/index.ts.hbs

@@ -1,7 +1,8 @@
 import mongoose from "mongoose";
+import { env } from "@{{projectName}}/env/server";
 
-await mongoose.connect(process.env.DATABASE_URL || "").catch((error) => {
-  console.log("Error connecting to database:", error);
+await mongoose.connect(env.DATABASE_URL).catch((error) => {
+	console.log("Error connecting to database:", error);
 });
 
 const client = mongoose.connection.getClient().db("myDB");

package/templates/db/prisma/mongodb/prisma/schema/schema.prisma.hbs

@@ -8,7 +8,7 @@ generator client {
   {{#if (eq runtime "node")}}
   runtime = "nodejs"
   {{/if}}
-  {{#if (or (eq runtime "workers") (and (eq backend "self") (eq webDeploy "alchemy")))}}
+  {{#if (or (eq runtime "workers") (and (eq backend "self") (eq webDeploy "cloudflare")))}}
   runtime = "workerd"
   {{/if}}
 }

package/templates/db/prisma/mysql/prisma/schema/schema.prisma.hbs

@@ -8,7 +8,7 @@ generator client {
   {{#if (eq runtime "node")}}
   runtime       = "nodejs"
   {{/if}}
-  {{#if (or (eq runtime "workers") (and (eq backend "self") (eq webDeploy "alchemy")))}}
+  {{#if (or (eq runtime "workers") (and (eq backend "self") (eq webDeploy "cloudflare")))}}
   runtime       = "workerd"
   {{/if}}
 }

package/templates/db/prisma/mysql/prisma.config.ts.hbs

@@ -1,21 +1,21 @@
 import path from "node:path";
-import { defineConfig, env } from 'prisma/config'
-import dotenv from 'dotenv'
+import { defineConfig, env } from "prisma/config";
+import dotenv from "dotenv";
 
 dotenv.config({
-{{#if (eq backend "self")}}
-path: "../../apps/web/.env",
-{{else}}
-path: "../../apps/server/.env",
-{{/if}}
-})
+  {{#if (eq backend "self")}}
+  path: "../../apps/web/.env",
+  {{else}}
+  path: "../../apps/server/.env",
+  {{/if}}
+});
 
 export default defineConfig({
-schema: path.join("prisma", "schema"),
-migrations: {
-path: path.join("prisma", "migrations"),
-},
-datasource: {
-url: env('DATABASE_URL'),
-},
-})
+  schema: path.join("prisma", "schema"),
+  migrations: {
+    path: path.join("prisma", "migrations"),
+  },
+  datasource: {
+    url: env("DATABASE_URL"),
+  },
+});

package/templates/db/prisma/mysql/src/index.ts.hbs

@@ -1,23 +1,23 @@
 {{#if (eq runtime "workers")}}
 import { PrismaClient } from "../prisma/generated/client";
-import { env } from "cloudflare:workers";
+import { env } from "@{{projectName}}/env/server";
 
 {{#if (eq dbSetup "planetscale")}}
 import { PrismaPlanetScale } from "@prisma/adapter-planetscale";
 
-const adapter = new PrismaPlanetScale({ url: env.DATABASE_URL || "" });
+const adapter = new PrismaPlanetScale({ url: env.DATABASE_URL });
 const prisma = new PrismaClient({ adapter });
 {{else}}
 import { PrismaMariaDb } from "@prisma/adapter-mariadb";
 
-const databaseUrl: string = env.DATABASE_URL || "";
+const databaseUrl: string = env.DATABASE_URL;
 const url: URL = new URL(databaseUrl);
 const connectionConfig = {
-  host: url.hostname,
-  port: parseInt(url.port || "3306"),
-  user: url.username,
-  password: url.password,
-  database: url.pathname.slice(1),
+	host: url.hostname,
+	port: parseInt(url.port || "3306"),
+	user: url.username,
+	password: url.password,
+	database: url.pathname.slice(1),
 };
 
 const adapter = new PrismaMariaDb(connectionConfig);
@@ -27,23 +27,24 @@ const prisma = new PrismaClient({ adapter });
 export default prisma;
 {{else}}
 import { PrismaClient } from "../prisma/generated/client";
+import { env } from "@{{projectName}}/env/server";
 
 {{#if (eq dbSetup "planetscale")}}
 import { PrismaPlanetScale } from "@prisma/adapter-planetscale";
 
-const adapter = new PrismaPlanetScale({ url: process.env.DATABASE_URL || "" });
+const adapter = new PrismaPlanetScale({ url: env.DATABASE_URL });
 const prisma = new PrismaClient({ adapter });
 {{else}}
 import { PrismaMariaDb } from "@prisma/adapter-mariadb";
 
-const databaseUrl: string = process.env.DATABASE_URL || "";
+const databaseUrl: string = env.DATABASE_URL;
 const url: URL = new URL(databaseUrl);
 const connectionConfig = {
-  host: url.hostname,
-  port: parseInt(url.port || "3306"),
-  user: url.username,
-  password: url.password,
-  database: url.pathname.slice(1),
+	host: url.hostname,
+	port: parseInt(url.port || "3306"),
+	user: url.username,
+	password: url.password,
+	database: url.pathname.slice(1),
 };
 
 const adapter = new PrismaMariaDb(connectionConfig);

package/templates/db/prisma/postgres/prisma/schema/schema.prisma.hbs

@@ -8,7 +8,7 @@ generator client {
   {{#if (eq runtime "node")}}
   runtime = "nodejs"
   {{/if}}
-  {{#if (or (eq runtime "workers") (and (eq backend "self") (eq webDeploy "alchemy")))}}
+  {{#if (or (eq runtime "workers") (and (eq backend "self") (eq webDeploy "cloudflare")))}}
   runtime = "workerd"
   {{/if}}
 }

package/templates/db/prisma/postgres/src/index.ts.hbs

@@ -1,6 +1,6 @@
 {{#if (eq runtime "workers")}}
 import { PrismaClient } from "../prisma/generated/client";
-import { env } from "cloudflare:workers";
+import { env } from "@{{projectName}}/env/server";
 {{#if (eq dbSetup "neon")}}
 import { PrismaNeon } from "@prisma/adapter-neon";
 import { neonConfig } from "@neondatabase/serverless";
@@ -8,16 +8,16 @@ import { neonConfig } from "@neondatabase/serverless";
 neonConfig.poolQueryViaFetch = true;
 
 const prisma = new PrismaClient({
-  adapter: new PrismaNeon({
-    connectionString: env.DATABASE_URL || "",
-  }),
+	adapter: new PrismaNeon({
+		connectionString: env.DATABASE_URL,
+	}),
 });
 
 {{else if (eq dbSetup "prisma-postgres")}}
 import { PrismaPg } from "@prisma/adapter-pg";
 
 const adapter = new PrismaPg({
-  connectionString: env.DATABASE_URL || "",
+	connectionString: env.DATABASE_URL,
 });
 
 const prisma = new PrismaClient({ adapter });
@@ -25,7 +25,7 @@ const prisma = new PrismaClient({ adapter });
 {{else}}
 import { PrismaPg } from "@prisma/adapter-pg";
 
-const adapter = new PrismaPg({ connectionString: env.DATABASE_URL || "" });
+const adapter = new PrismaPg({ connectionString: env.DATABASE_URL });
 const prisma = new PrismaClient({ adapter });
 
 {{/if}}
@@ -33,6 +33,7 @@ const prisma = new PrismaClient({ adapter });
 export default prisma;
 {{else}}
 import { PrismaClient } from "../prisma/generated/client";
+import { env } from "@{{projectName}}/env/server";
 {{#if (eq dbSetup "neon")}}
 import { PrismaNeon } from "@prisma/adapter-neon";
 import { neonConfig } from "@neondatabase/serverless";
@@ -42,7 +43,7 @@ neonConfig.webSocketConstructor = ws;
 neonConfig.poolQueryViaFetch = true;
 
 const adapter = new PrismaNeon({
-    connectionString: process.env.DATABASE_URL || "",
+	connectionString: env.DATABASE_URL,
 });
 
 const prisma = new PrismaClient({ adapter });
@@ -51,7 +52,7 @@ const prisma = new PrismaClient({ adapter });
 import { PrismaPg } from "@prisma/adapter-pg";
 
 const adapter = new PrismaPg({
-    connectionString: process.env.DATABASE_URL || "",
+	connectionString: env.DATABASE_URL,
 });
 
 const prisma = new PrismaClient({ adapter });
@@ -59,7 +60,7 @@ const prisma = new PrismaClient({ adapter });
 {{else}}
 import { PrismaPg } from "@prisma/adapter-pg";
 
-const adapter = new PrismaPg({ connectionString: process.env.DATABASE_URL || "" });
+const adapter = new PrismaPg({ connectionString: env.DATABASE_URL });
 const prisma = new PrismaClient({ adapter });
 
 {{/if}}

package/templates/db/prisma/sqlite/prisma/schema/schema.prisma.hbs

@@ -8,7 +8,7 @@ generator client {
   {{#if (eq runtime "node")}}
   runtime = "nodejs"
   {{/if}}
-  {{#if (or (eq runtime "workers") (and (eq backend "self") (eq webDeploy "alchemy")))}}
+  {{#if (or (eq runtime "workers") (and (eq backend "self") (eq webDeploy "cloudflare")))}}
   runtime = "workerd"
   {{/if}}
 }

package/templates/db/prisma/sqlite/src/index.ts.hbs

@@ -2,7 +2,7 @@ import { PrismaClient } from "../prisma/generated/client";
 
 {{#if (eq dbSetup "d1")}}
 import { PrismaD1 } from "@prisma/adapter-d1";
-import { env } from "cloudflare:workers";
+import { env } from "@{{projectName}}/env/server";
 
 const adapter = new PrismaD1(env.DB);
 const prisma = new PrismaClient({ adapter });
@@ -10,15 +10,12 @@ const prisma = new PrismaClient({ adapter });
 export default prisma;
 {{else}}
 import { PrismaLibSql } from "@prisma/adapter-libsql";
-{{#if (eq runtime "workers")}}
-import { env } from "cloudflare:workers";
-{{/if}}
+import { env } from "@{{projectName}}/env/server";
 
 const adapter = new PrismaLibSql({
-url: {{#if (eq runtime "workers")}}env.DATABASE_URL || ""{{else}}process.env.DATABASE_URL || ""{{/if}},
+	url: env.DATABASE_URL,
 {{#if (eq dbSetup "turso")}}
-authToken: {{#if (eq runtime "workers")}}env.DATABASE_AUTH_TOKEN || ""{{else}}process.env.DATABASE_AUTH_TOKEN ||
-""{{/if}},
+	authToken: env.DATABASE_AUTH_TOKEN || "",
 {{/if}}
 });