create-better-t-stack 2.17.1 → 2.18.0

package/dist/index.js

@@ -46,8 +46,8 @@ const DEFAULT_CONFIG = {
 	api: "trpc"
 };
 const dependencyVersionMap = {
-	"better-auth": "^1.2.8",
-	"@better-auth/expo": "^1.2.8",
+	"better-auth": "^1.2.9",
+	"@better-auth/expo": "^1.2.9",
 	"drizzle-orm": "^0.38.4",
 	"drizzle-kit": "^0.30.5",
 	"@libsql/client": "^0.14.0",
@@ -86,9 +86,9 @@ const dependencyVersionMap = {
 	"@ai-sdk/svelte": "^2.1.9",
 	"@ai-sdk/react": "^1.2.12",
 	"@prisma/extension-accelerate": "^1.3.0",
-	"@orpc/server": "^1.4.1",
-	"@orpc/client": "^1.4.1",
-	"@orpc/tanstack-query": "^1.4.1",
+	"@orpc/server": "^1.5.0",
+	"@orpc/client": "^1.5.0",
+	"@orpc/tanstack-query": "^1.5.0",
 	"@trpc/tanstack-react-query": "^11.0.0",
 	"@trpc/server": "^11.0.0",
 	"@trpc/client": "^11.0.0",
@@ -2894,7 +2894,7 @@ async function getFrontendChoice(frontendOptions, backend) {
 			},
 			{
 				value: "tanstack-start",
-				label: "TanStack Start (beta)",
+				label: "TanStack Start (devinxi)",
 				hint: "SSR, Server Functions, API Routes and more with TanStack Router"
 			}
 		];
@@ -3120,70 +3120,6 @@ async function gatherConfig(flags, projectName, projectDir, relativePath) {
 	};
 }
 
