create-better-t-stack 2.22.8 → 2.22.10

package/dist/index.js

@@ -3609,7 +3609,7 @@ This project uses Convex as a backend. You'll need to set up Convex before runni
 ${packageManagerRunCmd} dev:setup
 \`\`\`
 
-Follow the prompts to create a new Convex project and connect it to your application.` : generateDatabaseSetup(database, auth, packageManagerRunCmd, orm)}
+Follow the prompts to create a new Convex project and connect it to your application.` : generateDatabaseSetup(database, auth, packageManagerRunCmd, orm, options.dbSetup)}
 
 Then, run the development server:
 
@@ -3764,15 +3764,16 @@ function generateFeaturesList(database, auth, addons, orm, runtime, frontend, ba
 	else if (addon === "turborepo") addonsList.push("- **Turborepo** - Optimized monorepo build system");
 	return addonsList.join("\n");
 }
-function generateDatabaseSetup(database, _auth, packageManagerRunCmd, orm) {
+function generateDatabaseSetup(database, _auth, packageManagerRunCmd, orm, dbSetup) {
 	if (database === "none") return "";
 	let setup = "## Database Setup\n\n";
 	if (database === "sqlite") setup += `This project uses SQLite${orm === "drizzle" ? " with Drizzle ORM" : orm === "prisma" ? " with Prisma" : ` with ${orm}`}.
 
 1. Start the local SQLite database:
-\`\`\`bash
+${dbSetup === "d1" ? "Local development for a Cloudflare D1 database will already be running as part of the `wrangler dev` command." : `\`\`\`bash
 cd apps/server && ${packageManagerRunCmd} db:local
 \`\`\`
+`}
 
 2. Update your \`.env\` file in the \`apps/server\` directory with the appropriate connection details if needed.
 `;
@@ -3840,6 +3841,29 @@ function generateScriptsList(packageManagerRunCmd, database, orm, _auth, hasNati
 	return scripts;
 }
 
+//#endregion
+//#region src/helpers/project-generation/git.ts
+async function initializeGit(projectDir, useGit) {
+	if (!useGit) return;
+	const gitVersionResult = await $({
+		cwd: projectDir,
+		reject: false,
+		stderr: "pipe"
+	})`git --version`;
+	if (gitVersionResult.exitCode !== 0) {
+		log.warn(pc.yellow("Git is not installed"));
+		return;
+	}
+	const result = await $({
+		cwd: projectDir,
+		reject: false,
+		stderr: "pipe"
+	})`git init`;
+	if (result.exitCode !== 0) throw new Error(`Git initialization failed: ${result.stderr}`);
+	await $({ cwd: projectDir })`git add -A`;
+	await $({ cwd: projectDir })`git commit -m ${"Initial commit"}`;
+}
+
 //#endregion
 //#region src/helpers/project-generation/post-installation.ts
 function displayPostInstallInstructions(config) {
@@ -3852,7 +3876,7 @@ function displayPostInstallInstructions(config) {
 	const tauriInstructions = addons?.includes("tauri") ? getTauriInstructions(runCmd) : "";
 	const lintingInstructions = hasHuskyOrBiome ? getLintingInstructions(runCmd) : "";
 	const nativeInstructions = frontend?.includes("native-nativewind") || frontend?.includes("native-unistyles") ? getNativeInstructions(isConvex) : "";
-	const pwaInstructions = addons?.includes("pwa") && (frontend?.includes("react-router") || frontend?.includes("tanstack-router")) ? getPwaInstructions() : "";
+	const pwaInstructions = addons?.includes("pwa") && frontend?.includes("react-router") ? getPwaInstructions() : "";
 	const starlightInstructions = addons?.includes("starlight") ? getStarlightInstructions(runCmd) : "";
 	const hasWeb = frontend?.some((f) => [
 		"tanstack-router",
@@ -4087,7 +4111,7 @@ async function updateServerPackageJson(projectDir, options) {
 	if (!serverPackageJson.scripts) serverPackageJson.scripts = {};
 	const scripts = serverPackageJson.scripts;
 	if (options.database !== "none") {
-		if (options.database === "sqlite" && options.orm === "drizzle") scripts["db:local"] = "turso dev --db-file local.db";
+		if (options.database === "sqlite" && options.orm === "drizzle" && options.dbSetup !== "d1") scripts["db:local"] = "turso dev --db-file local.db";
 		if (options.orm === "prisma") {
 			scripts["db:push"] = "prisma db push --schema ./prisma/schema";
 			scripts["db:studio"] = "prisma studio";
@@ -4110,24 +4134,6 @@ async function updateConvexPackageJson(projectDir, options) {
 	if (!convexPackageJson.scripts) convexPackageJson.scripts = {};
 	await fs.writeJson(convexPackageJsonPath, convexPackageJson, { spaces: 2 });
 }
-async function initializeGit(projectDir, useGit) {
-	if (!useGit) return;
-	const gitVersionResult = await $({
-		cwd: projectDir,
-		reject: false,
-		stderr: "pipe"
-	})`git --version`;
-	if (gitVersionResult.exitCode !== 0) {
-		log.warn(pc.yellow("Git is not installed"));
-		return;
-	}
-	const result = await $({
-		cwd: projectDir,
-		reject: false,
-		stderr: "pipe"
-	})`git init`;
-	if (result.exitCode !== 0) throw new Error(`Git initialization failed: ${result.stderr}`);
-}
 
 //#endregion
 //#region src/helpers/project-generation/create-project.ts
@@ -4159,7 +4165,6 @@ async function createProject(options) {
 		await updatePackageConfigurations(projectDir, options);
 		await createReadme(projectDir, options);
 		await writeBtsConfig(options);
-		await initializeGit(projectDir, options.git);
 		log.success("Project template successfully scaffolded!");
 		if (options.install) {
 			await installDependencies({
@@ -4168,6 +4173,7 @@ async function createProject(options) {
 			});
 			await generateCloudflareWorkerTypes(options);
 		}
+		await initializeGit(projectDir, options.git);
 		displayPostInstallInstructions({
 			...options,
 			depsInstalled: options.install

package/package.json

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