create-better-t-stack 2.35.3 → 2.35.5

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { createBtsCli } from "./src-dID--AYy.js";
+import { createBtsCli } from "./src-D3yNVHFj.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-dID--AYy.js";
+import { builder, createBtsCli, docs, init, router, sponsors } from "./src-D3yNVHFj.js";
 
 export { builder, createBtsCli, docs, init, router, sponsors };

package/dist/{src-dID--AYy.js → src-D3yNVHFj.js}

@@ -1080,7 +1080,8 @@ async function getServerDeploymentChoice(deployment, runtime, backend, webDeploy
 	if (backend === "none" || backend === "convex") return "none";
 	if (backend !== "hono") return "none";
 	const options = [];
-	if (runtime === "workers") ["alchemy", "wrangler"].forEach((deploy) => {
+	if (runtime !== "workers") return "none";
+	["alchemy", "wrangler"].forEach((deploy) => {
 		const { label, hint } = getDeploymentDisplay$1(deploy);
 		options.unshift({
 			value: deploy,
@@ -1088,11 +1089,6 @@ async function getServerDeploymentChoice(deployment, runtime, backend, webDeploy
 			hint
 		});
 	});
-	else options.push({
-		value: "none",
-		label: "None",
-		hint: "Manual setup"
-	});
 	const response = await select({
 		message: "Select server deployment",
 		options,
@@ -1123,11 +1119,7 @@ async function getServerDeploymentToAdd(runtime, existingDeployment, backend) {
 		}
 	}
 	if (existingDeployment && existingDeployment !== "none") return "none";
-	if (options.length > 0) options.push({
-		value: "none",
-		label: "None",
-		hint: "Skip deployment setup"
-	});
+	if (options.length > 0) {}
 	if (options.length === 0) return "none";
 	const response = await select({
 		message: "Select server deployment",
@@ -1740,6 +1732,7 @@ function validateFullConfig(config, providedFlags, options) {
 	validateApiConstraints(config, options);
 	validateServerDeployRequiresBackend(config.serverDeploy, config.backend);
 	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 (config.addons && config.addons.length > 0) {
 		validateAddonsAgainstFrontends(config.addons, config.frontend);
 		config.addons = [...new Set(config.addons)];
@@ -2983,11 +2976,7 @@ async function setupWorkersServerDeploy(serverDir, _packageManager) {
 	};
 	await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 });
 	await addPackageDependency({
-		devDependencies: [
-			"wrangler",
-			"@types/node",
-			"@cloudflare/workers-types"
-		],
+		devDependencies: ["wrangler", "@types/node"],
 		projectDir: serverDir
 	});
 }
@@ -3012,7 +3001,6 @@ async function setupAlchemyServerDeploy(serverDir, _packageManager) {
 			"alchemy",
 			"wrangler",
 			"@types/node",
-			"@cloudflare/workers-types",
 			"dotenv"
 		],
 		projectDir: serverDir
@@ -3380,6 +3368,17 @@ async function setupTanStackStartAlchemyDeploy(projectDir, _packageManager) {
 			defaultImport: "alchemy"
 		});
 		else alchemyImport.setModuleSpecifier("alchemy/cloudflare/tanstack-start");
+		const reactImport = sourceFile.getImportDeclaration("@vitejs/plugin-react");
+		let reactPluginIdentifier = "viteReact";
+		if (!reactImport) sourceFile.addImportDeclaration({
+			moduleSpecifier: "@vitejs/plugin-react",
+			defaultImport: "viteReact"
+		});
+		else {
+			const defaultImport = reactImport.getDefaultImport();
+			if (defaultImport) reactPluginIdentifier = defaultImport.getText();
+			else reactImport.setDefaultImport("viteReact");
+		}
 		const exportAssignment = sourceFile.getExportAssignment((d) => !d.isExportEquals());
 		if (!exportAssignment) return;
 		const defineConfigCall = exportAssignment.getExpression();
@@ -3403,26 +3402,33 @@ async function setupTanStackStartAlchemyDeploy(projectDir, _packageManager) {
 					const hasShim = initializer.getElements().some((el) => el.getText().includes("alchemy"));
 					if (!hasShim) initializer.addElement("alchemy()");
 					const tanstackElements = initializer.getElements().filter((el) => el.getText().includes("tanstackStart"));
+					let needsReactPlugin = false;
 					tanstackElements.forEach((element) => {
 						if (Node.isCallExpression(element)) {
 							const args = element.getArguments();
-							if (args.length === 0) element.addArgument(`{
+							if (args.length === 0) {
+								element.addArgument(`{
       target: "cloudflare-module",
       customViteReactPlugin: true,
     }`);
-							else if (args.length === 1 && Node.isObjectLiteralExpression(args[0])) {
+								needsReactPlugin = true;
+							} else if (args.length === 1 && Node.isObjectLiteralExpression(args[0])) {
 								const configObj = args[0];
 								if (!configObj.getProperty("target")) configObj.addPropertyAssignment({
 									name: "target",
 									initializer: "\"cloudflare-module\""
 								});
-								if (!configObj.getProperty("customViteReactPlugin")) configObj.addPropertyAssignment({
+								const hasCustomViteReactPlugin = !!configObj.getProperty("customViteReactPlugin");
+								if (!hasCustomViteReactPlugin) configObj.addPropertyAssignment({
 									name: "customViteReactPlugin",
 									initializer: "true"
 								});
+								needsReactPlugin = true;
 							}
 						}
 					});
+					const hasReactPlugin = initializer.getElements().some((el) => Node.isCallExpression(el) && el.getExpression().getText() === reactPluginIdentifier);
+					if (needsReactPlugin && !hasReactPlugin) initializer.addElement(`${reactPluginIdentifier}()`);
 				}
 			} else configObject.addPropertyAssignment({
 				name: "plugins",
@@ -3631,6 +3637,17 @@ async function setupTanstackStartWorkersDeploy(projectDir, packageManager) {
 	if (!await fs.pathExists(viteConfigPath)) return;
 	const sourceFile = tsProject.addSourceFileAtPathIfExists(viteConfigPath);
 	if (!sourceFile) return;
+	const reactImport = sourceFile.getImportDeclaration("@vitejs/plugin-react");
+	let reactPluginIdentifier = "viteReact";
+	if (!reactImport) sourceFile.addImportDeclaration({
+		moduleSpecifier: "@vitejs/plugin-react",
+		defaultImport: "viteReact"
+	});
+	else {
+		const defaultImport = reactImport.getDefaultImport();
+		if (defaultImport) reactPluginIdentifier = defaultImport.getText();
+		else reactImport.setDefaultImport("viteReact");
+	}
 	const defineCall = sourceFile.getDescendantsOfKind(SyntaxKind.CallExpression).find((expr) => {
 		const expression = expr.getExpression();
 		return Node.isIdentifier(expression) && expression.getText() === "defineConfig";
@@ -3640,9 +3657,15 @@ async function setupTanstackStartWorkersDeploy(projectDir, packageManager) {
 	if (!configObj) return;
 	const pluginsArray = ensureArrayProperty(configObj, "plugins");
 	const tanstackPluginIndex = pluginsArray.getElements().findIndex((el) => el.getText().includes("tanstackStart("));
-	const tanstackPluginText = "tanstackStart({ target: \"cloudflare-module\" })";
+	const tanstackPluginText = "tanstackStart({ target: \"cloudflare-module\", customViteReactPlugin: true })";
 	if (tanstackPluginIndex === -1) pluginsArray.addElement(tanstackPluginText);
 	else pluginsArray.getElements()[tanstackPluginIndex].replaceWithText(tanstackPluginText);
+	const hasReactPlugin = pluginsArray.getElements().some((el) => Node.isCallExpression(el) && el.getExpression().getText() === reactPluginIdentifier);
+	if (!hasReactPlugin) {
+		const nextIndex = pluginsArray.getElements().findIndex((el) => el.getText().includes("tanstackStart(")) + 1;
+		if (nextIndex > 0) pluginsArray.insertElement(nextIndex, `${reactPluginIdentifier}()`);
+		else pluginsArray.addElement(`${reactPluginIdentifier}()`);
+	}
 	await tsProject.save();
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "2.35.3",
+  "version": "2.35.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/backend/server/server-base/tsconfig.json.hbs

@@ -8,28 +8,23 @@
     "skipLibCheck": true,
     "baseUrl": "./",
     "paths": {
-      "@/*": ["./src/*"]
-      {{#if (eq orm "prisma")}},
-      "prisma": ["node_modules/prisma"]
-      {{/if}}
+      "@/*": ["./src/*"]{{#if (eq orm "prisma")}},
+      "prisma": ["node_modules/prisma"]{{/if}}
     },
     "outDir": "./dist",
     "types": [
       {{#if (eq runtime "node")}}
-      "node"
+        "node"
       {{else if (eq runtime "bun")}}
-      "bun"
+        "bun"
       {{else if (eq runtime "workers")}}
-      "@cloudflare/workers-types",
-      "node"
+        "node"
       {{else}}
-      "node",
-      "bun"
+        "node",
+        "bun"
       {{/if}}
-    ],
-    {{#unless (or (eq backend "convex") (eq backend "none"))}}
-    "composite": true,
-    {{/unless}}
+    ]{{#unless (or (eq backend "convex") (eq backend "none"))}},
+    "composite": true{{/unless}},
     "jsx": "react-jsx"{{#if (eq backend "hono")}},
     "jsxImportSource": "hono/jsx"{{/if}}
   }

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

@@ -35,7 +35,7 @@
     "@testing-library/react": "^16.2.0",
     "@types/react": "^19.0.12",
     "@types/react-dom": "^19.0.4",
-    "@vitejs/plugin-react": "^4.5.2",
+    "@vitejs/plugin-react": "^5.0.1",
     "jsdom": "^26.0.0",
     "typescript": "^5.7.2",
     "vite": "^7.0.2",

package/templates/frontend/react/tanstack-start/{vite.config.ts → vite.config.ts.hbs}

@@ -2,7 +2,13 @@ import { defineConfig } from "vite";
 import tsconfigPaths from "vite-tsconfig-paths";
 import { tanstackStart } from "@tanstack/react-start/plugin/vite";
 import tailwindcss from "@tailwindcss/vite";
+import viteReact from "@vitejs/plugin-react";
 
 export default defineConfig({
-  plugins: [tsconfigPaths(), tailwindcss(), tanstackStart({})],
+  plugins: [
+    tsconfigPaths(),
+    tailwindcss(),
+    tanstackStart({ customViteReactPlugin: true }),
+    viteReact(),
+  ],
 });