-//#endregion
-//#region src/prompts/project-name.ts
-const INVALID_CHARS = [
-	"<",
-	">",
-	":",
-	"\"",
-	"|",
-	"?",
-	"*"
-];
-const MAX_LENGTH = 255;
-function validateDirectoryName(name) {
-	if (name === ".") return void 0;
-	if (!name) return "Project name cannot be empty";
-	if (name.length > MAX_LENGTH) return `Project name must be less than ${MAX_LENGTH} characters`;
-	if (INVALID_CHARS.some((char) => name.includes(char))) return "Project name contains invalid characters";
-	if (name.startsWith(".") || name.startsWith("-")) return "Project name cannot start with a dot or dash";
-	if (name.toLowerCase() === "node_modules") return "Project name is reserved";
-	return void 0;
-}
-async function getProjectName(initialName) {
-	if (initialName) {
-		if (initialName === ".") return initialName;
-		const finalDirName = path.basename(initialName);
-		const validationError = validateDirectoryName(finalDirName);
-		if (!validationError) return initialName;
-	}
-	let isValid = false;
-	let projectPath = "";
-	let defaultName = DEFAULT_CONFIG.projectName;
-	let counter = 1;
-	while (fs.pathExistsSync(path.resolve(process.cwd(), defaultName)) && fs.readdirSync(path.resolve(process.cwd(), defaultName)).length > 0) {
-		defaultName = `${DEFAULT_CONFIG.projectName}-${counter}`;
-		counter++;
-	}
-	while (!isValid) {
-		const response = await text({
-			message: "Enter your project name or path (relative to current directory)",
-			placeholder: defaultName,
-			initialValue: initialName,
-			defaultValue: defaultName,
-			validate: (value) => {
-				const nameToUse = value.trim() || defaultName;
-				const finalDirName = path.basename(nameToUse);
-				const validationError = validateDirectoryName(finalDirName);
-				if (validationError) return validationError;
-				if (nameToUse !== ".") {
-					const projectDir = path.resolve(process.cwd(), nameToUse);
-					if (!projectDir.startsWith(process.cwd())) return "Project path must be within current directory";
-				}
-				return void 0;
-			}
-		});
-		if (isCancel(response)) {
-			cancel(pc.red("Operation cancelled."));
-			process.exit(0);
-		}
-		projectPath = response || defaultName;
-		isValid = true;
-	}
-	return projectPath;
-}
-
 //#endregion
 //#region src/types.ts
 const DatabaseSchema = z.enum([
@@ -3257,6 +3193,69 @@ const APISchema = z.enum([
 	"orpc",
 	"none"
 ]).describe("API type");
+const ProjectNameSchema = z.string().min(1, "Project name cannot be empty").max(255, "Project name must be less than 255 characters").refine((name) => name === "." || !name.startsWith("."), "Project name cannot start with a dot (except for '.')").refine((name) => name === "." || !name.startsWith("-"), "Project name cannot start with a dash").refine((name) => {
+	const invalidChars = [
+		"<",
+		">",
+		":",
+		"\"",
+		"|",
+		"?",
+		"*"
+	];
+	return !invalidChars.some((char) => name.includes(char));
+}, "Project name contains invalid characters").refine((name) => name.toLowerCase() !== "node_modules", "Project name is reserved").describe("Project name or path");
+
+//#endregion
+//#region src/prompts/project-name.ts
+function validateDirectoryName(name) {
+	if (name === ".") return void 0;
+	const result = ProjectNameSchema.safeParse(name);
+	if (!result.success) return result.error.issues[0]?.message || "Invalid project name";
+	return void 0;
+}
+async function getProjectName(initialName) {
+	if (initialName) {
+		if (initialName === ".") return initialName;
+		const finalDirName = path.basename(initialName);
+		const validationError = validateDirectoryName(finalDirName);
+		if (!validationError) return initialName;
+	}
+	let isValid = false;
+	let projectPath = "";
+	let defaultName = DEFAULT_CONFIG.projectName;
+	let counter = 1;
+	while (fs.pathExistsSync(path.resolve(process.cwd(), defaultName)) && fs.readdirSync(path.resolve(process.cwd(), defaultName)).length > 0) {
+		defaultName = `${DEFAULT_CONFIG.projectName}-${counter}`;
+		counter++;
+	}
+	while (!isValid) {
+		const response = await text({
+			message: "Enter your project name or path (relative to current directory)",
+			placeholder: defaultName,
+			initialValue: initialName,
+			defaultValue: defaultName,
+			validate: (value) => {
+				const nameToUse = value.trim() || defaultName;
+				const finalDirName = path.basename(nameToUse);
+				const validationError = validateDirectoryName(finalDirName);
+				if (validationError) return validationError;
+				if (nameToUse !== ".") {
+					const projectDir = path.resolve(process.cwd(), nameToUse);
+					if (!projectDir.startsWith(process.cwd())) return "Project path must be within current directory";
+				}
+				return void 0;
+			}
+		});
+		if (isCancel(response)) {
+			cancel(pc.red("Operation cancelled."));
+			process.exit(0);
+		}
+		projectPath = response || defaultName;
+		isValid = true;
+	}
+	return projectPath;
+}
 
 //#endregion
 //#region src/utils/get-latest-cli-version.ts
@@ -3442,8 +3441,22 @@ function processAndValidateFlags(options, providedFlags, projectName) {
 	if (options.runtime) config.runtime = options.runtime;
 	if (options.dbSetup) config.dbSetup = options.dbSetup;
 	if (options.packageManager) config.packageManager = options.packageManager;
-	if (projectName) config.projectName = projectName;
-	else if (options.projectDirectory) config.projectName = path.basename(path.resolve(process.cwd(), options.projectDirectory));
+	if (projectName) {
+		const result = ProjectNameSchema.safeParse(path.basename(projectName));
+		if (!result.success) {
+			consola$1.fatal(`Invalid project name: ${result.error.issues[0]?.message || "Invalid project name"}`);
+			process.exit(1);
+		}
+		config.projectName = projectName;
+	} else if (options.projectDirectory) {
+		const baseName = path.basename(path.resolve(process.cwd(), options.projectDirectory));
+		const result = ProjectNameSchema.safeParse(baseName);
+		if (!result.success) {
+			consola$1.fatal(`Invalid project name: ${result.error.issues[0]?.message || "Invalid project name"}`);
+			process.exit(1);
+		}
+		config.projectName = baseName;
+	}
 	if (options.frontend && options.frontend.length > 0) if (options.frontend.includes("none")) {
 		if (options.frontend.length > 1) {
 			consola$1.fatal(`Cannot combine 'none' with other frontend options.`);
@@ -3587,9 +3600,6 @@ function getProvidedFlags(options) {
 
 //#endregion
 //#region src/index.ts
-const exit = () => process.exit(0);
-process.on("SIGINT", exit);
-process.on("SIGTERM", exit);
 const t = trpcServer.initTRPC.create();
 async function handleDirectoryConflict(currentPathInput) {
 	while (true) {
@@ -3739,17 +3749,17 @@ async function createProjectHandler(input) {
 const router = t.router({ init: t.procedure.meta({
 	description: "Create a new Better-T Stack project",
 	default: true
-}).input(zod.tuple([zod.string().optional().describe("project-name"), zod.object({
-	yes: zod.boolean().optional().default(false).describe("Use default configuration and skip prompts"),
+}).input(zod.tuple([ProjectNameSchema.optional(), zod.object({
+	yes: zod.boolean().optional().default(false).describe("Use default configuration"),
 	database: DatabaseSchema.optional(),
 	orm: ORMSchema.optional(),
-	auth: zod.boolean().optional().describe("Include authentication"),
-	frontend: zod.array(FrontendSchema).optional().describe("Frontend frameworks"),
-	addons: zod.array(AddonsSchema).optional().describe("Additional addons"),
-	examples: zod.array(ExamplesSchema).optional().describe("Examples to include"),
-	git: zod.boolean().optional().describe("Initialize git repository"),
+	auth: zod.boolean().optional(),
+	frontend: zod.array(FrontendSchema).optional(),
+	addons: zod.array(AddonsSchema).optional(),
+	examples: zod.array(ExamplesSchema).optional(),
+	git: zod.boolean().optional(),
 	packageManager: PackageManagerSchema.optional(),
-	install: zod.boolean().optional().describe("Install dependencies"),
+	install: zod.boolean().optional(),
 	dbSetup: DatabaseSetupSchema.optional(),
 	backend: BackendSchema.optional(),
 	runtime: RuntimeSchema.optional(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "2.17.1",
+  "version": "2.18.0",
   "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/auth/server/base/src/lib/auth.ts.hbs

@@ -1,7 +1,7 @@
 {{#if (eq orm "prisma")}}
 import { betterAuth } from "better-auth";
 import { prismaAdapter } from "better-auth/adapters/prisma";
-{{#if (includes frontend "native")}}
+{{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
 import { expo } from "@better-auth/expo";
 {{/if}}
 import prisma from "../../prisma";
@@ -14,24 +14,24 @@ export const auth = betterAuth({
     {{#if (eq database "mongodb")}}provider: "mongodb"{{/if}}
   }),
   trustedOrigins: [
-    process.env.CORS_ORIGIN || "",{{#if (includes frontend "native")}}
+    process.env.CORS_ORIGIN || "",{{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
     "my-better-t-app://",{{/if}}
   ],
   emailAndPassword: {
     enabled: true,
   }
 
-  {{~#if (includes frontend "native")}}
+  {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
   ,
   plugins: [expo()]
-  {{/if~}}
+  {{/if}}
 });
 {{/if}}
 
 {{#if (eq orm "drizzle")}}
 import { betterAuth } from "better-auth";
 import { drizzleAdapter } from "better-auth/adapters/drizzle";
-{{#if (includes frontend "native")}}
+{{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
 import { expo } from "@better-auth/expo";
 {{/if}}
 import { db } from "../db";
@@ -45,64 +45,64 @@ export const auth = betterAuth({
     schema: schema,
   }),
   trustedOrigins: [
-    process.env.CORS_ORIGIN || "",{{#if (includes frontend "native")}}
+    process.env.CORS_ORIGIN || "",{{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
     "my-better-t-app://",{{/if}}
   ],
   emailAndPassword: {
     enabled: true,
   }
 
-  {{~#if (includes frontend "native")}}
+  {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
   ,
   plugins: [expo()]
-  {{/if~}}
+  {{/if}}
 });
 {{/if}}
 
 {{#if (eq orm "mongoose")}}
 import { betterAuth } from "better-auth";
 import { mongodbAdapter } from "better-auth/adapters/mongodb";
-{{#if (includes frontend "native")}}
+{{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
 import { expo } from "@better-auth/expo";
 {{/if}}
 import { client } from "../db";
 
 export const auth = betterAuth({
-    database: mongodbAdapter(client),
-    trustedOrigins: [
-        process.env.CORS_ORIGIN || "",{{#if (includes frontend "native")}}
-        "my-better-t-app://",{{/if}}
-    ],
-    emailAndPassword: {
-        enabled: true,
-    }
+  database: mongodbAdapter(client),
+  trustedOrigins: [
+    process.env.CORS_ORIGIN || "",{{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
+    "my-better-t-app://",{{/if}}
+  ],
+  emailAndPassword: {
+    enabled: true,
+  }
 
-    {{~#if (includes frontend "native")}}
-        ,
-        plugins: [expo()]
-    {{/if~}}
+  {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
+  ,
+  plugins: [expo()]
+  {{/if}}
 });
 {{/if}}
 
 {{#if (eq orm "none")}}
 import { betterAuth } from "better-auth";
-{{#if (includes frontend "native")}}
+{{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
 import { expo } from "@better-auth/expo";
 {{/if}}
 
 export const auth = betterAuth({
   database: "", // Invalid configuration
   trustedOrigins: [
-    process.env.CORS_ORIGIN || "",{{#if (includes frontend "native")}}
+    process.env.CORS_ORIGIN || "",{{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
     "my-better-t-app://",{{/if}}
   ],
   emailAndPassword: {
     enabled: true,
   }
 
-  {{~#if (includes frontend "native")}}
+  {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
   ,
   plugins: [expo()]
-  {{/if~}}
+  {{/if}}
 });
 {{/if}}

package/templates/frontend/react/tanstack-start/package.json

@@ -3,10 +3,9 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "start": "vinxi start",
-    "build": "vinxi build",
+    "build": "vite build",
     "serve": "vite preview",
-    "dev": "vinxi dev --port=3001"
+    "dev": "vite dev --port=3001"
   },
   "dependencies": {
     "@radix-ui/react-checkbox": "^1.1.4",
@@ -15,11 +14,11 @@
     "@radix-ui/react-slot": "^1.1.2",
     "@tanstack/react-form": "^1.0.5",
     "@tailwindcss/vite": "^4.1.8",
-    "@tanstack/react-query": "^5.80.5",
-    "@tanstack/react-router": "^1.120.15",
-    "@tanstack/react-router-with-query": "^1.120.15",
-    "@tanstack/react-start": "^1.120.15",
-    "@tanstack/router-plugin": "^1.120.15",
+    "@tanstack/react-query": "^5.80.6",
+    "@tanstack/react-router": "^1.121.0-alpha.27",
+    "@tanstack/react-router-with-query": "^1.121.0",
+    "@tanstack/react-start": "^1.121.0-alpha.27",
+    "@tanstack/router-plugin": "^1.121.0",
     "class-variance-authority": "^0.7.1",
 		"clsx": "^2.1.1",
     "lucide-react": "^0.473.0",
@@ -30,17 +29,16 @@
     "tailwindcss": "^4.1.3",
     "tailwind-merge": "^2.6.0",
     "tw-animate-css": "^1.2.5",
-    "vinxi": "^0.5.3",
     "vite-tsconfig-paths": "^5.1.4",
     "zod": "^3.25.16"
   },
   "devDependencies": {
-    "@tanstack/react-router-devtools": "^1.120.15",
+    "@tanstack/react-router-devtools": "^1.121.0-alpha.27",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/react": "^16.2.0",
     "@types/react": "^19.0.12",
     "@types/react-dom": "^19.0.4",
-    "@vitejs/plugin-react": "^4.3.4",
+    "@vitejs/plugin-react": "^4.5.2",
     "jsdom": "^26.0.0",
     "typescript": "^5.7.2",
     "vite": "^6.3.5",

package/templates/frontend/react/tanstack-start/src/router.tsx.hbs

@@ -8,7 +8,7 @@ import { routeTree } from "./routeTree.gen";
 import Loader from "./components/loader";
 import "./index.css";
 {{else}}
-import { createRouter as createTanstackRouter } from "@tanstack/react-router";
+import { createRouter as createTanStackRouter } from "@tanstack/react-router";
 import Loader from "./components/loader";
 import "./index.css";
 import { routeTree } from "./routeTree.gen";
@@ -102,7 +102,7 @@ const trpc = createTRPCOptionsProxy({
   {{/if}}
 
 export const createRouter = () => {
-  const router = createTanstackRouter({
+  const router = createTanStackRouter({
     routeTree,
     scrollRestoration: true,
     defaultPreloadStaleTime: 0,
@@ -111,7 +111,7 @@ export const createRouter = () => {
     {{else if (eq api "orpc")}}
     context: { orpc, queryClient },
     {{else}}
-    context: { },
+    context: {},
     {{/if}}
     defaultPendingComponent: () => <Loader />,
     defaultNotFoundComponent: () => <div>Not Found</div>,

package/templates/frontend/react/tanstack-start/vite.config.ts

@@ -0,0 +1,8 @@
+import { defineConfig } from "vite";
+import tsconfigPaths from "vite-tsconfig-paths";
+import { tanstackStart } from "@tanstack/react-start/plugin/vite";
+import tailwindcss from "@tailwindcss/vite";
+
+export default defineConfig({
+  plugins: [tsconfigPaths(), tailwindcss(), tanstackStart({})],
+});

package/templates/frontend/react/tanstack-start/app.config.ts

@@ -1,17 +0,0 @@
-import { defineConfig } from "@tanstack/react-start/config";
-import viteTsConfigPaths from "vite-tsconfig-paths";
-import tailwindcss from "@tailwindcss/vite";
-
-export default defineConfig({
-  tsr: {
-    appDirectory: "src",
-  },
-  vite: {
-    plugins: [
-      viteTsConfigPaths({
-        projects: ["./tsconfig.json"],
-      }),
-      tailwindcss(),
-    ],
-  },
-});

package/templates/frontend/react/tanstack-start/src/api.ts

@@ -1,6 +0,0 @@
-import {
-	createStartAPIHandler,
-	defaultAPIFileRouteHandler,
-} from "@tanstack/react-start/api";
-
-export default createStartAPIHandler(defaultAPIFileRouteHandler);

package/templates/frontend/react/tanstack-start/src/client.tsx

@@ -1,8 +0,0 @@
-import { StartClient } from "@tanstack/react-start";
-import { hydrateRoot } from "react-dom/client";
-
-import { createRouter } from "./router";
-
-const router = createRouter();
-
-hydrateRoot(document, <StartClient router={router} />);

package/templates/frontend/react/tanstack-start/src/ssr.tsx

@@ -1,12 +0,0 @@
-import { getRouterManifest } from "@tanstack/react-start/router-manifest";
-import {
-	createStartHandler,
-	defaultStreamHandler,
-} from "@tanstack/react-start/server";
-
-import { createRouter } from "./router";
-
-export default createStartHandler({
-	createRouter,
-	getRouterManifest,
-})(defaultStreamHandler);