feat(cli): upgrade to tanstack start rc with workers / alchemy support

Author: AmanVarshney01

apps/cli/src/constants.ts

@@ -45,7 +45,7 @@ export const dependencyVersionMap = {
 
 	"@clerk/nextjs": "^6.31.5",
 	"@clerk/clerk-react": "^5.45.0",
-	"@clerk/tanstack-react-start": "^0.23.1",
+	"@clerk/tanstack-react-start": "^0.25.1",
 	"@clerk/clerk-expo": "^2.14.25",
 
 	"drizzle-orm": "^0.44.2",
@@ -146,14 +146,14 @@ export const dependencyVersionMap = {
 	"@tanstack/solid-query-devtools": "^5.87.4",
 	"@tanstack/solid-router-devtools": "^1.131.44",
 
-	wrangler: "^4.23.0",
-	"@cloudflare/vite-plugin": "^1.9.0",
+	wrangler: "^4.40.3",
+	"@cloudflare/vite-plugin": "^1.13.8",
 	"@opennextjs/cloudflare": "^1.6.5",
 	"nitro-cloudflare-dev": "^0.2.2",
 	"@sveltejs/adapter-cloudflare": "^7.2.1",
 	"@cloudflare/workers-types": "^4.20250822.0",
 
-	alchemy: "^0.67.0",
+	alchemy: "^0.70.0",
 	// temporary workaround for alchemy + tanstack start
 	nitropack: "^2.12.4",
 

apps/cli/src/helpers/deployment/alchemy/alchemy-tanstack-start-setup.ts

@@ -13,7 +13,7 @@ export async function setupTanStackStartAlchemyDeploy(
 	if (!(await fs.pathExists(webAppDir))) return;
 
 	await addPackageDependency({
-		devDependencies: ["alchemy", "nitropack", "dotenv"],
+		devDependencies: ["alchemy", "dotenv", "@cloudflare/vite-plugin"],
 		projectDir: webAppDir,
 	});
 
@@ -57,24 +57,6 @@ export async function setupTanStackStartAlchemyDeploy(
 				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(),
 			);
@@ -93,78 +75,16 @@ export async function setupTanStackStartAlchemyDeploy(
 			}
 
 			if (Node.isObjectLiteralExpression(configObject)) {
-				if (!configObject.getProperty("build")) {
-					configObject.addPropertyAssignment({
-						name: "build",
-						initializer: `{
-    target: "esnext",
-    rollupOptions: {
-      external: ["node:async_hooks", "cloudflare:workers"],
-    },
-  }`,
-					});
-				}
-
 				const pluginsProperty = configObject.getProperty("plugins");
 				if (pluginsProperty && Node.isPropertyAssignment(pluginsProperty)) {
 					const initializer = pluginsProperty.getInitializer();
 					if (Node.isArrayLiteralExpression(initializer)) {
-						const hasShim = initializer
+						const hasAlchemy = initializer
 							.getElements()
-							.some((el) => el.getText().includes("alchemy"));
-						if (!hasShim) {
+							.some((el) => el.getText().includes("alchemy("));
+						if (!hasAlchemy) {
 							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(`{
-      target: "cloudflare-module",
-      customViteReactPlugin: true,
-    }`);
-									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"',
-										});
-									}
-									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({
@@ -179,18 +99,4 @@ export async function setupTanStackStartAlchemyDeploy(
 			console.warn("Failed to update vite.config.ts:", error);
 		}
 	}
-
-	// workaround for tanstack start + workers
-	const nitroConfigPath = path.join(webAppDir, "nitro.config.ts");
-	const nitroConfigContent = `import { defineNitroConfig } from "nitropack/config";
-
-export default defineNitroConfig({
-    preset: "cloudflare-module",
-    cloudflare: {
-        nodeCompat: true,
-    },
-});
-`;
-
-	await fs.writeFile(nitroConfigPath, nitroConfigContent, "utf-8");
 }

apps/cli/src/helpers/deployment/workers/workers-tanstack-start-setup.ts

@@ -18,7 +18,7 @@ export async function setupTanstackStartWorkersDeploy(
 	if (!(await fs.pathExists(webAppDir))) return;
 
 	await addPackageDependency({
-		devDependencies: ["wrangler"],
+		devDependencies: ["wrangler", "@cloudflare/vite-plugin"],
 		projectDir: webAppDir,
 	});
 
@@ -39,6 +39,18 @@ export async function setupTanstackStartWorkersDeploy(
 	const sourceFile = tsProject.addSourceFileAtPathIfExists(viteConfigPath);
 	if (!sourceFile) return;
 
+	const cfImport = sourceFile.getImportDeclaration("@cloudflare/vite-plugin");
+	if (!cfImport) {
+		sourceFile.addImportDeclaration({
+			moduleSpecifier: "@cloudflare/vite-plugin",
+			namedImports: [{ name: "cloudflare" }],
+		});
+	} else if (
+		!cfImport.getNamedImports().some((ni) => ni.getName() === "cloudflare")
+	) {
+		cfImport.addNamedImport({ name: "cloudflare" });
+	}
+
 	const reactImport = sourceFile.getImportDeclaration("@vitejs/plugin-react");
 	let reactPluginIdentifier = "viteReact";
 	if (!reactImport) {
@@ -73,19 +85,14 @@ export async function setupTanstackStartWorkersDeploy(
 
 	const pluginsArray = ensureArrayProperty(configObj, "plugins");
 
-	const tanstackPluginIndex = pluginsArray
+	const hasCloudflare = pluginsArray
 		.getElements()
-		.findIndex((el) => el.getText().includes("tanstackStart("));
-
-	const tanstackPluginText =
-		'tanstackStart({ target: "cloudflare-module", customViteReactPlugin: true })';
-
-	if (tanstackPluginIndex === -1) {
-		pluginsArray.addElement(tanstackPluginText);
-	} else {
-		pluginsArray
-			.getElements()
-			[tanstackPluginIndex].replaceWithText(tanstackPluginText);
+		.some((el) => el.getText().includes("cloudflare("));
+	if (!hasCloudflare) {
+		pluginsArray.insertElement(
+			0,
+			"cloudflare({ viteEnvironment: { name: 'ssr' } })",
+		);
 	}
 
 	const hasReactPlugin = pluginsArray

apps/cli/templates/auth/clerk/convex/web/react/tanstack-start/src/server.ts.hbs

@@ -6,6 +6,7 @@ import {
 } from "@tanstack/react-start/server";
 import { createRouter } from "./router";
 
+// this is broken right now, waiting for a fix
 const handlerFactory = createClerkHandler(
 	createStartHandler({
 		createRouter,

apps/cli/templates/deploy/wrangler/web/react/tanstack-start/wrangler.jsonc.hbs

@@ -1,7 +1,7 @@
 {
     "$schema": "./node_modules/wrangler/config-schema.json",
     "name": "{{projectName}}",
-    "main": ".output/server/index.mjs",
+    "main": "@tanstack/react-start/server-entry",
     "compatibility_date": "2025-07-05",
     "compatibility_flags": ["nodejs_compat"],
     "assets": {

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

@@ -9,13 +9,13 @@
   },
   "dependencies": {
     "radix-ui": "^1.4.2",
-    "@tanstack/react-form": "^1.0.5",
+    "@tanstack/react-form": "^1.23.5",
     "@tailwindcss/vite": "^4.1.8",
     "@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",
+    "@tanstack/react-router": "^1.132.31",
+    "@tanstack/react-router-with-query": "^1.130.17",
+    "@tanstack/react-start": "^1.132.31",
+    "@tanstack/router-plugin": "^1.132.31",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^0.525.0",
@@ -30,12 +30,12 @@
     "zod": "^4.0.2"
   },
   "devDependencies": {
-    "@tanstack/react-router-devtools": "^1.121.0-alpha.27",
+    "@tanstack/react-router-devtools": "^1.132.31",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/react": "^16.2.0",
     "@types/react": "~19.1.10",
     "@types/react-dom": "^19.0.4",
-    "@vitejs/plugin-react": "^5.0.1",
+    "@vitejs/plugin-react": "^5.0.4",
     "jsdom": "^26.0.0",
     "typescript": "^5.7.2",
     "vite": "^7.0.2",

apps/cli/templates/frontend/react/tanstack-start/src/routes/__root.tsx.hbs

@@ -30,24 +30,24 @@ import Loader from "@/components/loader";
 import { ClerkProvider, useAuth } from "@clerk/tanstack-react-start";
 import { getAuth } from "@clerk/tanstack-react-start/server";
 import { createServerFn } from "@tanstack/react-start";
-import { getWebRequest } from "@tanstack/react-start/server";
+import { getRequest } from "@tanstack/react-start/server";
 import { ConvexProviderWithClerk } from "convex/react-clerk";
 
 const fetchClerkAuth = createServerFn({ method: "GET" }).handler(async () => {
-  const auth = await getAuth(getWebRequest());
+  const auth = await getAuth(getRequest());
   const token = await auth.getToken({ template: "convex" });
   return { userId: auth.userId, token };
 });
 {{else if (and (eq backend "convex") (eq auth "better-auth"))}}
 import { createServerFn } from "@tanstack/react-start";
-import { getWebRequest, getCookie } from "@tanstack/react-start/server";
+import { getRequest, getCookie } from "@tanstack/react-start/server";
 import { ConvexBetterAuthProvider } from "@convex-dev/better-auth/react";
 import { fetchSession, getCookieName } from "@convex-dev/better-auth/react-start";
 import { authClient } from "@/lib/auth-client";
 import { createAuth } from "@{{projectName}}/backend/convex/auth";
 
 const fetchAuth = createServerFn({ method: "GET" }).handler(async () => {
-  const { session } = await fetchSession(getWebRequest());
+  const { session } = await fetchSession(getRequest());
   const sessionCookieName = getCookieName(createAuth);
   const token = getCookie(sessionCookieName);
   return {

apps/cli/templates/frontend/react/tanstack-start/vite.config.ts.hbs

@@ -8,7 +8,7 @@ export default defineConfig({
   plugins: [
     tsconfigPaths(),
     tailwindcss(),
-    tanstackStart({ customViteReactPlugin: true }),
+    tanstackStart(),
     viteReact(),
   ],
 });