create-better-t-stack 3.4.2-canary.2077910a → 3.4.2-canary.39ce1311

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { n as createBtsCli } from "./src-CFkY2F0Q.js";
+import { n as createBtsCli } from "./src-UXnIdUSH.js";
 
 //#region src/cli.ts
 createBtsCli().run();

package/dist/index.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-import { a as router, i as init, n as createBtsCli, o as sponsors, r as docs, t as builder } from "./src-CFkY2F0Q.js";
+import { a as router, i as init, n as createBtsCli, o as sponsors, r as docs, t as builder } from "./src-UXnIdUSH.js";
 
 export { builder, createBtsCli, docs, init, router, sponsors };

package/dist/{src-CFkY2F0Q.js → src-UXnIdUSH.js}

@@ -73,21 +73,21 @@ const dependencyVersionMap = {
 	"@planetscale/database": "^1.19.0",
 	"@libsql/client": "^0.14.0",
 	libsql: "^0.5.22",
-	"@neondatabase/serverless": "^1.0.1",
+	"@neondatabase/serverless": "^1.0.2",
 	pg: "^8.14.1",
 	"@types/pg": "^8.11.11",
 	"@types/ws": "^8.18.1",
 	ws: "^8.18.3",
 	mysql2: "^3.14.0",
-	"@prisma/client": "dev",
-	prisma: "dev",
-	"@prisma/adapter-d1": "dev",
-	"@prisma/adapter-neon": "dev",
-	"@prisma/adapter-mariadb": "dev",
-	"@prisma/adapter-libsql": "dev",
-	"@prisma/adapter-better-sqlite3": "dev",
-	"@prisma/adapter-pg": "dev",
-	"@prisma/adapter-planetscale": "dev",
+	"@prisma/client": "^7.0.0",
+	prisma: "^7.0.0",
+	"@prisma/adapter-d1": "^7.0.0",
+	"@prisma/adapter-neon": "^7.0.0",
+	"@prisma/adapter-mariadb": "^7.0.0",
+	"@prisma/adapter-libsql": "^7.0.0",
+	"@prisma/adapter-better-sqlite3": "^7.0.0",
+	"@prisma/adapter-pg": "^7.0.0",
+	"@prisma/adapter-planetscale": "^7.0.0",
 	mongoose: "^8.14.0",
 	"vite-plugin-pwa": "^1.0.1",
 	"@vite-pwa/assets-generator": "^1.0.0",
@@ -5625,9 +5625,12 @@ async function setupDatabase(config, cliInput) {
 				const prismaDevDependencies = ["prisma"];
 				if (database === "mysql" && dbSetup === "planetscale") prismaDependencies.push("@prisma/adapter-planetscale", "@planetscale/database");
 				else if (database === "mysql") prismaDependencies.push("@prisma/adapter-mariadb");
-				else if (database === "sqlite") prismaDependencies.push("@prisma/adapter-libsql");
-				else if (database === "postgres") if (dbSetup === "neon") prismaDependencies.push("@prisma/adapter-neon");
-				else {
+				else if (database === "sqlite") if (dbSetup === "d1") prismaDependencies.push("@prisma/adapter-d1");
+				else prismaDependencies.push("@prisma/adapter-libsql");
+				else if (database === "postgres") if (dbSetup === "neon") {
+					prismaDependencies.push("@prisma/adapter-neon", "@neondatabase/serverless", "ws");
+					prismaDevDependencies.push("@types/ws");
+				} else {
 					prismaDependencies.push("@prisma/adapter-pg");
 					prismaDependencies.push("pg");
 					prismaDevDependencies.push("@types/pg");
@@ -6299,6 +6302,7 @@ async function getDatabaseInstructions(database, orm, runCmd, _runtime, dbSetup,
 		if (database === "mysql" && orm === "drizzle") instructions.push(`${pc.yellow("NOTE:")} Enable foreign key constraints in PlanetScale database settings`);
 		if (database === "mysql" && orm === "prisma") instructions.push(`${pc.yellow("NOTE:")} How to handle Prisma migrations with PlanetScale:\n   https://github.com/prisma/prisma/issues/7292`);
 	}
+	if (dbSetup === "turso" && orm === "prisma") instructions.push(`${pc.yellow("NOTE:")} Follow Turso's Prisma guide for migrations via the Turso CLI:\n   https://docs.turso.tech/sdk/ts/orm/prisma`);
 	if (orm === "prisma") {
 		if (database === "mongodb" && dbSetup === "docker") instructions.push(`${pc.yellow("WARNING:")} Prisma + MongoDB + Docker combination\n   may not work.`);
 		if (dbSetup === "docker") instructions.push(`${pc.cyan("•")} Start docker container: ${`${runCmd} db:start`}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "3.4.2-canary.2077910a",
+  "version": "3.4.2-canary.39ce1311",
   "description": "A modern CLI tool for scaffolding end-to-end type-safe TypeScript projects with best practices and customizable configurations",
   "type": "module",
   "license": "MIT",

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

@@ -1,4 +1,33 @@
+{{#if (eq runtime "workers")}}
 import { PrismaClient } from "../prisma/generated/client";
+import { env } from "cloudflare:workers";
+
+{{#if (eq dbSetup "planetscale")}}
+import { PrismaPlanetScale } from "@prisma/adapter-planetscale";
+
+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 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),
+};
+
+const adapter = new PrismaMariaDb(connectionConfig);
+const prisma = new PrismaClient({ adapter });
+{{/if}}
+
+export default prisma;
+{{else}}
+import { PrismaClient } from "../prisma/generated/client";
+
 {{#if (eq dbSetup "planetscale")}}
 import { PrismaPlanetScale } from "@prisma/adapter-planetscale";
 
@@ -7,16 +36,19 @@ const prisma = new PrismaClient({ adapter });
 {{else}}
 import { PrismaMariaDb } from "@prisma/adapter-mariadb";
 
-const adapter = new PrismaMariaDb({
-host: process.env.DATABASE_HOST || "localhost",
-port: parseInt(process.env.DATABASE_PORT || "3306"),
-user: process.env.DATABASE_USERNAME || "",
-password: process.env.DATABASE_PASSWORD || "",
-database: process.env.DATABASE_NAME || "",
-connectionLimit: 5,
-});
+const databaseUrl: string = process.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),
+};
 
+const adapter = new PrismaMariaDb(connectionConfig);
 const prisma = new PrismaClient({ adapter });
 {{/if}}
 
-export default prisma;
+export default prisma;
+{{/if}}

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

@@ -13,9 +13,9 @@ dotenv.config({
 {{/unless}}
 
 export default defineConfig({
-    schema: path.join("prisma", "schema"),
-    migrations: {
-        path: path.join("prisma", "migrations"),
+  schema: path.join("prisma", "schema"),
+  migrations: {
+    path: path.join("prisma", "migrations"),
     },
     datasource: {
         url: env('DATABASE_URL'),

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

@@ -3,30 +3,48 @@ import { PrismaClient } from "../prisma/generated/client";
 import { env } from "cloudflare:workers";
 {{#if (eq dbSetup "neon")}}
 import { PrismaNeon } from "@prisma/adapter-neon";
+import { neonConfig } from "@neondatabase/serverless";
+
+neonConfig.poolQueryViaFetch = true;
+
+const prisma = new PrismaClient({
+  adapter: new PrismaNeon({
+    connectionString: env.DATABASE_URL || "",
+  }),
+});
 
-const adapter = new PrismaNeon({ connectionString: env.DATABASE_URL || "" });
 {{else}}
 import { PrismaPg } from "@prisma/adapter-pg";
 
 const adapter = new PrismaPg({ connectionString: env.DATABASE_URL || "" });
-{{/if}}
 const prisma = new PrismaClient({ adapter });
 
+{{/if}}
+
 export default prisma;
 {{else}}
 import { PrismaClient } from "../prisma/generated/client";
 {{#if (eq dbSetup "neon")}}
 import { PrismaNeon } from "@prisma/adapter-neon";
-import dotenv from "dotenv";
+import { neonConfig } from "@neondatabase/serverless";
+import ws from "ws";
+
+neonConfig.webSocketConstructor = ws;
+neonConfig.poolQueryViaFetch = true;
+
+const adapter = new PrismaNeon({
+    connectionString: process.env.DATABASE_URL || "",
+});
+
+const prisma = new PrismaClient({ adapter });
 
-dotenv.config();
-const adapter = new PrismaNeon({ connectionString: process.env.DATABASE_URL || "" });
 {{else}}
 import { PrismaPg } from "@prisma/adapter-pg";
 
 const adapter = new PrismaPg({ connectionString: process.env.DATABASE_URL || "" });
-{{/if}}
 const prisma = new PrismaClient({ adapter });
 
+{{/if}}
+
 export default prisma;
 {{/if}}

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

@@ -1,21 +1,25 @@
 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: {
+    {{#if (eq dbSetup "turso")}}
+    url: "file:./dev.db",
+    {{else}}
+    url: env("DATABASE_URL"),
+    {{/if}}
+  },
+});

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

@@ -1,5 +1,6 @@
-{{#if (eq dbSetup "d1")}}
 import { PrismaClient } from "../prisma/generated/client";
+
+{{#if (eq dbSetup "d1")}}
 import { PrismaD1 } from "@prisma/adapter-d1";
 import { env } from "cloudflare:workers";
 
@@ -8,13 +9,16 @@ const prisma = new PrismaClient({ adapter });
 
 export default prisma;
 {{else}}
-import { PrismaClient } from "../prisma/generated/client";
 import { PrismaLibSql } from "@prisma/adapter-libsql";
+{{#if (eq runtime "workers")}}
+import { env } from "cloudflare:workers";
+{{/if}}
 
 const adapter = new PrismaLibSql({
-url: process.env.DATABASE_URL || "",
+url: {{#if (eq runtime "workers")}}env.DATABASE_URL || ""{{else}}process.env.DATABASE_URL || ""{{/if}},
 {{#if (eq dbSetup "turso")}}
-authToken: process.env.DATABASE_AUTH_TOKEN,
+authToken: {{#if (eq runtime "workers")}}env.DATABASE_AUTH_TOKEN || ""{{else}}process.env.DATABASE_AUTH_TOKEN ||
+""{{/if}},
 {{/if}}
 });