create-better-t-stack 3.0.3 → 3.0.5

package/dist/cli.js

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

package/dist/index.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-import { builder, createBtsCli, docs, init, router, sponsors } from "./src-D7cz-mze.js";
+import { builder, createBtsCli, docs, init, router, sponsors } from "./src-YT9TBJQT.js";
 
 export { builder, createBtsCli, docs, init, router, sponsors };

package/dist/{src-D7cz-mze.js → src-YT9TBJQT.js}

@@ -1819,6 +1819,7 @@ function validateFullConfig(config, providedFlags, options) {
 	validateSelfBackendCompatibility(providedFlags, options, config);
 	validateWorkersCompatibility(providedFlags, options, config);
 	if (config.runtime === "workers" && config.serverDeploy === "none") exitWithError("Cloudflare Workers runtime requires a server deployment. Please choose 'wrangler' or 'alchemy' for --server-deploy.");
+	if (providedFlags.has("serverDeploy") && (config.serverDeploy === "alchemy" || config.serverDeploy === "wrangler") && config.runtime !== "workers") exitWithError(`Server deployment '${config.serverDeploy}' requires '--runtime workers'. Please use '--runtime workers' or choose a different server deployment.`);
 	if (config.addons && config.addons.length > 0) {
 		validateAddonsAgainstFrontends(config.addons, config.frontend, config.auth);
 		config.addons = [...new Set(config.addons)];
@@ -3347,17 +3348,10 @@ async function setupAlchemyServerDeploy(serverDir, _packageManager, projectDir)
 	}
 }
 async function addAlchemyPackagesDependencies$1(projectDir) {
-	for (const packageName of [
-		"packages/api",
-		"packages/auth",
-		"packages/db"
-	]) {
-		const packageDir = path.join(projectDir, packageName);
-		if (await fs.pathExists(packageDir)) await addPackageDependency({
-			devDependencies: ["@cloudflare/workers-types"],
-			projectDir: packageDir
-		});
-	}
+	await addPackageDependency({
+		devDependencies: ["@cloudflare/workers-types"],
+		projectDir
+	});
 }
 
 //#endregion
@@ -3940,17 +3934,10 @@ async function setupWorkersWebDeploy(projectDir, pkgManager) {
 	await setupWorkersVitePlugin(projectDir);
 }
 async function addAlchemyPackagesDependencies(projectDir) {
-	for (const packageName of [
-		"packages/api",
-		"packages/auth",
-		"packages/db"
-	]) {
-		const packageDir = path.join(projectDir, packageName);
-		if (await fs.pathExists(packageDir)) await addPackageDependency({
-			devDependencies: ["@cloudflare/workers-types"],
-			projectDir: packageDir
-		});
-	}
+	await addPackageDependency({
+		devDependencies: ["@cloudflare/workers-types"],
+		projectDir
+	});
 }
 
 //#endregion
