create-better-t-stack 2.22.9 → 2.23.0

package/dist/index.js

@@ -11,6 +11,7 @@ import { PostHog } from "posthog-node";
 import gradient from "gradient-string";
 import * as JSONC from "jsonc-parser";
 import { $, execa } from "execa";
+import { IndentationText, Node, Project, QuoteKind, SyntaxKind } from "ts-morph";
 import { globby } from "globby";
 import handlebars from "handlebars";
 import os from "node:os";
@@ -44,7 +45,8 @@ const DEFAULT_CONFIG = {
 	dbSetup: "none",
 	backend: "hono",
 	runtime: "bun",
-	api: "trpc"
+	api: "trpc",
+	webDeploy: "none"
 };
 const dependencyVersionMap = {
 	"better-auth": "^1.2.10",
@@ -59,8 +61,8 @@ const dependencyVersionMap = {
 	"@prisma/client": "^6.9.0",
 	prisma: "^6.9.0",
 	mongoose: "^8.14.0",
-	"vite-plugin-pwa": "^0.21.2",
-	"@vite-pwa/assets-generator": "^0.2.6",
+	"vite-plugin-pwa": "^1.0.1",
+	"@vite-pwa/assets-generator": "^1.0.0",
 	"@tauri-apps/cli": "^2.4.0",
 	"@biomejs/biome": "^2.0.0",
 	husky: "^9.1.7",
@@ -102,13 +104,18 @@ const dependencyVersionMap = {
 	"@tanstack/react-query": "^5.80.5",
 	"@tanstack/solid-query": "^5.75.0",
 	"@tanstack/solid-query-devtools": "^5.75.0",
-	wrangler: "^4.20.0"
+	wrangler: "^4.23.0",
+	"@cloudflare/vite-plugin": "^1.9.0",
+	"@opennextjs/cloudflare": "^1.3.0",
+	"nitro-cloudflare-dev": "^0.2.2",
+	"@sveltejs/adapter-cloudflare": "^7.0.4"
 };
 const ADDON_COMPATIBILITY = {
 	pwa: [
 		"tanstack-router",
 		"react-router",
-		"solid"
+		"solid",
+		"next"
 	],
 	tauri: [
 		"tanstack-router",
@@ -211,6 +218,7 @@ const ProjectNameSchema = z.string().min(1, "Project name cannot be empty").max(
 	];
 	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");
+const WebDeploySchema = z.enum(["workers", "none"]).describe("Web deployment");
 
 //#endregion
 //#region src/utils/addon-compatibility.ts
@@ -318,7 +326,7 @@ async function getAddonsToAdd(frontend, existingAddons = []) {
 	const response = await multiselect({
 		message: "Select addons",
 		options,
-		required: true
+		required: false
 	});
 	if (isCancel(response)) {
 		cancel(pc.red("Operation cancelled"));
@@ -809,7 +817,7 @@ async function getRuntimeChoice(runtime, backend) {
 	}];
 	if (backend === "hono") runtimeOptions.push({
 		value: "workers",
-		label: "Cloudflare Workers (beta)",
+		label: "Cloudflare Workers",
 		hint: "Edge runtime on Cloudflare's global network"
 	});
 	const response = await select({
@@ -824,6 +832,79 @@ async function getRuntimeChoice(runtime, backend) {
 	return response;
 }
 
+//#endregion
+//#region src/prompts/web-deploy.ts
+const WORKERS_COMPATIBLE_FRONTENDS = [
+	"tanstack-router",
+	"react-router",
+	"solid",
+	"next",
+	"nuxt",
+	"svelte"
+];
+function getDeploymentDisplay(deployment) {
+	if (deployment === "workers") return {
+		label: "Cloudflare Workers",
+		hint: "Deploy to Cloudflare Workers using Wrangler"
+	};
+	return {
+		label: deployment,
+		hint: `Add ${deployment} deployment`
+	};
+}
+async function getDeploymentChoice(deployment, _runtime, _backend, frontend = []) {
+	if (deployment !== void 0) return deployment;
+	const hasCompatibleFrontend = frontend.some((f) => WORKERS_COMPATIBLE_FRONTENDS.includes(f));
+	if (!hasCompatibleFrontend) return "none";
+	const options = [{
+		value: "workers",
+		label: "Cloudflare Workers",
+		hint: "Deploy to Cloudflare Workers using Wrangler"
+	}, {
+		value: "none",
+		label: "None",
+		hint: "Manual setup"
+	}];
+	const response = await select({
+		message: "Select web deployment",
+		options,
+		initialValue: DEFAULT_CONFIG.webDeploy
+	});
+	if (isCancel(response)) {
+		cancel(pc.red("Operation cancelled"));
+		process.exit(0);
+	}
+	return response;
+}
+async function getDeploymentToAdd(frontend, existingDeployment) {
+	const options = [];
+	if (frontend.some((f) => WORKERS_COMPATIBLE_FRONTENDS.includes(f)) && existingDeployment !== "workers") {
+		const { label, hint } = getDeploymentDisplay("workers");
+		options.push({
+			value: "workers",
+			label,
+			hint
+		});
+	}
+	if (existingDeployment && existingDeployment !== "none") return "none";
+	if (options.length > 0) options.push({
+		value: "none",
+		label: "None",
+		hint: "Skip deployment setup"
+	});
+	if (options.length === 0) return "none";
+	const response = await select({
+		message: "Select web deployment",
+		options,
+		initialValue: DEFAULT_CONFIG.webDeploy
+	});
+	if (isCancel(response)) {
+		cancel(pc.red("Operation cancelled"));
+		process.exit(0);
+	}
+	return response;
+}
+
 //#endregion
 //#region src/prompts/config-prompts.ts
 async function gatherConfig(flags, projectName, projectDir, relativePath) {
@@ -838,6 +919,7 @@ async function gatherConfig(flags, projectName, projectDir, relativePath) {
 		addons: ({ results }) => getAddonsChoice(flags.addons, results.frontend),
 		examples: ({ results }) => getExamplesChoice(flags.examples, results.database, results.frontend, results.backend, results.api),
 		dbSetup: ({ results }) => getDBSetupChoice(results.database ?? "none", flags.dbSetup, results.orm, results.backend, results.runtime),
+		webDeploy: ({ results }) => getDeploymentChoice(flags.webDeploy, results.runtime, results.backend, results.frontend),
 		git: () => getGitChoice(flags.git),
 		packageManager: () => getPackageManagerChoice(flags.packageManager),
 		install: () => getinstallChoice(flags.install)
@@ -853,6 +935,7 @@ async function gatherConfig(flags, projectName, projectDir, relativePath) {
 		result.auth = false;
 		result.dbSetup = "none";
 		result.examples = ["todo"];
+		result.webDeploy = "none";
 	}
 	if (result.backend === "none") {
 		result.runtime = "none";
@@ -862,6 +945,7 @@ async function gatherConfig(flags, projectName, projectDir, relativePath) {
 		result.auth = false;
 		result.dbSetup = "none";
 		result.examples = [];
+		result.webDeploy = "none";
 	}
 	return {
 		projectName,
@@ -879,7 +963,8 @@ async function gatherConfig(flags, projectName, projectDir, relativePath) {
 		packageManager: result.packageManager,
 		install: result.install,
 		dbSetup: result.dbSetup,
-		api: result.api
+		api: result.api,
+		webDeploy: result.webDeploy
 	};
 }
 
@@ -1013,6 +1098,7 @@ function displayConfig(config) {
 		configDisplay.push(`${pc.blue("Install Dependencies:")} ${installText}`);
 	}
 	if (config.dbSetup !== void 0) configDisplay.push(`${pc.blue("Database Setup:")} ${String(config.dbSetup)}`);
+	if (config.webDeploy !== void 0) configDisplay.push(`${pc.blue("Web Deployment:")} ${String(config.webDeploy)}`);
 	if (configDisplay.length === 0) return pc.yellow("No configuration selected.");
 	return configDisplay.join("\n");
 }
@@ -1034,6 +1120,7 @@ function generateReproducibleCommand(config) {
 	if (config.examples && config.examples.length > 0) flags.push(`--examples ${config.examples.join(" ")}`);
 	else flags.push("--examples none");
 	flags.push(`--db-setup ${config.dbSetup}`);
+	flags.push(`--web-deploy ${config.webDeploy}`);
 	flags.push(config.git ? "--git" : "--no-git");
 	flags.push(`--package-manager ${config.packageManager}`);
 	flags.push(config.install ? "--install" : "--no-install");
@@ -1210,6 +1297,7 @@ 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 (options.webDeploy) config.webDeploy = options.webDeploy;
 	if (projectName) {
 		const result = ProjectNameSchema.safeParse(path.basename(projectName));
 		if (!result.success) {
@@ -1395,6 +1483,13 @@ function processAndValidateFlags(options, providedFlags, projectName) {
 		consola$1.fatal("MongoDB database is not compatible with Cloudflare Workers runtime. MongoDB requires Prisma or Mongoose ORM, but Workers runtime only supports Drizzle ORM. Please use a different database or runtime.");
 		process.exit(1);
 	}
+	if (config.webDeploy === "workers" && config.frontend && config.frontend.length > 0) {
+		const incompatibleFrontends = config.frontend.filter((f) => f === "tanstack-start");
+		if (incompatibleFrontends.length > 0) {
+			consola$1.fatal(`The following frontends are not compatible with '--web-deploy workers': ${incompatibleFrontends.join(", ")}. Please choose a different frontend or remove '--web-deploy workers'.`);
+			process.exit(1);
+		}
+	}
 	return config;
 }
 function getProvidedFlags(options) {
@@ -1418,7 +1513,8 @@ async function writeBtsConfig(projectConfig) {
 		auth: projectConfig.auth,
 		packageManager: projectConfig.packageManager,
 		dbSetup: projectConfig.dbSetup,
-		api: projectConfig.api
+		api: projectConfig.api,
+		webDeploy: projectConfig.webDeploy
 	};
 	const baseContent = {
 		$schema: "https://better-t-stack.dev/schema.json",
@@ -1434,7 +1530,8 @@ async function writeBtsConfig(projectConfig) {
 		auth: btsConfig.auth,
 		packageManager: btsConfig.packageManager,
 		dbSetup: btsConfig.dbSetup,
-		api: btsConfig.api
+		api: btsConfig.api,
+		webDeploy: btsConfig.webDeploy
 	};
 	let configContent = JSON.stringify(baseContent);
 	const formatResult = JSONC.format(configContent, void 0, {
@@ -1614,6 +1711,57 @@ async function setupTauri(config) {
 	}
 }
 
+//#endregion
+//#region src/utils/ts-morph.ts
+const tsProject = new Project({
+	useInMemoryFileSystem: false,
+	skipAddingFilesFromTsConfig: true,
+	manipulationSettings: {
+		quoteKind: QuoteKind.Single,
+		indentationText: IndentationText.TwoSpaces
+	}
+});
+function ensureArrayProperty(obj, name) {
+	return obj.getProperty(name)?.getFirstDescendantByKind(SyntaxKind.ArrayLiteralExpression) ?? obj.addPropertyAssignment({
+		name,
+		initializer: "[]"
+	}).getFirstDescendantByKindOrThrow(SyntaxKind.ArrayLiteralExpression);
+}
+
+//#endregion
+//#region src/helpers/setup/vite-pwa-setup.ts
+async function addPwaToViteConfig(viteConfigPath, projectName) {
+	const sourceFile = tsProject.addSourceFileAtPathIfExists(viteConfigPath);
+	if (!sourceFile) throw new Error("vite config not found");
+	const hasImport = sourceFile.getImportDeclarations().some((imp) => imp.getModuleSpecifierValue() === "vite-plugin-pwa");
+	if (!hasImport) sourceFile.insertImportDeclaration(0, {
+		namedImports: ["VitePWA"],
+		moduleSpecifier: "vite-plugin-pwa"
+	});
+	const defineCall = sourceFile.getDescendantsOfKind(SyntaxKind.CallExpression).find((expr) => {
+		const expression = expr.getExpression();
+		return Node.isIdentifier(expression) && expression.getText() === "defineConfig";
+	});
+	if (!defineCall) throw new Error("Could not find defineConfig call in vite config");
+	const callExpr = defineCall;
+	const configObject = callExpr.getArguments()[0];
+	if (!configObject) throw new Error("defineConfig argument is not an object literal");
+	const pluginsArray = ensureArrayProperty(configObject, "plugins");
+	const alreadyPresent = pluginsArray.getElements().some((el) => el.getText().startsWith("VitePWA("));
+	if (!alreadyPresent) pluginsArray.addElement(`VitePWA({
+  registerType: "autoUpdate",
+  manifest: {
+    name: "${projectName}",
+    short_name: "${projectName}",
+    description: "${projectName} - PWA Application",
+    theme_color: "#0c0c0c",
+  },
+  pwaAssets: { disabled: false, config: true },
+  devOptions: { enabled: true },
+})`);
+	await tsProject.save();
+}
+
 //#endregion
 //#region src/helpers/setup/addons-setup.ts
 async function setupAddons(config, isAddCommand = false) {
@@ -1706,6 +1854,8 @@ async function setupPwa(projectDir, frontends) {
 		};
 		await fs.writeJson(clientPackageJsonPath, packageJson, { spaces: 2 });
 	}
+	const viteConfigTs = path.join(clientPackageDir, "vite.config.ts");
+	if (await fs.pathExists(viteConfigTs)) await addPwaToViteConfig(viteConfigTs, path.basename(projectDir));
 }
 
 //#endregion
@@ -1726,7 +1876,8 @@ async function detectProjectConfig(projectDir) {
 			auth: btsConfig.auth,
 			packageManager: btsConfig.packageManager,
 			dbSetup: btsConfig.dbSetup,
-			api: btsConfig.api
+			api: btsConfig.api,
+			webDeploy: btsConfig.webDeploy
 		};
 		return null;
 	} catch (_error) {
@@ -2124,10 +2275,30 @@ async function handleExtras(projectDir, context) {
 		if (await fs.pathExists(runtimeWorkersDir)) await processAndCopyFiles("**/*", runtimeWorkersDir, projectDir, context, false);
 	}
 }
+async function setupDeploymentTemplates(projectDir, context) {
+	if (context.webDeploy === "none") return;
+	if (context.webDeploy === "workers") {
+		const webAppDir = path.join(projectDir, "apps/web");
+		if (!await fs.pathExists(webAppDir)) return;
+		const frontends = context.frontend;
+		const templateMap = {
+			"tanstack-router": "react/tanstack-router",
+			"react-router": "react/react-router",
+			solid: "solid",
+			next: "react/next",
+			nuxt: "nuxt",
+			svelte: "svelte"
+		};
+		for (const f of frontends) if (templateMap[f]) {
+			const deployTemplateSrc = path.join(PKG_ROOT, `templates/deploy/web/${templateMap[f]}`);
+			if (await fs.pathExists(deployTemplateSrc)) await processAndCopyFiles("**/*", deployTemplateSrc, webAppDir, context);
+		}
+	}
+}
 
 //#endregion
 //#region src/helpers/project-generation/add-addons.ts
-function exitWithError(message) {
+function exitWithError$1(message) {
 	cancel(pc.red(message));
 	process.exit(1);
 }
@@ -2135,9 +2306,9 @@ async function addAddonsToProject(input) {
 	try {
 		const projectDir = input.projectDir || process.cwd();
 		const isBetterTStack = await isBetterTStackProject(projectDir);
-		if (!isBetterTStack) exitWithError("This doesn't appear to be a Better-T Stack project. Please run this command from the root of a Better-T Stack project.");
+		if (!isBetterTStack) exitWithError$1("This doesn't appear to be a Better-T Stack project. Please run this command from the root of a Better-T Stack project.");
 		const detectedConfig = await detectProjectConfig(projectDir);
-		if (!detectedConfig) exitWithError("Could not detect the project configuration. Please ensure this is a valid Better-T Stack project.");
+		if (!detectedConfig) exitWithError$1("Could not detect the project configuration. Please ensure this is a valid Better-T Stack project.");
 		const config = {
 			projectName: detectedConfig.projectName || path.basename(projectDir),
 			projectDir,
@@ -2154,11 +2325,12 @@ async function addAddonsToProject(input) {
 			packageManager: input.packageManager || detectedConfig.packageManager || "npm",
 			install: input.install || false,
 			dbSetup: detectedConfig.dbSetup || "none",
-			api: detectedConfig.api || "none"
+			api: detectedConfig.api || "none",
+			webDeploy: detectedConfig.webDeploy || "none"
 		};
 		for (const addon of input.addons) {
 			const { isCompatible, reason } = validateAddonCompatibility(addon, config.frontend);
-			if (!isCompatible) exitWithError(reason || `${addon} addon is not compatible with current frontend configuration`);
+			if (!isCompatible) exitWithError$1(reason || `${addon} addon is not compatible with current frontend configuration`);
 		}
 		log.info(pc.green(`Adding ${input.addons.join(", ")} to ${config.frontend.join("/")}`));
 		await setupAddonsTemplate(projectDir, config);
@@ -2170,10 +2342,256 @@ async function addAddonsToProject(input) {
 			projectDir,
 			packageManager: config.packageManager
 		});
-		else log.info(pc.yellow(`Run ${pc.bold(`${config.packageManager} install`)} to install dependencies`));
+		else if (!input.suppressInstallMessage) log.info(pc.yellow(`Run ${pc.bold(`${config.packageManager} install`)} to install dependencies`));
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		exitWithError$1(`Error adding addons: ${message}`);
+	}
+}
+
+//#endregion
+//#region src/helpers/setup/workers-nuxt-setup.ts
+async function setupNuxtWorkersDeploy(projectDir, packageManager) {
+	const webAppDir = path.join(projectDir, "apps/web");
+	if (!await fs.pathExists(webAppDir)) return;
+	await addPackageDependency({
+		devDependencies: ["nitro-cloudflare-dev", "wrangler"],
+		projectDir: webAppDir
+	});
+	const pkgPath = path.join(webAppDir, "package.json");
+	if (await fs.pathExists(pkgPath)) {
+		const pkg = await fs.readJson(pkgPath);
+		pkg.scripts = {
+			...pkg.scripts,
+			deploy: `${packageManager} run build && wrangler deploy`,
+			"cf-typegen": "wrangler types"
+		};
+		await fs.writeJson(pkgPath, pkg, { spaces: 2 });
+	}
+	const nuxtConfigPath = path.join(webAppDir, "nuxt.config.ts");
+	if (!await fs.pathExists(nuxtConfigPath)) return;
+	const sourceFile = tsProject.addSourceFileAtPathIfExists(nuxtConfigPath);
+	if (!sourceFile) return;
+	const defineCall = sourceFile.getDescendantsOfKind(SyntaxKind.CallExpression).find((expr) => {
+		const expression = expr.getExpression();
+		return Node.isIdentifier(expression) && expression.getText() === "defineNuxtConfig";
+	});
+	if (!defineCall) return;
+	const configObj = defineCall.getArguments()[0];
+	if (!configObj) return;
+	const today = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
+	const compatProp = configObj.getProperty("compatibilityDate");
+	if (compatProp && compatProp.getKind() === SyntaxKind.PropertyAssignment) compatProp.setInitializer(`'${today}'`);
+	else configObj.addPropertyAssignment({
+		name: "compatibilityDate",
+		initializer: `'${today}'`
+	});
+	const nitroInitializer = `{
+    preset: "cloudflare_module",
+    cloudflare: {
+      deployConfig: true,
+      nodeCompat: true
+    }
+  }`;
+	const nitroProp = configObj.getProperty("nitro");
+	if (nitroProp && nitroProp.getKind() === SyntaxKind.PropertyAssignment) nitroProp.setInitializer(nitroInitializer);
+	else configObj.addPropertyAssignment({
+		name: "nitro",
+		initializer: nitroInitializer
+	});
+	const modulesProp = configObj.getProperty("modules");
+	if (modulesProp && modulesProp.getKind() === SyntaxKind.PropertyAssignment) {
+		const arrayExpr = modulesProp.getFirstDescendantByKind(SyntaxKind.ArrayLiteralExpression);
+		if (arrayExpr) {
+			const alreadyHas = arrayExpr.getElements().some((el) => el.getText().replace(/['"`]/g, "") === "nitro-cloudflare-dev");
+			if (!alreadyHas) arrayExpr.addElement("'nitro-cloudflare-dev'");
+		}
+	} else configObj.addPropertyAssignment({
+		name: "modules",
+		initializer: "['nitro-cloudflare-dev']"
+	});
+	await tsProject.save();
+}
+
+//#endregion
+//#region src/helpers/setup/workers-svelte-setup.ts
+async function setupSvelteWorkersDeploy(projectDir, packageManager) {
+	const webAppDir = path.join(projectDir, "apps/web");
+	if (!await fs.pathExists(webAppDir)) return;
+	await addPackageDependency({
+		devDependencies: ["@sveltejs/adapter-cloudflare", "wrangler"],
+		projectDir: webAppDir
+	});
+	const pkgPath = path.join(webAppDir, "package.json");
+	if (await fs.pathExists(pkgPath)) {
+		const pkg = await fs.readJson(pkgPath);
+		pkg.scripts = {
+			...pkg.scripts,
+			deploy: `${packageManager} run build && wrangler deploy`,
+			"cf-typegen": "wrangler types ./src/worker-configuration.d.ts"
+		};
+		await fs.writeJson(pkgPath, pkg, { spaces: 2 });
+	}
+	const possibleConfigFiles = [path.join(webAppDir, "svelte.config.js"), path.join(webAppDir, "svelte.config.ts")];
+	const existingConfigPath = (await Promise.all(possibleConfigFiles.map(async (p) => await fs.pathExists(p) ? p : ""))).find((p) => p);
+	if (existingConfigPath) {
+		const sourceFile = tsProject.addSourceFileAtPathIfExists(existingConfigPath);
+		if (!sourceFile) return;
+		const adapterImport = sourceFile.getImportDeclarations().find((imp) => ["@sveltejs/adapter-auto", "@sveltejs/adapter-node"].includes(imp.getModuleSpecifierValue()));
+		if (adapterImport) adapterImport.setModuleSpecifier("@sveltejs/adapter-cloudflare");
+		else {
+			const alreadyHasCloudflare = sourceFile.getImportDeclarations().some((imp) => imp.getModuleSpecifierValue() === "@sveltejs/adapter-cloudflare");
+			if (!alreadyHasCloudflare) sourceFile.insertImportDeclaration(0, {
+				defaultImport: "adapter",
+				moduleSpecifier: "@sveltejs/adapter-cloudflare"
+			});
+		}
+		await tsProject.save();
+	}
+}
+
+//#endregion
+//#region src/helpers/setup/workers-vite-setup.ts
+async function setupWorkersVitePlugin(projectDir) {
+	const webAppDir = path.join(projectDir, "apps/web");
+	const viteConfigPath = path.join(webAppDir, "vite.config.ts");
+	if (!await fs.pathExists(viteConfigPath)) throw new Error("vite.config.ts not found in web app directory");
+	await addPackageDependency({
+		devDependencies: ["@cloudflare/vite-plugin", "wrangler"],
+		projectDir: webAppDir
+	});
+	const sourceFile = tsProject.addSourceFileAtPathIfExists(viteConfigPath);
+	if (!sourceFile) throw new Error("vite.config.ts not found in web app directory");
+	const hasCloudflareImport = sourceFile.getImportDeclarations().some((imp) => imp.getModuleSpecifierValue() === "@cloudflare/vite-plugin");
+	if (!hasCloudflareImport) sourceFile.insertImportDeclaration(0, {
+		namedImports: ["cloudflare"],
+		moduleSpecifier: "@cloudflare/vite-plugin"
+	});
+	const defineCall = sourceFile.getDescendantsOfKind(SyntaxKind.CallExpression).find((expr) => {
+		const expression = expr.getExpression();
+		return Node.isIdentifier(expression) && expression.getText() === "defineConfig";
+	});
+	if (!defineCall) throw new Error("Could not find defineConfig call in vite config");
+	const callExpr = defineCall;
+	const configObject = callExpr.getArguments()[0];
+	if (!configObject) throw new Error("defineConfig argument is not an object literal");
+	const pluginsArray = ensureArrayProperty(configObject, "plugins");
+	const hasCloudflarePlugin = pluginsArray.getElements().some((el) => el.getText().includes("cloudflare("));
+	if (!hasCloudflarePlugin) pluginsArray.addElement("cloudflare()");
+	await tsProject.save();
+}
+
+//#endregion
+//#region src/helpers/setup/web-deploy-setup.ts
+async function setupWebDeploy(config) {
+	const { webDeploy, frontend, projectDir } = config;
+	const { packageManager } = config;
+	if (webDeploy === "none") return;
+	if (webDeploy !== "workers") return;
+	const isNext = frontend.includes("next");
+	const isNuxt = frontend.includes("nuxt");
+	const isSvelte = frontend.includes("svelte");
+	const isTanstackRouter = frontend.includes("tanstack-router");
+	const isReactRouter = frontend.includes("react-router");
+	const isSolid = frontend.includes("solid");
+	if (isNext) await setupNextWorkersDeploy(projectDir, packageManager);
+	else if (isNuxt) await setupNuxtWorkersDeploy(projectDir, packageManager);
+	else if (isSvelte) await setupSvelteWorkersDeploy(projectDir, packageManager);
+	else if (isTanstackRouter || isReactRouter || isSolid) await setupWorkersWebDeploy(projectDir, packageManager);
+}
+async function setupWorkersWebDeploy(projectDir, pkgManager) {
+	const webAppDir = path.join(projectDir, "apps/web");
+	if (!await fs.pathExists(webAppDir)) return;
+	const packageJsonPath = path.join(webAppDir, "package.json");
+	if (await fs.pathExists(packageJsonPath)) {
+		const packageJson = await fs.readJson(packageJsonPath);
+		packageJson.scripts = {
+			...packageJson.scripts,
+			"wrangler:dev": "wrangler dev --port=3001",
+			deploy: `${pkgManager} run build && wrangler deploy`
+		};
+		await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 });
+	}
+	await setupWorkersVitePlugin(projectDir);
+}
+async function setupNextWorkersDeploy(projectDir, _packageManager) {
+	const webAppDir = path.join(projectDir, "apps/web");
+	if (!await fs.pathExists(webAppDir)) return;
+	await addPackageDependency({
+		dependencies: ["@opennextjs/cloudflare"],
+		devDependencies: ["wrangler"],
+		projectDir: webAppDir
+	});
+	const packageJsonPath = path.join(webAppDir, "package.json");
+	if (await fs.pathExists(packageJsonPath)) {
+		const pkg = await fs.readJson(packageJsonPath);
+		pkg.scripts = {
+			...pkg.scripts,
+			preview: "opennextjs-cloudflare build && opennextjs-cloudflare preview",
+			deploy: "opennextjs-cloudflare build && opennextjs-cloudflare deploy",
+			upload: "opennextjs-cloudflare build && opennextjs-cloudflare upload",
+			"cf-typegen": "wrangler types --env-interface CloudflareEnv cloudflare-env.d.ts"
+		};
+		await fs.writeJson(packageJsonPath, pkg, { spaces: 2 });
+	}
+}
+
+//#endregion
+//#region src/helpers/project-generation/add-deployment.ts
+function exitWithError(message) {
+	cancel(pc.red(message));
+	process.exit(1);
+}
+async function addDeploymentToProject(input) {
+	try {
+		const projectDir = input.projectDir || process.cwd();
+		const isBetterTStack = await isBetterTStackProject(projectDir);
+		if (!isBetterTStack) exitWithError("This doesn't appear to be a Better-T Stack project. Please run this command from the root of a Better-T Stack project.");
+		const detectedConfig = await detectProjectConfig(projectDir);
+		if (!detectedConfig) exitWithError("Could not detect the project configuration. Please ensure this is a valid Better-T Stack project.");
+		if (detectedConfig.webDeploy === input.webDeploy) exitWithError(`${input.webDeploy} deployment is already configured for this project.`);
+		if (input.webDeploy === "workers") {
+			const compatibleFrontends = [
+				"tanstack-router",
+				"react-router",
+				"solid",
+				"next",
+				"svelte"
+			];
+			const hasCompatible = detectedConfig.frontend?.some((f) => compatibleFrontends.includes(f));
+			if (!hasCompatible) exitWithError("Cloudflare Workers deployment requires a compatible web frontend (tanstack-router, react-router, solid, next, or svelte).");
+		}
+		const config = {
+			projectName: detectedConfig.projectName || path.basename(projectDir),
+			projectDir,
+			relativePath: ".",
+			database: detectedConfig.database || "none",
+			orm: detectedConfig.orm || "none",
+			backend: detectedConfig.backend || "none",
+			runtime: detectedConfig.runtime || "none",
+			frontend: detectedConfig.frontend || [],
+			addons: detectedConfig.addons || [],
+			examples: detectedConfig.examples || [],
+			auth: detectedConfig.auth || false,
+			git: false,
+			packageManager: input.packageManager || detectedConfig.packageManager || "npm",
+			install: input.install || false,
+			dbSetup: detectedConfig.dbSetup || "none",
+			api: detectedConfig.api || "none",
+			webDeploy: input.webDeploy
+		};
+		log.info(pc.green(`Adding ${input.webDeploy} deployment to ${config.frontend.join("/")}`));
+		await setupDeploymentTemplates(projectDir, config);
+		await setupWebDeploy(config);
+		await updateBtsConfig(projectDir, { webDeploy: input.webDeploy });
+		if (config.install) await installDependencies({
+			projectDir,
+			packageManager: config.packageManager
+		});
+		else if (!input.suppressInstallMessage) log.info(pc.yellow(`Run ${pc.bold(`${config.packageManager} install`)} to install dependencies`));
 	} catch (error) {
 		const message = error instanceof Error ? error.message : String(error);
-		exitWithError(`Error adding addons: ${message}`);
+		exitWithError(`Error adding deployment: ${message}`);
 	}
 }
 
@@ -3609,7 +4027,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 +4182,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.
 `;
@@ -3860,7 +4279,7 @@ async function initializeGit(projectDir, useGit) {
 	})`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"}`;
+	await $({ cwd: projectDir })`git commit -m ${"initial commit"}`;
 }
 
 //#endregion
@@ -3966,7 +4385,7 @@ function getTauriInstructions(runCmd) {
 	return `\n${pc.bold("Desktop app with Tauri:")}\n${pc.cyan("•")} Start desktop app: ${`cd apps/web && ${runCmd} desktop:dev`}\n${pc.cyan("•")} Build desktop app: ${`cd apps/web && ${runCmd} desktop:build`}\n${pc.yellow("NOTE:")} Tauri requires Rust and platform-specific dependencies.\nSee: https://v2.tauri.app/start/prerequisites/`;
 }
 function getPwaInstructions() {
-	return `\n${pc.bold("PWA with React Router v7:")}\n${pc.yellow("NOTE:")} There is a known compatibility issue between VitePWA and React Router v7.\nSee: https://github.com/vite-pwa/vite-plugin-pwa/issues/809`;
+	return `\n${pc.bold("PWA with React Router v7:")}\n${pc.yellow("NOTE:")} There is a known compatibility issue between VitePWA \nand React Router v7.See: https://github.com/vite-pwa/vite-plugin-pwa/issues/809`;
 }
 function getStarlightInstructions(runCmd) {
 	return `\n${pc.bold("Documentation with Starlight:")}\n${pc.cyan("•")} Start docs site: ${`cd apps/docs && ${runCmd} dev`}\n${pc.cyan("•")} Build docs site: ${`cd apps/docs && ${runCmd} build`}`;
@@ -4110,7 +4529,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";
@@ -4150,6 +4569,7 @@ async function createProject(options) {
 		}
 		if (options.examples.length > 0 && options.examples[0] !== "none") await setupExamplesTemplate(projectDir, options);
 		await setupAddonsTemplate(projectDir, options);
+		await setupDeploymentTemplates(projectDir, options);
 		await setupApi(options);
 		if (!isConvex) {
 			await setupBackendDependencies(options);
@@ -4160,6 +4580,7 @@ async function createProject(options) {
 		if (options.addons.length > 0 && options.addons[0] !== "none") await setupAddons(options);
 		if (!isConvex && options.auth) await setupAuth(options);
 		await handleExtras(projectDir, options);
+		await setupWebDeploy(options);
 		await setupEnvironmentVariables(options);
 		await updatePackageConfigurations(projectDir, options);
 		await createReadme(projectDir, options);
@@ -4251,28 +4672,50 @@ async function createProjectHandler(input) {
 }
 async function addAddonsHandler(input) {
 	try {
+		const projectDir = input.projectDir || process.cwd();
+		const detectedConfig = await detectProjectConfig(projectDir);
+		if (!detectedConfig) {
+			cancel(pc.red("Could not detect project configuration. Please ensure this is a valid Better-T Stack project."));
+			process.exit(1);
+		}
 		if (!input.addons || input.addons.length === 0) {
-			const projectDir = input.projectDir || process.cwd();
-			const detectedConfig = await detectProjectConfig(projectDir);
-			if (!detectedConfig) {
-				cancel(pc.red("Could not detect project configuration. Please ensure this is a valid Better-T Stack project."));
-				process.exit(1);
-			}
 			const addonsPrompt = await getAddonsToAdd(detectedConfig.frontend || [], detectedConfig.addons || []);
-			if (addonsPrompt.length === 0) {
-				outro(pc.yellow("No addons to add or all compatible addons are already present."));
-				return;
-			}
-			input.addons = addonsPrompt;
+			if (addonsPrompt.length > 0) input.addons = addonsPrompt;
 		}
-		if (!input.addons || input.addons.length === 0) {
-			outro(pc.yellow("No addons specified to add."));
+		if (!input.webDeploy) {
+			const deploymentPrompt = await getDeploymentToAdd(detectedConfig.frontend || [], detectedConfig.webDeploy);
+			if (deploymentPrompt !== "none") input.webDeploy = deploymentPrompt;
+		}
+		const packageManager = input.packageManager || detectedConfig.packageManager || "npm";
+		let somethingAdded = false;
+		if (input.addons && input.addons.length > 0) {
+			await addAddonsToProject({
+				...input,
+				install: false,
+				suppressInstallMessage: true,
+				addons: input.addons
+			});
+			somethingAdded = true;
+		}
+		if (input.webDeploy && input.webDeploy !== "none") {
+			await addDeploymentToProject({
+				...input,
+				install: false,
+				suppressInstallMessage: true,
+				webDeploy: input.webDeploy
+			});
+			somethingAdded = true;
+		}
+		if (!somethingAdded) {
+			outro(pc.yellow("No addons or deployment configurations to add."));
 			return;
 		}
-		await addAddonsToProject({
-			...input,
-			addons: input.addons
+		if (input.install) await installDependencies({
+			projectDir,
+			packageManager
 		});
+		else log.info(pc.yellow(`Run ${pc.bold(`${packageManager} install`)} to install dependencies`));
+		outro(pc.green("Add command completed successfully!"));
 	} catch (error) {
 		console.error(error);
 		process.exit(1);
@@ -4362,7 +4805,8 @@ const router = t.router({
 		dbSetup: DatabaseSetupSchema.optional(),
 		backend: BackendSchema.optional(),
 		runtime: RuntimeSchema.optional(),
-		api: APISchema.optional()
+		api: APISchema.optional(),
+		webDeploy: WebDeploySchema.optional()
 	}).optional().default({})])).mutation(async ({ input }) => {
 		const [projectName, options] = input;
 		const combinedInput = {
@@ -4371,10 +4815,11 @@ const router = t.router({
 		};
 		await createProjectHandler(combinedInput);
 	}),
-	add: t.procedure.meta({ description: "Add addons to an existing Better-T Stack project" }).input(zod.tuple([zod.object({
+	add: t.procedure.meta({ description: "Add addons or deployment configurations to an existing Better-T Stack project" }).input(zod.tuple([zod.object({
 		addons: zod.array(AddonsSchema).optional().default([]),
+		webDeploy: WebDeploySchema.optional(),
 		projectDir: zod.string().optional(),
-		install: zod.boolean().optional().default(false).describe("Install dependencies after adding addons"),
+		install: zod.boolean().optional().default(false).describe("Install dependencies after adding addons or deployment"),
 		packageManager: PackageManagerSchema.optional()
 	}).optional().default({})])).mutation(async ({ input }) => {
 		const [options] = input;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "2.22.9",
+  "version": "2.23.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",
@@ -64,6 +64,7 @@
     "picocolors": "^1.1.1",
     "posthog-node": "^5.1.1",
     "trpc-cli": "^0.9.2",
+    "ts-morph": "^26.0.0",
     "zod": "^3.25.67"
   },
   "devDependencies": {

package/templates/deploy/web/nuxt/wrangler.jsonc.hbs

@@ -0,0 +1,51 @@
+/**
+ * For more details on how to configure Wrangler, refer to:
+ * https://developers.cloudflare.com/workers/wrangler/configuration/
+ */
+{
+	"$schema": "../../node_modules/wrangler/config-schema.json",
+	"name": "{{projectName}}",
+	"main": "./.output/server/index.mjs",
+	"compatibility_date": "2025-07-01",
+	"assets": {
+		"binding": "ASSETS",
+		"directory": "./.output/public/"
+	},
+	"observability": {
+		"enabled": true
+	}
+	/**
+	 * Smart Placement
+	 * Docs: https://developers.cloudflare.com/workers/configuration/smart-placement/#smart-placement
+	 */
+	// "placement": { "mode": "smart" },
+
+	/**
+	 * Bindings
+	 * Bindings allow your Worker to interact with resources on the Cloudflare Developer Platform, including
+	 * databases, object storage, AI inference, real-time communication and more.
+	 * https://developers.cloudflare.com/workers/runtime-apis/bindings/
+	 */
+
+	/**
+	 * Environment Variables
+	 * https://developers.cloudflare.com/workers/wrangler/configuration/#environment-variables
+	 */
+	// "vars": { "MY_VARIABLE": "production_value" },
+	/**
+	 * Note: Use secrets to store sensitive data.
+	 * https://developers.cloudflare.com/workers/configuration/secrets/
+	 */
+
+	/**
+	 * Static Assets
+	 * https://developers.cloudflare.com/workers/static-assets/binding/
+	 */
+	// "assets": { "directory": "./public/", "binding": "ASSETS" },
+
+	/**
+	 * Service Bindings (communicate between multiple Workers)
+	 * https://developers.cloudflare.com/workers/wrangler/configuration/#service-bindings
+	 */
+	// "services": [{ "binding": "MY_SERVICE", "service": "my-service" }]
+}

package/templates/deploy/web/react/next/open-next.config.ts

@@ -0,0 +1,6 @@
+import { defineCloudflareConfig } from "@opennextjs/cloudflare/config";
+// import r2IncrementalCache from "@opennextjs/cloudflare/overrides/incremental-cache/r2-incremental-cache";
+
+export default defineCloudflareConfig({
+	// incrementalCache: r2IncrementalCache,
+});

package/templates/deploy/web/react/next/wrangler.jsonc.hbs

@@ -0,0 +1,22 @@
+{
+	"$schema": "../../node_modules/wrangler/config-schema.json",
+	"main": ".open-next/worker.js",
+	"name": "{{projectName}}",
+	"compatibility_date": "2025-07-05",
+	"compatibility_flags": ["nodejs_compat", "global_fetch_strictly_public"],
+	"assets": {
+		"directory": ".open-next/assets",
+		"binding": "ASSETS"
+	},
+	// "r2_buckets": [
+	// 	// Use R2 incremental cache
+	// 	// See https://opennext.js.org/cloudflare/caching
+	// 	{
+	// 		"binding": "NEXT_INC_CACHE_R2_BUCKET",
+	// 		// Create the bucket before deploying
+	// 		// You can change the bucket name if you want
+	// 		// See https://developers.cloudflare.com/workers/wrangler/commands/#r2-bucket-create
+	// 		"bucket_name": "cache"
+	// 	}
+	// ]
+}

package/templates/deploy/web/react/react-router/wrangler.jsonc.hbs

@@ -0,0 +1,8 @@
+{
+  "$schema": "../../node_modules/wrangler/config-schema.json",
+  "name": "{{projectName}}",
+  "compatibility_date": "2025-04-03",
+  "assets": {
+    "not_found_handling": "single-page-application"
+  }
+}

package/templates/deploy/web/react/tanstack-router/wrangler.jsonc.hbs

@@ -0,0 +1,8 @@
+{
+  "$schema": "../../node_modules/wrangler/config-schema.json",
+  "name": "{{projectName}}",
+  "compatibility_date": "2025-04-03",
+  "assets": {
+    "not_found_handling": "single-page-application"
+  }
+}

package/templates/deploy/web/solid/wrangler.jsonc.hbs

@@ -0,0 +1,8 @@
+{
+  "$schema": "../../node_modules/wrangler/config-schema.json",
+  "name": "{{projectName}}",
+  "compatibility_date": "2025-04-03",
+  "assets": {
+    "not_found_handling": "single-page-application"
+  }
+}

package/templates/deploy/web/svelte/wrangler.jsonc.hbs

@@ -0,0 +1,51 @@
+/**
+ * For more details on how to configure Wrangler, refer to:
+ * https://developers.cloudflare.com/workers/wrangler/configuration/
+ */
+{
+	"$schema": "../../node_modules/wrangler/config-schema.json",
+	"name": "{{projectName}}",
+	"main": ".svelte-kit/cloudflare/_worker.js",
+	"compatibility_date": "2025-07-05",
+	"assets": {
+		"binding": "ASSETS",
+		"directory": ".svelte-kit/cloudflare"
+	},
+	"observability": {
+		"enabled": true
+	}
+	/**
+	 * Smart Placement
+	 * Docs: https://developers.cloudflare.com/workers/configuration/smart-placement/#smart-placement
+	 */
+	// "placement": { "mode": "smart" },
+
+	/**
+	 * Bindings
+	 * Bindings allow your Worker to interact with resources on the Cloudflare Developer Platform, including
+	 * databases, object storage, AI inference, real-time communication and more.
+	 * https://developers.cloudflare.com/workers/runtime-apis/bindings/
+	 */
+
+	/**
+	 * Environment Variables
+	 * https://developers.cloudflare.com/workers/wrangler/configuration/#environment-variables
+	 */
+	// "vars": { "MY_VARIABLE": "production_value" },
+	/**
+	 * Note: Use secrets to store sensitive data.
+	 * https://developers.cloudflare.com/workers/configuration/secrets/
+	 */
+
+	/**
+	 * Static Assets
+	 * https://developers.cloudflare.com/workers/static-assets/binding/
+	 */
+	// "assets": { "directory": "./public/", "binding": "ASSETS" },
+
+	/**
+	 * Service Bindings (communicate between multiple Workers)
+	 * https://developers.cloudflare.com/workers/wrangler/configuration/#service-bindings
+	 */
+	// "services": [{ "binding": "MY_SERVICE", "service": "my-service" }]
+}

package/templates/frontend/react/react-router/vite.config.ts.hbs

@@ -1,6 +1,3 @@
-{{#if (includes addons "pwa")}}
-import { VitePWA } from "vite-plugin-pwa";
-{{/if}}
 import { reactRouter } from "@react-router/dev/vite";
 import tailwindcss from "@tailwindcss/vite";
 import { defineConfig } from "vite";
@@ -11,23 +8,5 @@ export default defineConfig({
     tailwindcss(),
     reactRouter(),
     tsconfigPaths(),
-    {{#if (includes addons "pwa")}}
-    VitePWA({
-      registerType: "autoUpdate",
-      manifest: {
-        name: "{{projectName}}",
-        short_name: "{{projectName}}",
-        description: "{{projectName}} - PWA Application",
-        theme_color: "#0c0c0c",
-      },
-      pwaAssets: {
-        disabled: false,
-        config: true,
-      },
-      devOptions: {
-        enabled: true,
-      },
-    }),
-    {{/if}}
   ],
-});
+});

package/templates/frontend/react/tanstack-router/vite.config.ts.hbs

@@ -1,8 +1,5 @@
-{{#if (includes addons "pwa")}}
-import { VitePWA } from "vite-plugin-pwa";
-{{/if}}
 import tailwindcss from "@tailwindcss/vite";
-import { TanStackRouterVite } from "@tanstack/router-plugin/vite";
+import { tanstackRouter } from "@tanstack/router-plugin/vite";
 import react from "@vitejs/plugin-react";
 import path from "node:path";
 import { defineConfig } from "vite";
@@ -10,30 +7,12 @@ import { defineConfig } from "vite";
 export default defineConfig({
   plugins: [
     tailwindcss(),
-    TanStackRouterVite({}),
+    tanstackRouter({}),
     react(),
-    {{#if (includes addons "pwa")}}
-    VitePWA({
-      registerType: "autoUpdate",
-      manifest: {
-        name: "{{projectName}}",
-        short_name: "{{projectName}}",
-        description: "{{projectName}} - PWA Application",
-        theme_color: "#0c0c0c",
-      },
-      pwaAssets: {
-        disabled: false,
-        config: true,
-      },
-      devOptions: {
-        enabled: true,
-      },
-    }),
-    {{/if}}
   ],
   resolve: {
     alias: {
       "@": path.resolve(__dirname, "./src"),
     },
   },
-});
+});

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

@@ -17,14 +17,14 @@
     "@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",
+    "clsx": "^2.1.1",
+    "lucide-react": "^0.525.0",
     "next-themes": "^0.4.6",
     "react": "19.0.0",
     "react-dom": "19.0.0",
     "sonner": "^2.0.3",
     "tailwindcss": "^4.1.3",
-    "tailwind-merge": "^2.6.0",
+    "tailwind-merge": "^3.3.1",
     "tw-animate-css": "^1.2.5",
     "vite-tsconfig-paths": "^5.1.4",
     "zod": "^3.25.16"
@@ -38,7 +38,7 @@
     "@vitejs/plugin-react": "^4.5.2",
     "jsdom": "^26.0.0",
     "typescript": "^5.7.2",
-    "vite": "^6.3.5",
-    "web-vitals": "^4.2.4"
+    "vite": "^7.0.2",
+    "web-vitals": "^5.0.3"
   }
-}
+}

package/templates/frontend/react/web-base/_gitignore

@@ -50,3 +50,8 @@ next-env.d.ts
 
 # Other
 dev-dist
+
+.wrangler
+.dev.vars*
+
+.open-next

package/templates/frontend/solid/_gitignore

@@ -5,3 +5,6 @@ dist-ssr
 *.local
 .env
 .env.*
+
+.wrangler
+.dev.vars*

package/templates/frontend/solid/package.json.hbs

@@ -4,7 +4,7 @@
   "type": "module",
   "scripts": {
     "dev": "vite --port 3001",
-    "build": "vite build && tsc",
+    "build": "vite build",
     "serve": "vite preview",
     "test": "vitest run"
   },
@@ -21,7 +21,7 @@
   },
   "devDependencies": {
     "typescript": "^5.7.2",
-    "vite": "^6.0.11",
+    "vite": "^7.0.2",
     "vite-plugin-solid": "^2.11.2"
   }
 }

package/templates/frontend/solid/src/main.tsx.hbs

@@ -4,7 +4,7 @@ import { routeTree } from "./routeTree.gen";
 import "./styles.css";
 {{#if (eq api "orpc")}}
 import { QueryClientProvider } from "@tanstack/solid-query";
-import { queryClient } from "./utils/orpc";
+import { orpc, queryClient } from "./utils/orpc";
 {{/if}}
 
 const router = createRouter({
@@ -12,6 +12,9 @@ const router = createRouter({
   defaultPreload: "intent",
   scrollRestoration: true,
   defaultPreloadStaleTime: 0,
+  {{#if (eq api "orpc")}}
+  context: { orpc, queryClient },
+  {{/if}}
 });
 
 declare module "@tanstack/solid-router" {

package/templates/frontend/solid/vite.config.ts.hbs

@@ -0,0 +1,18 @@
+import { defineConfig } from "vite";
+import { tanstackRouter } from "@tanstack/router-plugin/vite";
+import solidPlugin from "vite-plugin-solid";
+import tailwindcss from "@tailwindcss/vite";
+import path from "node:path";
+
+export default defineConfig({
+  plugins: [
+    tanstackRouter({ target: "solid", autoCodeSplitting: true }),
+    solidPlugin(),
+    tailwindcss(),
+  ],
+  resolve: {
+    alias: {
+      "@": path.resolve(__dirname, "./src"),
+    },
+  },
+});

package/templates/frontend/svelte/package.json.hbs

@@ -21,7 +21,7 @@
 		"tailwindcss": "^4.1.4",
 		"typescript": "^5.8.3",
 		"@tanstack/svelte-query-devtools": "^5.74.6",
-		"vite": "^6.3.3"
+		"vite": "^7.0.2"
 	},
 	"dependencies": {
 		"@tanstack/svelte-form": "^1.7.0",

package/templates/frontend/solid/vite.config.js.hbs

@@ -1,39 +0,0 @@
-import { defineConfig } from "vite";
-import { TanStackRouterVite } from "@tanstack/router-plugin/vite";
-import solidPlugin from "vite-plugin-solid";
-import tailwindcss from "@tailwindcss/vite";
-import path from "node:path";
-{{#if (includes addons "pwa")}}
-import { VitePWA } from "vite-plugin-pwa";
-{{/if}}
-
-export default defineConfig({
-  plugins: [
-    TanStackRouterVite({ target: "solid", autoCodeSplitting: true }),
-    solidPlugin(),
-    tailwindcss(),
-    {{#if (includes addons "pwa")}}
-    VitePWA({
-      registerType: "autoUpdate",
-      manifest: {
-        name: "{{projectName}}",
-        short_name: "{{projectName}}",
-        description: "{{projectName}} - PWA Application",
-        theme_color: "#0c0c0c",
-      },
-      pwaAssets: {
-        disabled: false,
-        config: true,
-      },
-      devOptions: {
-        enabled: true,
-      },
-    }),
-    {{/if}}
-  ],
-  resolve: {
-    alias: {
-      "@": path.resolve(__dirname, "./src"),
-    },
-  },
-});