@better-t-stack/template-generator 3.35.3 → 3.36.0

package/dist/index.mjs

@@ -189,6 +189,33 @@ Handlebars.registerHelper("and", (...args) => args.slice(0, -1).every(Boolean));
 Handlebars.registerHelper("or", (...args) => args.slice(0, -1).some(Boolean));
 Handlebars.registerHelper("not", (a) => !a);
 Handlebars.registerHelper("includes", (arr, val) => Array.isArray(arr) && arr.includes(val));
+const getServerUrlSource = `function getServerUrl(url: string) {
+	const normalized = url.endsWith("/") ? url.slice(0, -1) : url;
+
+	if (!normalized.startsWith("/")) {
+		return normalized;
+	}
+
+	if (typeof window !== "undefined") {
+		return \`\${window.location.origin}\${normalized}\`;
+	}
+
+	const processEnv = (globalThis as {
+		process?: { env?: Record<string, string | undefined> };
+	}).process?.env;
+	const vercelUrl =
+		processEnv?.VERCEL_ENV === "production"
+			? (processEnv?.VERCEL_PROJECT_PRODUCTION_URL ?? processEnv?.VERCEL_URL)
+			: (processEnv?.VERCEL_URL ?? processEnv?.VERCEL_PROJECT_PRODUCTION_URL);
+	if (vercelUrl) {
+		const origin = vercelUrl.startsWith("http") ? vercelUrl : \`https://\${vercelUrl}\`;
+		return \`\${origin}\${normalized}\`;
+	}
+
+	return \`http://localhost:3000\${normalized}\`;
+}`;
+Handlebars.registerPartial("getServerUrl", getServerUrlSource);
+Handlebars.registerPartial("getServerUrlSpaces", getServerUrlSource.replaceAll("	", "  "));
 function processTemplateString(content, context) {
 	return Handlebars.compile(content)(context);
 }