@@ -4822,16 +4809,17 @@ async function setupCloudflareD1(config) {
 //#endregion
 //#region src/helpers/database-providers/docker-compose-setup.ts
 async function setupDockerCompose(config) {
-	const { database, projectDir, projectName } = config;
+	const { database, projectDir, projectName, backend } = config;
 	if (database === "none" || database === "sqlite") return;
 	try {
-		await writeEnvFile$4(projectDir, database, projectName);
+		await writeEnvFile$4(projectDir, database, projectName, backend);
 	} catch (error) {
 		if (error instanceof Error) console.error(`Error: ${error.message}`);
 	}
 }
-async function writeEnvFile$4(projectDir, database, projectName) {
-	const envPath = path.join(projectDir, "apps/server", ".env");
+async function writeEnvFile$4(projectDir, database, projectName, backend) {
+	const targetApp = backend === "self" ? "apps/web" : "apps/server";
+	const envPath = path.join(projectDir, targetApp, ".env");
 	const variables = [{
 		key: "DATABASE_URL",
 		value: getDatabaseUrl(database, projectName),
@@ -6875,7 +6863,7 @@ async function createProject(options, cliInput) {
 		await copyBaseTemplate(projectDir, options);
 		await setupFrontendTemplates(projectDir, options);
 		await setupBackendFramework(projectDir, options);
-		if (needsServerSetup) await setupDockerComposeTemplates(projectDir, options);
+		if (needsServerSetup || isSelfBackend && options.dbSetup === "docker") await setupDockerComposeTemplates(projectDir, options);
 		await setupAuthTemplate(projectDir, options);
 		if (options.payments && options.payments !== "none") await setupPaymentsTemplate(projectDir, options);
 		if (options.examples.length > 0 && options.examples[0] !== "none") await setupExamplesTemplate(projectDir, options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "3.0.3",
+  "version": "3.0.5",
   "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/deploy/alchemy/alchemy.run.ts.hbs

@@ -59,7 +59,7 @@ export const web = await Nextjs("web", {
   bindings: {
     {{#if (eq backend "convex")}}
     NEXT_PUBLIC_CONVEX_URL: process.env.NEXT_PUBLIC_CONVEX_URL || "",
-    {{else}}
+    {{else if (ne backend "self")}}
     NEXT_PUBLIC_SERVER_URL: process.env.NEXT_PUBLIC_SERVER_URL || "",
     {{/if}}
   },
@@ -73,7 +73,7 @@ export const web = await Nuxt("web", {
   bindings: {
     {{#if (eq backend "convex")}}
     NUXT_PUBLIC_CONVEX_URL: process.env.NUXT_PUBLIC_CONVEX_URL || "",
-    {{else}}
+    {{else if (ne backend "self")}}
     NUXT_PUBLIC_SERVER_URL: process.env.NUXT_PUBLIC_SERVER_URL || "",
     {{/if}}
   },
@@ -87,7 +87,7 @@ export const web = await SvelteKit("web", {
   bindings: {
     {{#if (eq backend "convex")}}
     PUBLIC_CONVEX_URL: process.env.PUBLIC_CONVEX_URL || "",
-    {{else}}
+    {{else if (ne backend "self")}}
     PUBLIC_SERVER_URL: process.env.PUBLIC_SERVER_URL || "",
     {{/if}}
   },
@@ -101,7 +101,7 @@ export const web = await TanStackStart("web", {
   bindings: {
     {{#if (eq backend "convex")}}
     VITE_CONVEX_URL: process.env.VITE_CONVEX_URL || "",
-    {{else}}
+    {{else if (ne backend "self")}}
     VITE_SERVER_URL: process.env.VITE_SERVER_URL || "",
     {{/if}}
   },
@@ -116,7 +116,7 @@ export const web = await Vite("web", {
   bindings: {
     {{#if (eq backend "convex")}}
     VITE_CONVEX_URL: process.env.VITE_CONVEX_URL || "",
-    {{else}}
+    {{else if (ne backend "self")}}
     VITE_SERVER_URL: process.env.VITE_SERVER_URL || "",
     {{/if}}
   },
@@ -130,7 +130,7 @@ export const web = await ReactRouter("web", {
   bindings: {
     {{#if (eq backend "convex")}}
     VITE_CONVEX_URL: process.env.VITE_CONVEX_URL || "",
-    {{else}}
+    {{else if (ne backend "self")}}
     VITE_SERVER_URL: process.env.VITE_SERVER_URL || "",
     {{/if}}
   },
@@ -145,7 +145,7 @@ export const web = await Vite("web", {
   bindings: {
     {{#if (eq backend "convex")}}
     VITE_CONVEX_URL: process.env.VITE_CONVEX_URL || "",
-    {{else}}
+    {{else if (ne backend "self")}}
     VITE_SERVER_URL: process.env.VITE_SERVER_URL || "",
     {{/if}}
   },