@@ -201,6 +228,7 @@ function transformFilename(filename) {
 	if (basename === "_gitignore") result = result.replace(/_gitignore$/, ".gitignore");
 	else if (basename === "_npmrc") result = result.replace(/_npmrc$/, ".npmrc");
 	else if (basename === "_dockerignore") result = result.replace(/_dockerignore$/, ".dockerignore");
+	else if (basename === "_vercelignore") result = result.replace(/_vercelignore$/, ".vercelignore");
 	return result;
 }
 function processFileContent(filePath, content, context) {
@@ -492,10 +520,13 @@ const dependencyVersionMap = {
 	"nitro-cloudflare-dev": "^0.2.2",
 	"@sveltejs/adapter-cloudflare": "^7.2.9",
 	"@sveltejs/adapter-node": "^5.5.7",
+	"@sveltejs/adapter-vercel": "^6.3.4",
 	"@cloudflare/workers-types": "^4.20260702.1",
 	"@astrojs/cloudflare": "^14.1.0",
 	"@astrojs/node": "^11.0.1",
+	"@astrojs/vercel": "^11.0.1",
 	alchemy: "^0.93.12",
+	vercel: "^54.18.6",
 	dotenv: "^17.4.2",
 	tsdown: "^0.22.3",
 	zod: "^4.4.3",
@@ -522,8 +553,9 @@ function addPackageDependency(options) {
 		const version = dependencyVersionMap[dep];
 		if (!version) throw new Error(`Missing version for dependency: ${dep}. Add it to dependencyVersionMap in add-deps.ts`);
 		pkgJson.dependencies[dep] = version;
+		delete pkgJson.devDependencies[dep];
 	}
-	for (const dep of devDependencies) if (!pkgJson.devDependencies[dep]) {
+	for (const dep of devDependencies) if (!pkgJson.devDependencies[dep] && !pkgJson.dependencies[dep]) {
 		const version = dependencyVersionMap[dep];
 		if (!version) throw new Error(`Missing version for devDependency: ${dep}. Add it to dependencyVersionMap in add-deps.ts`);
 		pkgJson.devDependencies[dep] = version;
@@ -659,10 +691,25 @@ function updateRootPackageJson(vfs, config) {
 		scripts["db:down"] = pmConfig.filter(dbPackageName, "db:down");
 	}
 	const infraPackageName = `@${projectName}/infra`;
-	if (config.webDeploy === "cloudflare" || config.serverDeploy === "cloudflare") {
-		scripts.deploy = pmConfig.filter(infraPackageName, "deploy");
+	const hasCloudflareDeploy = config.webDeploy === "cloudflare" || config.serverDeploy === "cloudflare";
+	const hasVercelDeploy = config.webDeploy === "vercel" || config.serverDeploy === "vercel";
+	const isMixedCloud = hasCloudflareDeploy && hasVercelDeploy;
+	if (hasCloudflareDeploy) {
+		const cfDeployScript = isMixedCloud ? config.webDeploy === "cloudflare" ? "deploy:web" : "deploy:server" : "deploy";
+		scripts[cfDeployScript] = pmConfig.filter(infraPackageName, "deploy");
 		scripts.destroy = pmConfig.filter(infraPackageName, "destroy");
 	}
+	if (hasVercelDeploy) {
+		const vercelTarget = config.webDeploy === "vercel" ? "web" : "server";
+		const vercelDeploy = isMixedCloud ? `deploy:${vercelTarget}` : "deploy";
+		scripts["deploy:setup"] = "vercel link";
+		scripts["dev:vercel"] = "vercel dev -L";
+		scripts["env:preview"] = "tsx scripts/sync-vercel-env.ts preview";
+		scripts["env:production"] = "tsx scripts/sync-vercel-env.ts production";
+		scripts[vercelDeploy] = "vercel deploy";
+		scripts[`${vercelDeploy}:prod`] = "vercel deploy --prod";
+		scripts["deploy:check"] = "vercel deploy --dry";
+	}
 	if (config.webDeploy === "docker" || config.serverDeploy === "docker") {
 		scripts["docker:build"] = "docker compose build";
 		scripts["docker:up"] = "docker compose up -d --build";
@@ -941,6 +988,86 @@ function updateVitePlusPackageScripts(vfs, config) {
 	vfs.writeJson(webPkgPath, webPkg);
 }
 //#endregion
+//#region src/post-process/vercel-config.ts
+function getWebFramework(frontend, isDesktop) {
+	if (frontend.includes("next")) return "nextjs";
+	if (frontend.includes("nuxt")) return "nuxtjs";
+	if (frontend.includes("svelte")) return "sveltekit";
+	if (frontend.includes("astro")) return "astro";
+	if (frontend.includes("tanstack-start")) return "tanstack-start";
+	if (frontend.includes("react-router") && !isDesktop) return "react-router";
+	return "vite";
+}
+function getPublicServerUrlVar(frontend) {
+	if (frontend.includes("next")) return "NEXT_PUBLIC_SERVER_URL";
+	if (frontend.includes("nuxt")) return "NUXT_PUBLIC_SERVER_URL";
+	if (frontend.includes("svelte") || frontend.includes("astro")) return "PUBLIC_SERVER_URL";
+	return "VITE_SERVER_URL";
+}
+function processVercelConfig(vfs, config) {
+	const { webDeploy, serverDeploy, backend, runtime, frontend, addons, packageManager } = config;
+	if (webDeploy !== "vercel" && serverDeploy !== "vercel") return;
+	const hasWeb = webDeploy === "vercel";
+	const hasServer = serverDeploy === "vercel" && backend !== "self";
+	const isDesktop = addons.includes("tauri") || addons.includes("electrobun");
+	const isStaticSpa = frontend.includes("tanstack-router") || frontend.includes("solid") || frontend.includes("react-router") && isDesktop;
+	const installCommand = `cd ../.. && ${packageManager} install`;
+	const services = {};
+	if (hasWeb) {
+		const web = {
+			root: "apps/web",
+			framework: getWebFramework(frontend, isDesktop),
+			installCommand
+		};
+		if (hasServer) web.buildCommand = `${getPublicServerUrlVar(frontend)}=/api ${packageManager} run build`;
+		if (frontend.includes("react-router") && isDesktop) web.outputDirectory = "build/client";
+		if (isStaticSpa) web.rewrites = [{
+			source: "/(.*)",
+			destination: "/index.html"
+		}];
+		services.web = web;
+	}
+	if (hasServer) {
+		const server = {
+			root: "apps/server",
+			framework: backend,
+			entrypoint: "src/index.ts",
+			installCommand
+		};
+		if (hasWeb) server.routes = [{
+			src: "/api/((?!auth(?:/|$)).*)",
+			transforms: [{
+				type: "request.path",
+				op: "set",
+				args: "/$1"
+			}]
+		}];
+		services.server = server;
+	}
+	const rewrites = [];
+	if (hasWeb && hasServer) rewrites.push({
+		source: "/api/(.*)",
+		destination: { service: "server" }
+	}, {
+		source: "/(.*)",
+		destination: { service: "web" }
+	});
+	else if (hasWeb) rewrites.push({
+		source: "/(.*)",
+		destination: { service: "web" }
+	});
+	else if (hasServer) rewrites.push({
+		source: "/(.*)",
+		destination: { service: "server" }
+	});
+	vfs.writeJson("vercel.json", {
+		$schema: "https://openapi.vercel.sh/vercel.json",
+		...hasServer && runtime === "bun" ? { bunVersion: "1.x" } : {},
+		services,
+		rewrites
+	});
+}
+//#endregion
 //#region src/processors/addons-deps.ts
 function processAddonsDeps(vfs, config) {
 	if (!config.addons || config.addons.length === 0) return;
@@ -2062,12 +2189,47 @@ function processDrizzleDeps(vfs, config, dbPkgPath, webPkgPath, webExists) {
 //#endregion
 //#region src/processors/deploy-deps.ts
 function processDeployDeps(vfs, config) {
-	const { webDeploy, serverDeploy, frontend, backend } = config;
+	const { webDeploy, serverDeploy, frontend, backend, addons } = config;
 	const isCloudflareWeb = webDeploy === "cloudflare";
 	const isCloudflareServer = serverDeploy === "cloudflare";
 	const isDockerWeb = webDeploy === "docker";
+	const isVercelWeb = webDeploy === "vercel";
+	const isVercelServer = serverDeploy === "vercel";
 	const isBackendSelf = backend === "self";
-	if (!isCloudflareWeb && !isCloudflareServer && !isDockerWeb) return;
+	if (!isCloudflareWeb && !isCloudflareServer && !isDockerWeb && !isVercelWeb && !isVercelServer) return;
+	if (isVercelWeb || isVercelServer) addPackageDependency({
+		vfs,
+		packagePath: "package.json",
+		devDependencies: [
+			"@types/node",
+			"tsx",
+			"vercel"
+		]
+	});
+	if (isVercelWeb && frontend.includes("tanstack-start")) {
+		const webPkgPath = "apps/web/package.json";
+		if (vfs.exists(webPkgPath)) addPackageDependency({
+			vfs,
+			packagePath: webPkgPath,
+			dependencies: ["nitro"]
+		});
+	}
+	if (isVercelWeb && frontend.includes("astro") && !addons.includes("electrobun") && !addons.includes("tauri")) {
+		const webPkgPath = "apps/web/package.json";
+		if (vfs.exists(webPkgPath)) addPackageDependency({
+			vfs,
+			packagePath: webPkgPath,
+			dependencies: ["@astrojs/vercel"]
+		});
+	}
+	if (isVercelWeb && frontend.includes("svelte") && !addons.includes("electrobun") && !addons.includes("tauri")) {
+		const webPkgPath = "apps/web/package.json";
+		if (vfs.exists(webPkgPath)) addPackageDependency({
+			vfs,
+			packagePath: webPkgPath,
+			devDependencies: ["@sveltejs/adapter-vercel"]
+		});
+	}
 	if (isDockerWeb) {
 		const webPkgPath = "apps/web/package.json";
 		if (vfs.exists(webPkgPath)) {
@@ -2686,7 +2848,7 @@ function setupAIDependencies(vfs, config) {
 //#region src/processors/frontend-deps.ts
 function processFrontendDeps(vfs, config) {
 	const { addons, frontend, webDeploy } = config;
-	if (!frontend.includes("astro") || addons.includes("electrobun") || addons.includes("tauri") || webDeploy === "cloudflare") return;
+	if (!frontend.includes("astro") || addons.includes("electrobun") || addons.includes("tauri") || webDeploy === "cloudflare" || webDeploy === "vercel") return;
 	const webPackagePath = "apps/web/package.json";
 	if (!vfs.exists(webPackagePath)) return;
 	addPackageDependency({
@@ -2786,6 +2948,7 @@ function getStackGeneratedIgnorePatterns(config) {
 		patterns.add("**/.wrangler/**");
 		if (config.frontend.includes("next")) patterns.add("apps/web/.open-next/**");
 	}
+	if (config.webDeploy === "vercel" || config.serverDeploy === "vercel") patterns.add(".vercel/**");
 	return [...patterns];
 }
 //#endregion
@@ -3456,20 +3619,39 @@ function generateScriptsList(packageManagerRunCmd, config, hasNative) {
 - \`${packageManagerRunCmd} docker:up\`: Build and start the Docker Compose stack
 - \`${packageManagerRunCmd} docker:logs\`: Tail logs from the Docker Compose stack
 - \`${packageManagerRunCmd} docker:down\`: Stop the Docker Compose stack`;
+	if (webDeploy === "vercel" || serverDeploy === "vercel") {
+		const v = getVercelScriptNames(webDeploy, serverDeploy);
+		scripts += `\n- \`${packageManagerRunCmd} ${v.setup}\`: Link this repo to a Vercel project (first-time setup)
+- \`${packageManagerRunCmd} dev:vercel\`: Run the Vercel Services dev environment locally
+- \`${packageManagerRunCmd} ${v.envPreview}\`: Sync local env files to the Vercel preview environment
+- \`${packageManagerRunCmd} ${v.envProduction}\`: Sync local env files to the Vercel production environment
+- \`${packageManagerRunCmd} ${v.deploy}\`: Create a Vercel preview deployment
+- \`${packageManagerRunCmd} ${v.deployProd}\`: Deploy to Vercel production
+- \`${packageManagerRunCmd} ${v.deployCheck}\`: Dry-run a deploy to preview framework detection and included files without uploading`;
+	}
 	return scripts;
 }
 function generateDeploymentCommands(packageManagerRunCmd, webDeploy, serverDeploy, backend) {
 	const hasCloudflare = webDeploy === "cloudflare" || serverDeploy === "cloudflare";
 	const hasDocker = webDeploy === "docker" || serverDeploy === "docker";
-	if (!hasCloudflare && !hasDocker) return "";
+	const hasVercel = webDeploy === "vercel" || serverDeploy === "vercel";
+	if (!hasCloudflare && !hasDocker && !hasVercel) return "";
 	const lines = ["## Deployment"];
 	if (hasCloudflare) {
 		const targetLabel = webDeploy === "cloudflare" && (serverDeploy === "cloudflare" || backend === "self") ? "web + server" : webDeploy === "cloudflare" ? "web" : "server";
-		lines.push("", "### Cloudflare via Alchemy", "", `- Target: ${targetLabel}`, `- Dev: ${packageManagerRunCmd} dev`, `- Deploy: ${packageManagerRunCmd} deploy`, `- Destroy: ${packageManagerRunCmd} destroy`, "", "For more details, see the guide on [Deploying to Cloudflare with Alchemy](https://www.better-t-stack.dev/docs/guides/cloudflare-alchemy).");
+		const cfDeployScript = hasVercel ? webDeploy === "cloudflare" ? "deploy:web" : "deploy:server" : "deploy";
+		lines.push("", "### Cloudflare via Alchemy", "", `- Target: ${targetLabel}`, `- Dev: ${packageManagerRunCmd} dev`, `- Deploy: ${packageManagerRunCmd} ${cfDeployScript}`, `- Destroy: ${packageManagerRunCmd} destroy`, "", "For more details, see the guide on [Deploying to Cloudflare with Alchemy](https://www.better-t-stack.dev/docs/guides/cloudflare-alchemy).");
 	}
 	if (hasDocker) {
 		const targetLabel = webDeploy === "docker" && (serverDeploy === "docker" || backend === "self") ? "web + server" : webDeploy === "docker" ? "web" : "server";
-		lines.push("", "### Docker Compose", "", `- Target: ${targetLabel}`, "- Config: `docker-compose.yml` (app Dockerfiles live in `apps/*/Dockerfile`)", `- Build images: ${packageManagerRunCmd} docker:build`, `- Start: ${packageManagerRunCmd} docker:up`, `- Logs: ${packageManagerRunCmd} docker:logs`, `- Stop: ${packageManagerRunCmd} docker:down`, "", "Environment variables are read from each app's `.env` file (baked into web builds for public variables) and overridden in `docker-compose.yml` for container networking.");
+		lines.push("", "### Docker Compose", "", `- Target: ${targetLabel}`, "- Config: `docker-compose.yml` (app Dockerfiles live in `apps/*/Dockerfile`)", `- Build images: ${packageManagerRunCmd} docker:build`, `- Start: ${packageManagerRunCmd} docker:up`, `- Logs: ${packageManagerRunCmd} docker:logs`, `- Stop: ${packageManagerRunCmd} docker:down`, "", "Environment variables are read from each app's `.env` file (baked into web builds for public variables) and overridden in `docker-compose.yml` for container networking.", "", "For more details, see the guide on [Deploying with Docker Compose](https://www.better-t-stack.dev/docs/guides/docker).");
+	}
+	if (hasVercel) {
+		const vercelNames = getVercelScriptNames(webDeploy, serverDeploy);
+		const targetLabel = webDeploy === "vercel" && (serverDeploy === "vercel" || backend === "self") ? "web + server" : webDeploy === "vercel" ? "web" : "server";
+		lines.push("", "### Vercel Services", "", `- Target: ${targetLabel}`, "- Config: `vercel.json`", `- Link the project first: ${packageManagerRunCmd} ${vercelNames.setup}`, `- Local Vercel dev: ${packageManagerRunCmd} dev:vercel`, `- Sync preview env: ${packageManagerRunCmd} ${vercelNames.envPreview}`, `- Sync production env: ${packageManagerRunCmd} ${vercelNames.envProduction}`, `- Dry-run check (no upload): ${packageManagerRunCmd} ${vercelNames.deployCheck}`, `- Preview deploy: ${packageManagerRunCmd} ${vercelNames.deploy}`, `- Production deploy: ${packageManagerRunCmd} ${vercelNames.deployProd}`);
+		if (webDeploy === "vercel" && serverDeploy === "vercel" && backend !== "self") lines.push("- Web requests under `/api/*` route to the server service and are rewritten before reaching the backend.");
+		lines.push("Vercel Services share project environment variables, but deploys do not upload local `.env` files automatically. Link the project with `vercel link`, then run the env sync command before your first deploy (otherwise the deployment starts with no env vars), or pass one-off envs with `vercel deploy -e KEY=value`.", `Pass Vercel CLI flags to the env sync command directly, for example: \`${packageManagerRunCmd} ${vercelNames.envProduction} --scope your-team\`.`, "", "For more details, see the guide on [Deploying to Vercel](https://www.better-t-stack.dev/docs/guides/vercel).");
 	}
 	return `${lines.join("\n")}\n`;
 }
@@ -3486,6 +3668,17 @@ function generateGitHooksSection(packageManagerRunCmd, addons) {
 	if (hasLinting) lines.push(`- Run checks: \`${packageManagerRunCmd} check\``);
 	return `${lines.join("\n")}\n\n`;
 }
+function getVercelScriptNames(webDeploy, serverDeploy) {
+	const deploy = webDeploy === "cloudflare" || serverDeploy === "cloudflare" ? `deploy:${webDeploy === "vercel" ? "web" : "server"}` : "deploy";
+	return {
+		setup: "deploy:setup",
+		envPreview: "env:preview",
+		envProduction: "env:production",
+		deploy,
+		deployProd: `${deploy}:prod`,
+		deployCheck: "deploy:check"
+	};
+}
 //#endregion
 //#region src/processors/runtime-deps.ts
 function processRuntimeDeps(vfs, config) {
@@ -4233,7 +4426,7 @@ async function processExtrasTemplates(vfs, templates, config) {
 	].includes(f));
 	const hasNuxt = config.frontend.includes("nuxt");
 	if (config.packageManager === "pnpm") processSingleTemplate(vfs, templates, "extras/pnpm-workspace.yaml", "pnpm-workspace.yaml", config);
-	if (config.packageManager === "bun") processSingleTemplate(vfs, templates, "extras/bunfig.toml", "bunfig.toml", config);
+	if (config.packageManager === "bun" && hasNative) processSingleTemplate(vfs, templates, "extras/bunfig.toml", "bunfig.toml", config);
 	if (config.packageManager === "pnpm" && (hasNative || hasNuxt)) processSingleTemplate(vfs, templates, "extras/_npmrc", ".npmrc", config);
 	if (config.serverDeploy === "cloudflare" || config.backend === "self" && config.webDeploy === "cloudflare") processSingleTemplate(vfs, templates, "extras/env.d.ts", "packages/env/env.d.ts", config);
 }
@@ -4243,7 +4436,8 @@ async function processDeployTemplates(vfs, templates, config) {
 	const isBackendSelf = config.backend === "self";
 	if (config.webDeploy === "cloudflare" || config.serverDeploy === "cloudflare") processTemplatesFromPrefix(vfs, templates, "packages/infra", "packages/infra", config);
 	if (config.webDeploy === "docker" || config.serverDeploy === "docker") processTemplatesFromPrefix(vfs, templates, "deploy/docker/compose", "", config);
-	if (config.webDeploy !== "none" && config.webDeploy !== "cloudflare") {
+	if (config.webDeploy === "vercel" || config.serverDeploy === "vercel") processTemplatesFromPrefix(vfs, templates, "deploy/vercel", "", config);
+	if (config.webDeploy !== "none" && config.webDeploy !== "cloudflare" && config.webDeploy !== "vercel") {
 		const templateMap = {
 			"tanstack-router": "react/tanstack-router",
 			"tanstack-start": "react/tanstack-start",
@@ -4256,7 +4450,7 @@ async function processDeployTemplates(vfs, templates, config) {
 		};
 		for (const f of config.frontend) if (templateMap[f]) processTemplatesFromPrefix(vfs, templates, `deploy/${config.webDeploy}/web/${templateMap[f]}`, "apps/web", config);
 	}
-	if (config.serverDeploy !== "none" && config.serverDeploy !== "cloudflare" && !isBackendSelf) processTemplatesFromPrefix(vfs, templates, `deploy/${config.serverDeploy}/server`, "apps/server", config);
+	if (config.serverDeploy !== "none" && config.serverDeploy !== "cloudflare" && config.serverDeploy !== "vercel" && !isBackendSelf) processTemplatesFromPrefix(vfs, templates, `deploy/${config.serverDeploy}/server`, "apps/server", config);
 }
 //#endregion
 //#region src/utils/reproducible-command.ts
@@ -4344,6 +4538,7 @@ async function generate(options) {
 			processAlchemyPlugins(vfs, config);
 			processPwaPlugins(vfs, config);
 			processCatalogs(vfs, config);
+			processVercelConfig(vfs, config);
 			processReadme(vfs, config);
 			if (options.version) {
 				const reproducibleCommand = generateReproducibleCommand(config);
@@ -5625,13 +5820,16 @@ import { RPCLink } from "@orpc/client/fetch";
 
 {{#if (eq backend "self")}}
 export const link = new RPCLink({
-  url: \`\${window.location.origin}/rpc\`,
+  // Lazy: this module is imported during SSR where window does not exist
+  url: () => \`\${window.location.origin}/rpc\`,
 });
 {{else}}
 import { PUBLIC_SERVER_URL } from "astro:env/client";
 
+{{> getServerUrlSpaces}}
+
 export const link = new RPCLink({
-  url: \`\${PUBLIC_SERVER_URL}/rpc\`,
+  url: \`\${getServerUrl(PUBLIC_SERVER_URL)}/rpc\`,
 {{#if (eq auth "better-auth")}}
   fetch(url, options) {
     return fetch(url, {
@@ -5651,11 +5849,25 @@ import { createORPCClient } from '@orpc/client'
 import { RPCLink } from '@orpc/client/fetch'
 import { createTanstackQueryUtils } from "@orpc/tanstack-query";
 
+function getServerUrl(url: string) {
+  const normalized = url.endsWith("/") ? url.slice(0, -1) : url;
+
+  if (!normalized.startsWith("/")) {
+    return normalized;
+  }
+
+  if (import.meta.server) {
+    return \`\${useRequestURL().origin}\${normalized}\`;
+  }
+
+  return \`\${window.location.origin}\${normalized}\`;
+}
+
 export default defineNuxtPlugin(() => {
   const config = useRuntimeConfig();
   const serverUrl =
     (import.meta.server && config.serverUrl) || config.public.serverUrl;
-  const rpcUrl = \`\${serverUrl}/rpc\`;
+  const rpcUrl = \`\${getServerUrl(serverUrl)}/rpc\`;
 
   const rpcLink = new RPCLink({
     url: rpcUrl,
@@ -5783,6 +5995,10 @@ export function createQueryClient() {
 export const queryClient = createQueryClient();
 {{/unless}}
 
+{{#unless (eq backend "self")}}
+{{> getServerUrl}}
+
+{{/unless}}
 {{#if (and (includes frontend "tanstack-start") (eq backend "self"))}}
 const getORPCClient = createIsomorphicFn()
 	.server(() =>
@@ -5811,7 +6027,7 @@ const getORPCClient = createIsomorphicFn()
 export const client: RouterClient<typeof appRouter> = getORPCClient();
 {{else if (includes frontend "tanstack-start")}}
 const link = new RPCLink({
-	url: \`\${env.VITE_SERVER_URL}/rpc\`,
+	url: \`\${getServerUrl(env.VITE_SERVER_URL)}/rpc\`,
 {{#if (eq auth "clerk")}}
 	headers: async () => {
 		const token = await getClerkAuthToken();
@@ -5838,9 +6054,9 @@ export const link = new RPCLink({
 {{#if (and (eq backend "self") (includes frontend "next"))}}
 	url: \`\${typeof window !== "undefined" ? window.location.origin : "http://localhost:3001"}/api/rpc\`,
 {{else if (includes frontend "next")}}
-	url: \`\${env.NEXT_PUBLIC_SERVER_URL}/rpc\`,
+	url: \`\${getServerUrl(env.NEXT_PUBLIC_SERVER_URL)}/rpc\`,
 {{else}}
-	url: \`\${env.VITE_SERVER_URL}/rpc\`,
+	url: \`\${getServerUrl(env.VITE_SERVER_URL)}/rpc\`,
 {{/if}}
 {{#if (eq auth "clerk")}}
 	headers: async () => {
@@ -5901,8 +6117,10 @@ export const queryClient = new QueryClient({
 	}),
 });
 
+{{> getServerUrl}}
+
 export const link = new RPCLink({
-	url: \`\${env.VITE_SERVER_URL}/rpc\`,
+	url: \`\${getServerUrl(env.VITE_SERVER_URL)}/rpc\`,
 {{#if (eq auth "better-auth")}}
 	fetch(url, options) {
 		return fetch(url, {
@@ -5934,6 +6152,10 @@ export const queryClient = new QueryClient({
 	}),
 });
 
+{{#unless (eq backend "self")}}
+{{> getServerUrl}}
+
+{{/unless}}
 export const link = new RPCLink({
 	{{#if (eq backend "self")}}
 	url: () => {
@@ -5944,7 +6166,7 @@ export const link = new RPCLink({
 		return \`\${window.location.origin}/rpc\`;
 	},
 	{{else}}
-	url: \`\${PUBLIC_SERVER_URL}/rpc\`,
+	url: \`\${getServerUrl(PUBLIC_SERVER_URL)}/rpc\`,
 	{{/if}}
 	{{#if (eq auth "better-auth")}}
 	fetch(url, options) {
@@ -6470,6 +6692,8 @@ import type { AppRouter } from "@{{projectName}}/api/routers/index";
 import { toast } from 'sonner';
 {{#unless (eq backend "self")}}
 import { env } from "@{{projectName}}/env/web";
+
+{{> getServerUrl}}
 {{/unless}}
 {{#if (eq auth "clerk")}}
 import { getClerkAuthToken } from "@/utils/clerk-auth";
@@ -6496,7 +6720,7 @@ const trpcClient = createTRPCClient<AppRouter>({
 {{#if (eq backend "self")}}
 			url: "/api/trpc",
 {{else}}
-			url: \`\${env.NEXT_PUBLIC_SERVER_URL}/trpc\`,
+			url: \`\${getServerUrl(env.NEXT_PUBLIC_SERVER_URL)}/trpc\`,
 {{/if}}
 {{#if (eq auth "clerk")}}
 			headers: async () => {
@@ -6547,6 +6771,8 @@ import { env } from "@{{projectName}}/env/web";
 import { getClerkAuthToken } from "@/utils/clerk-auth";
 {{/if}}
 
+{{> getServerUrl}}
+
 export const queryClient = new QueryClient({
 	queryCache: new QueryCache({
 		onError: (error, query) => {
@@ -6565,7 +6791,7 @@ export const queryClient = new QueryClient({
 export const trpcClient = createTRPCClient<AppRouter>({
 	links: [
 		httpBatchLink({
-			url: \`\${env.VITE_SERVER_URL}/trpc\`,
+			url: \`\${getServerUrl(env.VITE_SERVER_URL)}/trpc\`,
 {{#if (eq auth "clerk")}}
 			headers: async () => {
 				const token = await getClerkAuthToken();
@@ -13361,9 +13587,15 @@ import { polarClient } from "@polar-sh/better-auth/client";
 import { PUBLIC_SERVER_URL } from "astro:env/client";
 {{/if}}
 
+{{#if (ne backend "self")}}
+{{> getServerUrlSpaces}}
+
+{{/if}}
 export const authClient = createAuthClient({
 {{#if (ne backend "self")}}
-  baseURL: PUBLIC_SERVER_URL,
+  // better-auth derives its route-matching base from this URL's path, so the
+	// public auth path must equal the server-side mount (/api/auth everywhere)
+	  baseURL: new URL("/api/auth", getServerUrl(PUBLIC_SERVER_URL)).toString(),
 {{/if}}
 {{#if (eq payments "polar")}}
   plugins: [polarClient()],
@@ -13897,11 +14129,17 @@ import { polarClient } from "@polar-sh/better-auth/client";
 export default defineNuxtPlugin(() => {
   {{#if (ne backend "self")}}
   const config = useRuntimeConfig();
+  const rawServerUrl = (import.meta.server && config.serverUrl) || config.public.serverUrl;
+  // Same-origin paths like /api need an absolute base, and better-auth derives
+  // its route matching from this URL's path, so it must be exactly /api/auth
+  const serverOrigin = rawServerUrl.startsWith("/")
+    ? (import.meta.server ? useRequestURL() : window.location).origin + rawServerUrl
+    : rawServerUrl;
   {{/if}}
 
   const authClient = createAuthClient({
     {{#if (ne backend "self")}}
-    baseURL: (import.meta.server && config.serverUrl) || config.public.serverUrl,
+    baseURL: new URL("/api/auth", serverOrigin).toString(),
     {{/if}}
     {{#if (eq payments "polar")}}
     plugins: [polarClient()],
@@ -13921,11 +14159,15 @@ import { polarClient } from "@polar-sh/better-auth/client";
 {{/if}}
 {{#unless (eq backend "self")}}
 import { env } from "@{{projectName}}/env/web";
+
+{{> getServerUrl}}
 {{/unless}}
 
 export const authClient = createAuthClient({
 {{#unless (eq backend "self")}}
-	baseURL: env.{{#if (includes frontend "next")}}NEXT_PUBLIC_SERVER_URL{{else}}VITE_SERVER_URL{{/if}},
+	// better-auth derives its route-matching base from this URL's path, so the
+	// public auth path must equal the server-side mount (/api/auth everywhere)
+		baseURL: new URL("/api/auth", getServerUrl(env.{{#if (includes frontend "next")}}NEXT_PUBLIC_SERVER_URL{{else}}VITE_SERVER_URL{{/if}})).toString(),
 {{/unless}}
 {{#if (eq payments "polar")}}
 	plugins: [polarClient()]
@@ -16219,8 +16461,12 @@ import { polarClient } from "@polar-sh/better-auth/client";
 {{/if}}
 import { env } from "@{{projectName}}/env/web";
 
+{{> getServerUrl}}
+
 export const authClient = createAuthClient({
-	baseURL: env.VITE_SERVER_URL,
+	// better-auth derives its route-matching base from this URL's path, so the
+	// public auth path must equal the server-side mount (/api/auth everywhere)
+		baseURL: new URL("/api/auth", getServerUrl(env.VITE_SERVER_URL)).toString(),
 {{#if (eq payments "polar")}}
 	plugins: [polarClient()]
 {{/if}}
@@ -16636,9 +16882,15 @@ import { createAuthClient } from "better-auth/svelte";
 import { polarClient } from "@polar-sh/better-auth/client";
 {{/if}}
 
+{{#unless (eq backend "self")}}
+{{> getServerUrl}}
+
+{{/unless}}
 export const authClient = createAuthClient({
 {{#unless (eq backend "self")}}
-	baseURL: PUBLIC_SERVER_URL,
+	// better-auth derives its route-matching base from this URL's path, so the
+	// public auth path must equal the server-side mount (/api/auth everywhere)
+		baseURL: new URL("/api/auth", getServerUrl(PUBLIC_SERVER_URL)).toString(),
 {{/unless}}
 {{#if (eq payments "polar")}}
 	plugins: [polarClient()]
@@ -18664,11 +18916,7 @@ const apiHandler = new OpenAPIHandler(appRouter, {
 });
 {{/if}}
 
-{{#if (eq runtime "node")}}
-new Elysia({ adapter: node() })
-{{else}}
-new Elysia()
-{{/if}}
+const app = {{#if (eq runtime "node")}}new Elysia({ adapter: node() }){{else}}new Elysia(){{/if}}
 	.use(
 		cors({
 			origin: env.CORS_ORIGIN,
@@ -18774,9 +19022,22 @@ new Elysia()
 	})
 {{/if}}
 	.get("/", () => "OK")
+{{#if (eq serverDeploy "vercel")}};
+
+export default app;
+
+// Elysia's default export is not auto-served by Bun or Node, so start a local
+// server outside Vercel while still exporting the app for Vercel functions.
+if (!process.env.VERCEL) {
+	app.listen(3000, () => {
+		console.log("Server is running on http://localhost:3000");
+	});
+}
+{{else}}
 	.listen(3000, () => {
 		console.log("Server is running on http://localhost:3000");
 	});
+{{/if}}
 `],
 	["backend/server/express/src/index.ts.hbs", `import { env } from "@{{projectName}}/env/server";
 {{#if (eq api "trpc")}}
@@ -19347,15 +19608,23 @@ app.get("/", (c) => {
 {{#if (eq runtime "node")}}
 import { serve } from "@hono/node-server";
 
-serve(
-	{
-		fetch: app.fetch,
-		port: 3000,
-	},
-	(info) => {
-		console.log(\`Server is running on http://localhost:\${info.port}\`);
-	}
-);
+{{#if (eq serverDeploy "vercel")}}
+export default app;
+
+if (!process.env.VERCEL) {
+{{/if}}
+	serve(
+		{
+			fetch: app.fetch,
+			port: 3000,
+		},
+		(info) => {
+			console.log(\`Server is running on http://localhost:\${info.port}\`);
+		}
+	);
+{{#if (eq serverDeploy "vercel")}}
+}
+{{/if}}
 {{else}}
 {{#if (eq runtime "bun")}}
 export default app;
@@ -19409,6 +19678,7 @@ lerna-debug.log*
 
 # Better-T-Stack
 .alchemy
+.vercel
 
 # Testing
 coverage
@@ -20278,7 +20548,7 @@ services:
 {{/if}}
     init: true
     ports:
-{{#if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "solid"))}}
+{{#if (or (includes frontend "tanstack-router") (includes frontend "solid"))}}
       - "3001:80"
 {{else}}
       - "3001:3001"
@@ -20325,7 +20595,7 @@ services:
 {{/if}}
 {{/if}}
     healthcheck:
-{{#if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "solid"))}}
+{{#if (or (includes frontend "tanstack-router") (includes frontend "solid"))}}
       test: ["CMD", "wget", "-q", "--spider", "http://localhost:80/"]
 {{else}}
       test:
@@ -20686,30 +20956,14 @@ ENV VITE_CLERK_PUBLISHABLE_KEY=\${VITE_CLERK_PUBLISHABLE_KEY}
 ENV NODE_ENV=production
 RUN cd apps/web && {{packageManager}} run build
 
-FROM nginx:alpine AS runner
-COPY --from=builder /app/apps/web/build/client /usr/share/nginx/html
-COPY apps/web/nginx.conf /etc/nginx/conf.d/default.conf
-EXPOSE 80
-CMD ["nginx", "-g", "daemon off;"]
-`],
-	["deploy/docker/web/react/react-router/nginx.conf", `server {
-    listen 80;
-    server_name _;
-    root /usr/share/nginx/html;
-    index index.html;
-
-    gzip on;
-    gzip_types text/plain text/css application/json application/javascript image/svg+xml;
-
-    location /assets/ {
-        add_header Cache-Control "public, max-age=31536000, immutable";
-    }
-
-    # SPA fallback
-    location / {
-        try_files $uri $uri/ /index.html;
-    }
-}
+FROM node:24-slim AS runner
+WORKDIR /app
+COPY --from=builder /app .
+ENV NODE_ENV=production
+ENV PORT=3001
+ENV HOST=0.0.0.0
+EXPOSE 3001
+CMD ["sh", "-c", "cd apps/web && npm run start"]
 `],
 	["deploy/docker/web/react/tanstack-router/Dockerfile.hbs", `FROM node:24{{#unless (includes addons "vite-plus")}}-slim{{/unless}} AS builder
 {{#if (eq packageManager "bun")}}
@@ -20949,6 +21203,143 @@ EXPOSE 3001
 
 WORKDIR /app/apps/web
 CMD ["node", "build/index.js"]
+`],
+	["deploy/vercel/_vercelignore", `# Local env files must never ship in deployments: Vercel project env vars are
+# the source of truth (bun env:vercel:*), and frameworks like Next.js would
+# otherwise load these localhost values at runtime.
+.env
+.env.*
+**/.env
+**/.env.*
+!**/.env.example
+local.db
+local.db-*
+.alchemy/
+`],
+	["deploy/vercel/scripts/sync-vercel-env.ts.hbs", `import { spawnSync } from "node:child_process";
+import { existsSync, readFileSync } from "node:fs";
+import dotenv from "dotenv";
+
+const DEFAULT_ENVIRONMENT = "preview";
+const VALID_ENVIRONMENTS = new Set(["development", "preview", "production"]);
+const VERCEL_COMMAND = [{{#if (eq packageManager "npm")}}"npx", "vercel"{{else if (eq packageManager "pnpm")}}"pnpm", "exec", "vercel"{{else}}"bunx", "vercel"{{/if}}] as const;
+const DEFAULT_FILES = [
+{{#if (eq webDeploy "vercel")}}
+	"apps/web/.env",
+{{/if}}
+{{#if (and (eq serverDeploy "vercel") (ne backend "self") (ne backend "none") (ne backend "convex"))}}
+	"apps/server/.env",
+{{/if}}
+];
+const SKIP_KEYS = new Set([
+{{#if (or (and (eq webDeploy "vercel") (eq serverDeploy "vercel") (ne backend "self") (ne backend "none") (ne backend "convex")) (and (eq webDeploy "vercel") (eq backend "self")))}}
+	"BETTER_AUTH_URL",
+	"CORS_ORIGIN",
+	"NODE_ENV",
+{{/if}}
+]);
+const OVERRIDE_KEYS = new Map([
+{{#if (and (eq webDeploy "vercel") (eq serverDeploy "vercel") (ne backend "self") (ne backend "none") (ne backend "convex"))}}
+	["NEXT_PUBLIC_SERVER_URL", "/api"],
+	["NUXT_PUBLIC_SERVER_URL", "/api"],
+	["PUBLIC_SERVER_URL", "/api"],
+	["VITE_SERVER_URL", "/api"],
+{{/if}}
+]);
+
+const args = process.argv.slice(2);
+const separatorIndex = args.indexOf("--");
+const scriptArgs = separatorIndex === -1 ? args : args.slice(0, separatorIndex);
+const forwardedArgs = separatorIndex === -1 ? [] : args.slice(separatorIndex + 1);
+
+const environment =
+	scriptArgs[0] && VALID_ENVIRONMENTS.has(scriptArgs[0]) ? scriptArgs[0] : DEFAULT_ENVIRONMENT;
+const remainingArgs = scriptArgs.slice(VALID_ENVIRONMENTS.has(scriptArgs[0] ?? "") ? 1 : 0);
+// Split remaining args into env-file paths and passthrough Vercel CLI flags.
+// A bare token counts as a file only when it exists on disk, so flags and their
+// values (e.g. \`--scope my-team\`) forward correctly regardless of argument order.
+const files: string[] = [];
+const passthroughArgs: string[] = [];
+for (const arg of remainingArgs) {
+	if (!arg.startsWith("-") && existsSync(arg)) {
+		files.push(arg);
+	} else {
+		passthroughArgs.push(arg);
+	}
+}
+const vercelArgs = [...passthroughArgs, ...forwardedArgs];
+const envFiles = files.length > 0 ? files : DEFAULT_FILES;
+
+if (envFiles.length === 0) {
+	console.log("No env files configured for this Vercel stack.");
+	process.exit(0);
+}
+
+const env = new Map<string, string>();
+
+for (const file of envFiles) {
+	if (!existsSync(file)) {
+		console.warn(\`Skipping missing env file: \${file}\`);
+		continue;
+	}
+
+	for (const [key, value] of Object.entries(dotenv.parse(readFileSync(file, "utf8")))) {
+		if (SKIP_KEYS.has(key)) continue;
+		env.set(key, OVERRIDE_KEYS.get(key) ?? value);
+	}
+}
+
+if (env.size === 0) {
+	console.log("No Vercel env vars found to sync.");
+	process.exit(0);
+}
+
+const LOCAL_VALUE_PATTERN = /localhost|127\\.0\\.0\\.1|0\\.0\\.0\\.0|^file:/i;
+const localKeys = [...env.entries()]
+	.filter(([, value]) => LOCAL_VALUE_PATTERN.test(value))
+	.map(([key]) => key);
+if (localKeys.length > 0) {
+	console.warn(
+		\`Warning: \${localKeys.join(", ")} look\${localKeys.length === 1 ? "s" : ""} like local-only value(s). Update them in your .env file(s) and re-run this sync if your deployed app should not point at local endpoints.\`,
+	);
+}
+
+console.log(\`Syncing \${env.size} env var(s) to Vercel \${environment}.\`);
+for (const [key, value] of env.entries()) {
+	const result = spawnSync(
+		VERCEL_COMMAND[0],
+		[
+			...VERCEL_COMMAND.slice(1),
+			"env",
+			"add",
+			key,
+			environment,
+			"--force",
+			"--yes",
+			"--non-interactive",
+			...vercelArgs,
+		],
+		{
+			input: \`\${value}\\n\`,
+			stdio: ["pipe", "inherit", "inherit"],
+			encoding: "utf8",
+			// Windows resolves bunx/npx/pnpm via .cmd shims, which need a shell
+			shell: process.platform === "win32",
+		},
+	);
+
+	if (result.error) {
+		console.error(\`Failed to sync \${key}: \${result.error.message}\`);
+		process.exit(1);
+	}
+
+	if (result.status !== 0) {
+		console.error(\`Failed to sync \${key}\`);
+		process.exit(result.status ?? 1);
+	}
+}
+
+console.log("Vercel env sync complete. Redeploy for changes to take effect.");
 `],
 	["examples/ai/convex/packages/backend/convex/agent.ts.hbs", `import { Agent } from "@convex-dev/agent";
 import { google } from "@ai-sdk/google";
@@ -29645,14 +30036,7 @@ shamefully-hoist=true
 strict-peer-dependencies=false
 {{/if}}`],
 	["extras/bunfig.toml.hbs", `[install]
-{{#if (includes frontend "nuxt")}}
-linker = "hoisted" # Nuxt needs hoisting for its dependency resolver
-{{else}}
-linker = "isolated"
-{{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
 peer = false # Expo native projects declare SDK peers explicitly; this keeps Bun isolated installs deduped for native modules
-{{/if}}
-{{/if}}
 `],
 	["extras/env.d.ts.hbs", `{{#if (eq serverDeploy "cloudflare")}}
 import { type server } from "@{{projectName}}/infra/alchemy.run";
@@ -29678,19 +30062,19 @@ declare module "cloudflare:workers" {
 	["extras/pnpm-workspace.yaml.hbs", `packages:
   - "apps/*"
   - "packages/*"
-{{#if (or (eq runtime "node") (eq webDeploy "cloudflare") (eq serverDeploy "cloudflare") (eq webDeploy "docker") (eq serverDeploy "docker") (eq orm "prisma") (includes addons "lefthook") (includes addons "nx") (includes addons "pwa") (includes addons "turborepo") (includes addons "vite-plus") (includes frontend "react-router") (includes frontend "next") (includes frontend "nuxt"))}}
+{{#if (or (eq runtime "node") (eq webDeploy "cloudflare") (eq serverDeploy "cloudflare") (eq webDeploy "docker") (eq serverDeploy "docker") (eq webDeploy "vercel") (eq serverDeploy "vercel") (eq orm "prisma") (includes addons "lefthook") (includes addons "nx") (includes addons "pwa") (includes addons "turborepo") (includes addons "vite-plus") (includes frontend "react-router") (includes frontend "next") (includes frontend "nuxt"))}}
 
 # pnpm 11 blocks dependency lifecycle scripts unless they are approved here.
 # Entries are scoped to packages this generated stack can pull in.
 allowBuilds:
-{{#if (or (eq runtime "node") (eq webDeploy "cloudflare") (eq serverDeploy "cloudflare") (eq webDeploy "docker") (eq serverDeploy "docker") (includes addons "turborepo") (includes addons "vite-plus") (includes frontend "react-router") (includes frontend "nuxt"))}}
+{{#if (or (eq runtime "node") (eq webDeploy "cloudflare") (eq serverDeploy "cloudflare") (eq webDeploy "docker") (eq serverDeploy "docker") (eq webDeploy "vercel") (eq serverDeploy "vercel") (includes addons "turborepo") (includes addons "vite-plus") (includes frontend "react-router") (includes frontend "nuxt"))}}
   esbuild: true
 {{/if}}
 {{#if (includes frontend "nuxt")}}
   "@parcel/watcher": true
   vue-demi: true
 {{/if}}
-{{#if (or (eq webDeploy "cloudflare") (eq serverDeploy "cloudflare") (eq webDeploy "docker") (includes addons "pwa") (includes frontend "next"))}}
+{{#if (or (eq webDeploy "cloudflare") (eq serverDeploy "cloudflare") (eq webDeploy "docker") (eq webDeploy "vercel") (includes addons "pwa") (includes frontend "next"))}}
   sharp: true
 {{/if}}
 {{#if (or (eq webDeploy "cloudflare") (eq serverDeploy "cloudflare"))}}
@@ -29737,6 +30121,8 @@ pnpm-debug.log*
 import tailwindcss from "@tailwindcss/vite";
 import { defineConfig, envField } from "astro/config";
 {{#if (or (includes addons "electrobun") (includes addons "tauri"))}}
+{{else if (eq webDeploy "vercel")}}
+import vercel from "@astrojs/vercel";
 {{else}}
 import node from "@astrojs/node";
 {{/if}}
@@ -29745,6 +30131,9 @@ import node from "@astrojs/node";
 export default defineConfig({
 {{#if (or (includes addons "electrobun") (includes addons "tauri"))}}
   output: "static",
+{{else if (eq webDeploy "vercel")}}
+  output: "server",
+  adapter: vercel(),
 {{else}}
   output: "server",
   adapter: node({ mode: "standalone" }),
@@ -29905,9 +30294,6 @@ const { title = "{{projectName}}" } = Astro.props;
 `],
 	["frontend/astro/src/pages/index.astro.hbs", `---
 import Layout from "../layouts/Layout.astro";
-{{#if (eq api "orpc")}}
-import { orpc } from "../lib/orpc";
-{{/if}}
 
 const TITLE_TEXT = \`
  ██████╗ ███████╗████████╗████████╗███████╗██████╗
@@ -34429,10 +34815,16 @@ export function ThemeProvider({
 }
 `],
 	["frontend/react/react-router/public/favicon.ico", `[Binary file]`],
-	["frontend/react/react-router/react-router.config.ts", `import type { Config } from "@react-router/dev/config";
+	["frontend/react/react-router/react-router.config.ts.hbs", `import type { Config } from "@react-router/dev/config";
 
 export default {
+{{#if (and (eq webDeploy "vercel") (not (or (includes addons "tauri") (includes addons "electrobun"))))}}
+  // Adopt vercelPreset() once @vercel/react-router supports RR8 (vercel/vercel#16730)
+{{/if}}
+{{#if (or (includes addons "tauri") (includes addons "electrobun"))}}
+  // Desktop addons package static web assets; SSR output cannot be bundled
   ssr: false,
+{{/if}}
   appDirectory: "src",
 } satisfies Config;
 `],
@@ -34910,6 +35302,12 @@ export default defineConfig({
     reactRouter(),
     tsconfigPaths(),
   ],
+{{#if (and (eq webDeploy "vercel") (not (or (includes addons "tauri") (includes addons "electrobun"))))}}
+  ssr: {
+    // Vercel functions have no node_modules; bundle all deps into the server build
+    noExternal: true,
+  },
+{{/if}}
 });
 `],
 	["frontend/react/tanstack-router/index.html.hbs", `<!DOCTYPE html>
@@ -35480,6 +35878,10 @@ export function getRouter() {
 }
 {{else}}
 {{#if (eq api "trpc")}}
+{{#unless (eq backend "self")}}
+{{> getServerUrl}}
+
+{{/unless}}
 function createQueryClient() {
 	return new QueryClient({
 		queryCache: new QueryCache({
@@ -35501,7 +35903,7 @@ function createQueryClient() {
 const trpcClient = createTRPCClient<AppRouter>({
 	links: [
 		httpBatchLink({
-			url: {{#if (eq backend "self")}}"/api/trpc"{{else}}\`\${env.VITE_SERVER_URL}/trpc\`{{/if}},
+			url: {{#if (eq backend "self")}}"/api/trpc"{{else}}\`\${getServerUrl(env.VITE_SERVER_URL)}/trpc\`{{/if}},
 {{#if (eq auth "clerk")}}
 			headers: async () => {
 				const token = await getClerkAuthToken();
@@ -35944,7 +36346,7 @@ function HomeComponent() {
 `],
 	["frontend/react/tanstack-start/vite.config.ts.hbs", `import { defineConfig } from "{{#if (includes addons "vite-plus")}}vite-plus{{else}}vite{{/if}}";
 import { tanstackStart } from "@tanstack/react-start/plugin/vite";
-{{#if (eq webDeploy "docker")}}
+{{#if (or (eq webDeploy "docker") (eq webDeploy "vercel"))}}
 import { nitro } from "nitro/vite";
 {{/if}}
 import tailwindcss from "@tailwindcss/vite";
@@ -35966,12 +36368,17 @@ export default defineConfig({
         },
       },
 {{/if}}),
-{{#if (eq webDeploy "docker")}}
+{{#if (or (eq webDeploy "docker") (eq webDeploy "vercel"))}}
     nitro(),
 {{/if}}
     viteReact(),
   ],
-{{#if (and (eq backend "convex") (eq auth "better-auth"))}}
+{{#if (eq webDeploy "vercel")}}
+  // Bundle all SSR deps: Vercel functions have no node_modules at runtime
+  ssr: {
+    noExternal: true,
+  },
+{{else if (and (eq backend "convex") (eq auth "better-auth"))}}
   ssr: {
     noExternal: ["@convex-dev/better-auth"],
   },
@@ -36767,6 +37174,8 @@ import adapter from '@sveltejs/adapter-static';
 import alchemy from 'alchemy/cloudflare/sveltekit';
 {{else if (eq webDeploy "docker")}}
 import adapter from '@sveltejs/adapter-node';
+{{else if (eq webDeploy "vercel")}}
+import adapter from '@sveltejs/adapter-vercel';
 {{else}}
 import adapter from '@sveltejs/adapter-auto';
 {{/if}}
@@ -36792,6 +37201,8 @@ const config = {
 {{else if (eq webDeploy "docker")}}
 		// adapter-node builds a standalone Node server (run with \`node build/index.js\`).
 		adapter: adapter()
+{{else if (eq webDeploy "vercel")}}
+		adapter: adapter()
 {{else}}
 		// adapter-auto only supports some environments, see https://svelte.dev/docs/kit/adapter-auto for a list.
 		// If your environment is not supported, or you settled on a specific environment, switch out the adapter.
@@ -37022,6 +37433,33 @@ import "dotenv/config";
 import { createEnv } from "@t3-oss/env-core";
 import { z } from "zod";
 
+{{#if (or (eq webDeploy "vercel") (eq serverDeploy "vercel"))}}
+function getVercelOrigin() {
+	const vercelUrl =
+		process.env.VERCEL_ENV === "production"
+			? (process.env.VERCEL_PROJECT_PRODUCTION_URL ?? process.env.VERCEL_URL)
+			: (process.env.VERCEL_URL ?? process.env.VERCEL_PROJECT_PRODUCTION_URL);
+	if (!vercelUrl) return undefined;
+	return vercelUrl.startsWith("http") ? vercelUrl : \`https://\${vercelUrl}\`;
+}
+
+const vercelOrigin = getVercelOrigin();
+
+const runtimeEnv = {
+	...process.env,
+{{#if (eq auth "better-auth")}}
+{{#if (and (eq webDeploy "vercel") (eq serverDeploy "vercel") (ne backend "self"))}}
+		// Public auth base: /api/auth bypasses the rewrite's path strip, so the
+	// same URL works for incoming matching and generated callbacks
+	BETTER_AUTH_URL: process.env.BETTER_AUTH_URL ?? (vercelOrigin ? \`\${vercelOrigin}/api/auth\` : undefined),
+{{else}}
+	BETTER_AUTH_URL: process.env.BETTER_AUTH_URL ?? vercelOrigin,
+{{/if}}
+{{/if}}
+	CORS_ORIGIN: process.env.CORS_ORIGIN ?? vercelOrigin,
+};
+
+{{/if}}
 export const env = createEnv({
 	server: {
 {{#if (ne database "none")}}
@@ -37053,7 +37491,7 @@ export const env = createEnv({
 		CORS_ORIGIN: z.url(),
 		NODE_ENV: z.enum(["development", "production", "test"]).default("development"),
 	},
-	runtimeEnv: process.env,
+	runtimeEnv: {{#if (or (eq webDeploy "vercel") (eq serverDeploy "vercel"))}}runtimeEnv{{else}}process.env{{/if}},
 	skipValidation: !!process.env.SKIP_ENV_VALIDATION,
 	emptyStringAsUndefined: true,
 });
@@ -37070,6 +37508,13 @@ import { createEnv } from "@t3-oss/env-core";
 {{/if}}
 import { z } from "zod";
 
+{{#if (and (eq webDeploy "vercel") (eq serverDeploy "vercel") (ne backend "self") (ne backend "none") (ne backend "convex"))}}
+const serverUrlSchema = z.union([
+	z.url(),
+	z.string().regex(/^\\/(?!\\/)/, "Use an absolute URL or a same-origin path like /api"),
+]);
+
+{{/if}}
 {{#if (eq backend "convex")}}
 const convexUrlSchema = (exampleHost: string) =>
 	z.url().refine((url) => new URL(url).hostname !== exampleHost, {
@@ -37155,7 +37600,7 @@ export const env = createEnv({
 {{else if (ne backend "none")}}
 {{#if (includes frontend "next")}}
 	client: {
-		NEXT_PUBLIC_SERVER_URL: z.url(),
+		NEXT_PUBLIC_SERVER_URL: {{#if (and (eq webDeploy "vercel") (eq serverDeploy "vercel"))}}serverUrlSchema{{else}}z.url(){{/if}},
 {{#if (eq auth "clerk")}}
 		NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY: z.string().min(1),
 {{/if}}
@@ -37168,18 +37613,18 @@ export const env = createEnv({
 	},
 {{else if (includes frontend "nuxt")}}
 	client: {
-		NUXT_PUBLIC_SERVER_URL: z.url(),
+		NUXT_PUBLIC_SERVER_URL: {{#if (and (eq webDeploy "vercel") (eq serverDeploy "vercel"))}}serverUrlSchema{{else}}z.url(){{/if}},
 	},
 {{else if (or (includes frontend "svelte") (includes frontend "astro"))}}
 	clientPrefix: "PUBLIC_",
 	client: {
-		PUBLIC_SERVER_URL: z.url(),
+		PUBLIC_SERVER_URL: {{#if (and (eq webDeploy "vercel") (eq serverDeploy "vercel"))}}serverUrlSchema{{else}}z.url(){{/if}},
 	},
 	runtimeEnv: (import.meta as any).env,
 {{else}}
 	clientPrefix: "VITE_",
 	client: {
-		VITE_SERVER_URL: z.url(),
+		VITE_SERVER_URL: {{#if (and (eq webDeploy "vercel") (eq serverDeploy "vercel"))}}serverUrlSchema{{else}}z.url(){{/if}},
 {{#if (eq auth "clerk")}}
 		VITE_CLERK_PUBLISHABLE_KEY: z.string().min(1),
 {{/if}}
@@ -39642,8 +40087,8 @@ function SuccessPage() {
 </div>
 `]
 ]);
-const TEMPLATE_COUNT = 506;
+const TEMPLATE_COUNT = 507;
 //#endregion
-export { EMBEDDED_TEMPLATES, GeneratorError, Handlebars, TEMPLATE_COUNT, VirtualFileSystem, dependencyVersionMap, generate, generateReproducibleCommand, isBinaryFile, processAddonTemplates, processAddonsDeps, processFileContent, processNxConfig, processPackageConfigs, processTemplateString, processTurboConfig, processVitePlusConfig, transformFilename, writeBtsConfigToVfs };
+export { EMBEDDED_TEMPLATES, GeneratorError, Handlebars, TEMPLATE_COUNT, VirtualFileSystem, dependencyVersionMap, generate, generateReproducibleCommand, isBinaryFile, processAddonTemplates, processAddonsDeps, processFileContent, processNxConfig, processPackageConfigs, processTemplateString, processTurboConfig, processVercelConfig, processVitePlusConfig, transformFilename, writeBtsConfigToVfs };
 
 //# sourceMappingURL=index.mjs.map