@better-t-stack/template-generator 3.27.5 → 3.28.0

package/dist/index.mjs

@@ -694,8 +694,8 @@ function renameDevScriptsForAlchemy(vfs, config) {
 //#region src/utils/add-deps.ts
 const dependencyVersionMap = {
 	typescript: "^6",
-	"better-auth": "1.5.5",
-	"@better-auth/expo": "1.5.5",
+	"better-auth": "1.6.9",
+	"@better-auth/expo": "1.6.9",
 	"@clerk/backend": "^3.2.1",
 	"@clerk/express": "^2.0.5",
 	"@clerk/fastify": "^3.1.3",
@@ -770,13 +770,14 @@ const dependencyVersionMap = {
 	"@trpc/server": "^11.16.0",
 	"@trpc/client": "^11.16.0",
 	next: "^16.2.0",
+	nitro: "^3.0.260429-beta",
 	convex: "^1.33.1",
 	"@convex-dev/react-query": "^0.1.0",
 	"@convex-dev/agent": "^0.3.2",
 	"convex-svelte": "^0.0.12",
 	"convex-nuxt": "0.1.5",
 	"convex-vue": "^0.1.5",
-	"@convex-dev/better-auth": "^0.11.4",
+	"@convex-dev/better-auth": "^0.12.1",
 	"@tanstack/svelte-query": "^5.85.3",
 	"@tanstack/svelte-query-devtools": "^5.85.3",
 	"@tanstack/vue-query-devtools": "^6.1.5",
@@ -806,7 +807,8 @@ const dependencyVersionMap = {
 	"@t3-oss/env-nextjs": "^0.13.1",
 	"@t3-oss/env-nuxt": "^0.13.1",
 	"@polar-sh/better-auth": "^1.8.3",
-	"@polar-sh/sdk": "^0.42.2"
+	"@polar-sh/sdk": "^0.42.2",
+	evlog: "^2.14.1"
 };
 /**
 * Add dependencies to a package.json file in the VFS
@@ -838,6 +840,13 @@ function processAddonsDeps(vfs, config) {
 	const hasViteReactFrontend = config.frontend.includes("react-router") || config.frontend.includes("tanstack-router");
 	const hasSolidFrontend = config.frontend.includes("solid");
 	const hasPwaCompatibleFrontend = hasViteReactFrontend || hasSolidFrontend;
+	const hasEvlogWebServer = config.frontend.some((frontend) => [
+		"next",
+		"nuxt",
+		"svelte",
+		"tanstack-start",
+		"astro"
+	].includes(frontend));
 	if (config.addons.includes("turborepo")) addPackageDependency({
 		vfs,
 		packagePath: "package.json",
@@ -848,6 +857,20 @@ function processAddonsDeps(vfs, config) {
 		packagePath: "package.json",
 		devDependencies: ["nx"]
 	});
+	if (config.addons.includes("evlog")) {
+		const serverPkgPath = "apps/server/package.json";
+		if (vfs.exists(serverPkgPath) && config.backend !== "self" && config.backend !== "none") addPackageDependency({
+			vfs,
+			packagePath: serverPkgPath,
+			dependencies: ["evlog"]
+		});
+		const webPkgPath = "apps/web/package.json";
+		if (vfs.exists(webPkgPath) && hasEvlogWebServer) addPackageDependency({
+			vfs,
+			packagePath: webPkgPath,
+			dependencies: config.frontend.includes("tanstack-start") ? ["evlog", "nitro"] : ["evlog"]
+		});
+	}
 	if (config.addons.includes("pwa") && hasPwaCompatibleFrontend) {
 		const webPkgPath = "apps/web/package.json";
 		if (vfs.exists(webPkgPath)) {
@@ -935,6 +958,49 @@ function processNuxtAlchemy(vfs) {
 		moduleSpecifier: "alchemy/cloudflare/nuxt",
 		defaultImport: "alchemy"
 	});
+	if (!sourceFile.getImportDeclarations().some((decl) => decl.getModuleSpecifierValue() === "node:fs")) sourceFile.addImportDeclaration({
+		moduleSpecifier: "node:fs",
+		namedImports: ["existsSync"]
+	});
+	if (!sourceFile.getImportDeclarations().some((decl) => decl.getModuleSpecifierValue() === "node:url")) sourceFile.addImportDeclaration({
+		moduleSpecifier: "node:url",
+		namedImports: ["fileURLToPath"]
+	});
+	if (!sourceFile.getVariableDeclaration("alchemyConfigPath")) {
+		const firstExport = sourceFile.getStatements().findIndex((statement) => Node.isExportAssignment(statement));
+		sourceFile.insertStatements(firstExport === -1 ? sourceFile.getStatements().length : firstExport, `const alchemyConfigPath = fileURLToPath(new URL("./.alchemy/local/wrangler.jsonc", import.meta.url));
+const hasAlchemyConfig = existsSync(alchemyConfigPath);`);
+	}
+	if (!sourceFile.getVariableDeclaration("cloudflareWorkersShimPath")) {
+		const firstExport = sourceFile.getStatements().findIndex((statement) => Node.isExportAssignment(statement));
+		sourceFile.insertStatements(firstExport === -1 ? sourceFile.getStatements().length : firstExport, `const cloudflareWorkersShimPath = fileURLToPath(new URL("../../packages/env/src/cloudflare-local.ts", import.meta.url));`);
+	}
+	if (!sourceFile.getVariableDeclaration("isNuxtPrepare")) {
+		const firstExport = sourceFile.getStatements().findIndex((statement) => Node.isExportAssignment(statement));
+		sourceFile.insertStatements(firstExport === -1 ? sourceFile.getStatements().length : firstExport, `const isNuxtPrepare =
+  process.env.npm_lifecycle_event === "postinstall" ||
+  process.env.npm_lifecycle_script === "nuxt prepare" ||
+  process.argv.includes("prepare");`);
+	}
+	if (!sourceFile.getVariableDeclaration("shouldUseAlchemy")) {
+		const firstExport = sourceFile.getStatements().findIndex((statement) => Node.isExportAssignment(statement));
+		sourceFile.insertStatements(firstExport === -1 ? sourceFile.getStatements().length : firstExport, `const shouldUseAlchemy = !isNuxtPrepare && hasAlchemyConfig;`);
+	}
+	if (!sourceFile.getVariableDeclaration("cloudflareWorkersAlias")) {
+		const firstExport = sourceFile.getStatements().findIndex((statement) => Node.isExportAssignment(statement));
+		sourceFile.insertStatements(firstExport === -1 ? sourceFile.getStatements().length : firstExport, `const cloudflareWorkersAlias = shouldUseAlchemy
+  ? {}
+  : {
+      "cloudflare:workers": cloudflareWorkersShimPath,
+    };`);
+	}
+	if (!sourceFile.getVariableDeclaration("isNuxtDev")) {
+		const firstExport = sourceFile.getStatements().findIndex((statement) => Node.isExportAssignment(statement));
+		sourceFile.insertStatements(firstExport === -1 ? sourceFile.getStatements().length : firstExport, `const isNuxtDev =
+  !isNuxtPrepare &&
+  process.env.NODE_ENV !== "production" &&
+  !process.argv.some((arg) => arg === "build" || arg === "generate");`);
+	}
 	const exportAssignment = sourceFile.getExportAssignment((d) => !d.isExportEquals());
 	if (!exportAssignment) return;
 	const defineConfigCall = exportAssignment.getExpression();
@@ -946,11 +1012,20 @@ function processNuxtAlchemy(vfs) {
 			name: "nitro",
 			initializer: `{
     preset: "cloudflare-module",
-    cloudflare: alchemy(),
+    ...(shouldUseAlchemy ? { cloudflare: alchemy({ dev: { configPath: alchemyConfigPath } }) } : {}),
+    alias: cloudflareWorkersAlias,
     prerender: {
       routes: ["/"],
       autoSubfolderIndex: false,
     },
+  }`
+		});
+		if (!configObject.getProperty("vite")) configObject.addPropertyAssignment({
+			name: "vite",
+			initializer: `{
+    resolve: {
+      alias: cloudflareWorkersAlias,
+    },
   }`
 		});
 		const modulesProperty = configObject.getProperty("modules");
@@ -977,15 +1052,27 @@ function processSvelteAlchemy(vfs) {
 			quoteKind: QuoteKind.Single
 		}
 	}).createSourceFile("svelte.config.js", content);
-	const adapterImport = sourceFile.getImportDeclarations().find((imp) => imp.getModuleSpecifierValue().includes("@sveltejs/adapter"));
-	if (adapterImport) {
-		adapterImport.setModuleSpecifier("alchemy/cloudflare/sveltekit");
-		adapterImport.removeDefaultImport();
-		adapterImport.setDefaultImport("alchemy");
-	} else sourceFile.insertImportDeclaration(0, {
+	if (!sourceFile.getImportDeclarations().some((imp) => imp.getModuleSpecifierValue() === "alchemy/cloudflare/sveltekit")) sourceFile.insertImportDeclaration(0, {
 		moduleSpecifier: "alchemy/cloudflare/sveltekit",
 		defaultImport: "alchemy"
 	});
+	if (!sourceFile.getImportDeclarations().some((imp) => imp.getModuleSpecifierValue() === "@sveltejs/adapter-auto")) sourceFile.insertImportDeclaration(0, {
+		moduleSpecifier: "@sveltejs/adapter-auto",
+		defaultImport: "adapter"
+	});
+	if (!sourceFile.getImportDeclarations().some((decl) => decl.getModuleSpecifierValue() === "node:fs")) sourceFile.insertImportDeclaration(0, {
+		moduleSpecifier: "node:fs",
+		namedImports: ["existsSync"]
+	});
+	if (!sourceFile.getImportDeclarations().some((decl) => decl.getModuleSpecifierValue() === "node:url")) sourceFile.insertImportDeclaration(0, {
+		moduleSpecifier: "node:url",
+		namedImports: ["fileURLToPath"]
+	});
+	if (!sourceFile.getVariableDeclaration("alchemyConfigPath")) {
+		const configVariableIndex = sourceFile.getStatements().findIndex((statement) => Node.isVariableStatement(statement) && statement.getDeclarationList().getDeclarations().some((decl) => decl.getName() === "config"));
+		sourceFile.insertStatements(configVariableIndex === -1 ? sourceFile.getStatements().length : configVariableIndex, `const alchemyConfigPath = fileURLToPath(new URL("./.alchemy/local/wrangler.jsonc", import.meta.url));
+const shouldUseAlchemy = existsSync(alchemyConfigPath);`);
+	}
 	const configVariable = sourceFile.getVariableDeclaration("config");
 	if (configVariable) {
 		const initializer = configVariable.getInitializer();
@@ -995,13 +1082,7 @@ function processSvelteAlchemy(vfs) {
 				const kitInitializer = kitProperty.getInitializer();
 				if (Node.isObjectLiteralExpression(kitInitializer)) {
 					const adapterProperty = kitInitializer.getProperty("adapter");
-					if (adapterProperty && Node.isPropertyAssignment(adapterProperty)) {
-						const adapterInitializer = adapterProperty.getInitializer();
-						if (Node.isCallExpression(adapterInitializer)) {
-							const expression = adapterInitializer.getExpression();
-							if (Node.isIdentifier(expression) && expression.getText() === "adapter") expression.replaceWithText("alchemy");
-						}
-					}
+					if (adapterProperty && Node.isPropertyAssignment(adapterProperty)) adapterProperty.setInitializer("shouldUseAlchemy ? alchemy({ platformProxy: { configPath: alchemyConfigPath } }) : adapter()");
 				}
 			}
 		}
@@ -1023,6 +1104,31 @@ function processTanStackStartAlchemy(vfs) {
 		moduleSpecifier: "alchemy/cloudflare/tanstack-start",
 		defaultImport: "alchemy"
 	});
+	if (!sourceFile.getImportDeclarations().some((decl) => decl.getModuleSpecifierValue() === "node:fs")) sourceFile.addImportDeclaration({
+		moduleSpecifier: "node:fs",
+		namedImports: ["existsSync"]
+	});
+	if (!sourceFile.getImportDeclarations().some((decl) => decl.getModuleSpecifierValue() === "node:url")) sourceFile.addImportDeclaration({
+		moduleSpecifier: "node:url",
+		namedImports: ["fileURLToPath"]
+	});
+	if (!sourceFile.getVariableDeclaration("alchemyConfigPath")) {
+		const firstExport = sourceFile.getStatements().findIndex((statement) => Node.isExportAssignment(statement));
+		sourceFile.insertStatements(firstExport === -1 ? sourceFile.getStatements().length : firstExport, `const alchemyConfigPath = fileURLToPath(new URL("./.alchemy/local/wrangler.jsonc", import.meta.url));
+const shouldUseAlchemy = existsSync(alchemyConfigPath);`);
+	}
+	if (!sourceFile.getVariableDeclaration("cloudflareWorkersShimPath")) {
+		const firstExport = sourceFile.getStatements().findIndex((statement) => Node.isExportAssignment(statement));
+		sourceFile.insertStatements(firstExport === -1 ? sourceFile.getStatements().length : firstExport, `const cloudflareWorkersShimPath = fileURLToPath(new URL("../../packages/env/src/cloudflare-local.ts", import.meta.url));`);
+	}
+	if (!sourceFile.getVariableDeclaration("cloudflareWorkersAlias")) {
+		const firstExport = sourceFile.getStatements().findIndex((statement) => Node.isExportAssignment(statement));
+		sourceFile.insertStatements(firstExport === -1 ? sourceFile.getStatements().length : firstExport, `const cloudflareWorkersAlias = shouldUseAlchemy
+  ? {}
+  : {
+      "cloudflare:workers": cloudflareWorkersShimPath,
+    };`);
+	}
 	const exportAssignment = sourceFile.getExportAssignment((d) => !d.isExportEquals());
 	if (!exportAssignment) return;
 	const defineConfigCall = exportAssignment.getExpression();
@@ -1034,11 +1140,22 @@ function processTanStackStartAlchemy(vfs) {
 		if (pluginsProperty && Node.isPropertyAssignment(pluginsProperty)) {
 			const initializer = pluginsProperty.getInitializer();
 			if (Node.isArrayLiteralExpression(initializer)) {
-				if (!initializer.getElements().some((el) => el.getText().includes("alchemy("))) initializer.addElement("alchemy()");
+				if (!initializer.getElements().some((el) => el.getText().includes("alchemy("))) initializer.addElement("...(shouldUseAlchemy ? [alchemy({ configPath: alchemyConfigPath })] : [])");
 			}
 		} else configObject.addPropertyAssignment({
 			name: "plugins",
-			initializer: "[alchemy()]"
+			initializer: "[...(shouldUseAlchemy ? [alchemy({ configPath: alchemyConfigPath })] : [])]"
+		});
+		const resolveProperty = configObject.getProperty("resolve");
+		if (resolveProperty && Node.isPropertyAssignment(resolveProperty)) {
+			const initializer = resolveProperty.getInitializer();
+			if (Node.isObjectLiteralExpression(initializer) && !initializer.getProperty("alias")) initializer.addPropertyAssignment({
+				name: "alias",
+				initializer: "cloudflareWorkersAlias"
+			});
+		} else if (!resolveProperty) configObject.addPropertyAssignment({
+			name: "resolve",
+			initializer: "{ alias: cloudflareWorkersAlias }"
 		});
 	}
 	vfs.writeFile(viteConfigPath, sourceFile.getFullText());
@@ -1054,15 +1171,39 @@ function processAstroAlchemy(vfs) {
 			quoteKind: QuoteKind.Double
 		}
 	}).createSourceFile("astro.config.mjs", content);
-	const nodeAdapterImport = sourceFile.getImportDeclarations().find((imp) => imp.getModuleSpecifierValue() === "@astrojs/node");
-	if (nodeAdapterImport) {
-		nodeAdapterImport.setModuleSpecifier("alchemy/cloudflare/astro");
-		nodeAdapterImport.removeDefaultImport();
-		nodeAdapterImport.setDefaultImport("alchemy");
-	} else sourceFile.insertImportDeclaration(0, {
+	if (!sourceFile.getImportDeclarations().some((imp) => imp.getModuleSpecifierValue() === "alchemy/cloudflare/astro")) sourceFile.insertImportDeclaration(0, {
 		moduleSpecifier: "alchemy/cloudflare/astro",
 		defaultImport: "alchemy"
 	});
+	if (!sourceFile.getImportDeclarations().some((imp) => imp.getModuleSpecifierValue() === "@astrojs/node")) sourceFile.insertImportDeclaration(0, {
+		moduleSpecifier: "@astrojs/node",
+		defaultImport: "node"
+	});
+	if (!sourceFile.getImportDeclarations().some((decl) => decl.getModuleSpecifierValue() === "node:fs")) sourceFile.insertImportDeclaration(0, {
+		moduleSpecifier: "node:fs",
+		namedImports: ["existsSync"]
+	});
+	if (!sourceFile.getImportDeclarations().some((decl) => decl.getModuleSpecifierValue() === "node:url")) sourceFile.insertImportDeclaration(0, {
+		moduleSpecifier: "node:url",
+		namedImports: ["fileURLToPath"]
+	});
+	if (!sourceFile.getVariableDeclaration("alchemyConfigPath")) {
+		const firstExport = sourceFile.getStatements().findIndex((statement) => Node.isExportAssignment(statement));
+		sourceFile.insertStatements(firstExport === -1 ? sourceFile.getStatements().length : firstExport, `const alchemyConfigPath = fileURLToPath(new URL("./.alchemy/local/wrangler.jsonc", import.meta.url));
+const shouldUseAlchemy = existsSync(alchemyConfigPath);`);
+	}
+	if (!sourceFile.getVariableDeclaration("cloudflareWorkersShimPath")) {
+		const firstExport = sourceFile.getStatements().findIndex((statement) => Node.isExportAssignment(statement));
+		sourceFile.insertStatements(firstExport === -1 ? sourceFile.getStatements().length : firstExport, `const cloudflareWorkersShimPath = fileURLToPath(new URL("../../packages/env/src/cloudflare-local.ts", import.meta.url));`);
+	}
+	if (!sourceFile.getVariableDeclaration("cloudflareWorkersAlias")) {
+		const firstExport = sourceFile.getStatements().findIndex((statement) => Node.isExportAssignment(statement));
+		sourceFile.insertStatements(firstExport === -1 ? sourceFile.getStatements().length : firstExport, `const cloudflareWorkersAlias = shouldUseAlchemy
+  ? {}
+  : {
+      "cloudflare:workers": cloudflareWorkersShimPath,
+    };`);
+	}
 	const exportAssignment = sourceFile.getExportAssignment((d) => !d.isExportEquals());
 	if (exportAssignment) {
 		const defineConfigCall = exportAssignment.getExpression();
@@ -1070,7 +1211,27 @@ function processAstroAlchemy(vfs) {
 			const configObject = defineConfigCall.getArguments()[0];
 			if (Node.isObjectLiteralExpression(configObject)) {
 				const adapterProperty = configObject.getProperty("adapter");
-				if (adapterProperty && Node.isPropertyAssignment(adapterProperty)) adapterProperty.setInitializer("alchemy()");
+				if (adapterProperty && Node.isPropertyAssignment(adapterProperty)) adapterProperty.setInitializer("shouldUseAlchemy ? alchemy({ platformProxy: { configPath: alchemyConfigPath } }) : node({ mode: \"standalone\" })");
+				const viteProperty = configObject.getProperty("vite");
+				if (viteProperty && Node.isPropertyAssignment(viteProperty)) {
+					const viteInitializer = viteProperty.getInitializer();
+					if (Node.isObjectLiteralExpression(viteInitializer)) {
+						const resolveProperty = viteInitializer.getProperty("resolve");
+						if (resolveProperty && Node.isPropertyAssignment(resolveProperty)) {
+							const resolveInitializer = resolveProperty.getInitializer();
+							if (Node.isObjectLiteralExpression(resolveInitializer) && !resolveInitializer.getProperty("alias")) resolveInitializer.addPropertyAssignment({
+								name: "alias",
+								initializer: "cloudflareWorkersAlias"
+							});
+						} else if (!resolveProperty) viteInitializer.addPropertyAssignment({
+							name: "resolve",
+							initializer: "{ alias: cloudflareWorkersAlias }"
+						});
+					}
+				} else if (!viteProperty) configObject.addPropertyAssignment({
+					name: "vite",
+					initializer: "{ resolve: { alias: cloudflareWorkersAlias } }"
+				});
 			}
 		}
 	}
@@ -1327,7 +1488,7 @@ function addConvexDeps(vfs, frontend, frontendType) {
 }
 //#endregion
 //#region src/processors/auth-deps.ts
-const CONVEX_BETTER_AUTH_VERSION = "1.5.3";
+const CONVEX_BETTER_AUTH_VERSION = "1.6.9";
 function processAuthDeps(vfs, config) {
 	const { auth, backend } = config;
 	if (!auth || auth === "none") return;
@@ -1695,9 +1856,9 @@ function processDatabaseDeps(vfs, config) {
 	const dbPkgPath = "packages/db/package.json";
 	const webPkgPath = "apps/web/package.json";
 	if (!vfs.exists(dbPkgPath)) return;
-	const webExists = vfs.exists(webPkgPath);
-	if (orm === "prisma") processPrismaDeps(vfs, config, dbPkgPath, webPkgPath, webExists);
-	else if (orm === "drizzle") processDrizzleDeps(vfs, config, dbPkgPath, webPkgPath, webExists);
+	const webNeedsDbRuntime = backend === "self" && vfs.exists(webPkgPath);
+	if (orm === "prisma") processPrismaDeps(vfs, config, dbPkgPath, webPkgPath, webNeedsDbRuntime);
+	else if (orm === "drizzle") processDrizzleDeps(vfs, config, dbPkgPath, webPkgPath, webNeedsDbRuntime);
 	else if (orm === "mongoose") addPackageDependency({
 		vfs,
 		packagePath: dbPkgPath,
@@ -1849,6 +2010,7 @@ function processDeployDeps(vfs, config) {
 		else if (frontend.includes("astro")) addPackageDependency({
 			vfs,
 			packagePath: webPkgPath,
+			dependencies: ["@astrojs/node"],
 			devDependencies: [
 				"alchemy",
 				"@astrojs/cloudflare",
@@ -2020,9 +2182,10 @@ function buildClientVars(frontend, backend, auth) {
 }
 function buildNativeVars(frontend, backend, auth) {
 	const hasAstro = frontend.includes("astro");
+	const hasSvelte = frontend.includes("svelte");
 	let envVarName = "EXPO_PUBLIC_SERVER_URL";
 	let serverUrl = "http://localhost:3000";
-	if (backend === "self") serverUrl = hasAstro ? "http://localhost:4321" : "http://localhost:3001";
+	if (backend === "self") serverUrl = hasSvelte ? "http://localhost:5173" : hasAstro ? "http://localhost:4321" : "http://localhost:3001";
 	if (backend === "convex") {
 		envVarName = "EXPO_PUBLIC_CONVEX_URL";
 		serverUrl = "https://<YOUR_CONVEX_URL>";
@@ -2135,7 +2298,7 @@ function buildServerVars(backend, frontend, auth, api, database, dbSetup, runtim
 		},
 		{
 			key: "BETTER_AUTH_URL",
-			value: backend === "self" ? hasAstro ? "http://localhost:4321" : "http://localhost:3001" : "http://localhost:3000",
+			value: backend === "self" ? hasSvelte ? "http://localhost:5173" : hasAstro ? "http://localhost:4321" : "http://localhost:3001" : "http://localhost:3000",
 			condition: hasBetterAuth
 		},
 		{
@@ -2665,7 +2828,7 @@ ${packageManagerRunCmd} dev
 ${generateRunningInstructions(frontend, backend, webPort, hasNative, isConvex)}
 ${generateReactUiSection(hasReactWeb, projectName)}
 ${addons.includes("pwa") && hasReactRouter ? "\n## PWA Support with React Router v7\n\nThere is a known compatibility issue between VitePWA and React Router v7.\nSee: https://github.com/vite-pwa/vite-plugin-pwa/issues/809\n" : ""}
-${generateDeploymentCommands(packageManagerRunCmd, webDeploy, serverDeploy)}
+${generateDeploymentCommands(packageManagerRunCmd, webDeploy, serverDeploy, backend)}
 ${generateGitHooksSection(packageManagerRunCmd, addons)}
 
 ## Project Structure
@@ -2963,12 +3126,11 @@ function generateScriptsList(packageManagerRunCmd, config, hasNative) {
 - \`cd apps/docs && ${packageManagerRunCmd} build\`: Build documentation site`;
 	return scripts;
 }
-function generateDeploymentCommands(packageManagerRunCmd, webDeploy, serverDeploy) {
+function generateDeploymentCommands(packageManagerRunCmd, webDeploy, serverDeploy, backend) {
 	if (webDeploy !== "cloudflare" && serverDeploy !== "cloudflare") return "";
 	const lines = ["## Deployment (Cloudflare via Alchemy)"];
-	if (webDeploy === "cloudflare" && serverDeploy !== "cloudflare") lines.push(`- Dev: cd apps/web && ${packageManagerRunCmd} alchemy dev`, `- Deploy: cd apps/web && ${packageManagerRunCmd} deploy`, `- Destroy: cd apps/web && ${packageManagerRunCmd} destroy`);
-	if (serverDeploy === "cloudflare" && webDeploy !== "cloudflare") lines.push(`- Dev: cd apps/server && ${packageManagerRunCmd} dev`, `- Deploy: cd apps/server && ${packageManagerRunCmd} deploy`, `- Destroy: cd apps/server && ${packageManagerRunCmd} destroy`);
-	if (webDeploy === "cloudflare" && serverDeploy === "cloudflare") lines.push(`- Dev: ${packageManagerRunCmd} dev`, `- Deploy: ${packageManagerRunCmd} deploy`, `- Destroy: ${packageManagerRunCmd} destroy`);
+	const targetLabel = webDeploy === "cloudflare" && (serverDeploy === "cloudflare" || backend === "self") ? "web + server" : webDeploy === "cloudflare" ? "web" : "server";
+	lines.push(`- Target: ${targetLabel}`, `- Dev: ${packageManagerRunCmd} dev`, `- Deploy: ${packageManagerRunCmd} deploy`, `- Destroy: ${packageManagerRunCmd} destroy`);
 	lines.push("", "For more details, see the guide on [Deploying to Cloudflare with Alchemy](https://www.better-t-stack.dev/docs/guides/cloudflare-alchemy).");
 	return `${lines.join("\n")}\n`;
 }
@@ -3223,7 +3385,7 @@ function processWorkspaceDeps(vfs, config) {
 			...uiDep
 		};
 		if (api !== "none" && packages.api) webPackageDeps[`@${projectName}/api`] = workspaceVersion;
-		if (auth !== "none" && packages.auth) webPackageDeps[`@${projectName}/auth`] = workspaceVersion;
+		if (backend === "self" && auth !== "none" && packages.auth) webPackageDeps[`@${projectName}/auth`] = workspaceVersion;
 		if (backend === "convex" && packages.backend) webPackageDeps[`@${projectName}/backend`] = workspaceVersion;
 		addPackageDependency({
 			vfs,
@@ -3409,8 +3571,13 @@ async function processApiTemplates(vfs, templates, config) {
 		processTemplatesFromPrefix(vfs, templates, `api/${config.api}/fullstack/nuxt`, "apps/web", config);
 		processSingleTemplate(vfs, templates, `api/${config.api}/web/nuxt/app/plugins/vue-query.ts`, "apps/web/app/plugins/vue-query.ts", config);
 	} else processTemplatesFromPrefix(vfs, templates, `api/${config.api}/web/nuxt`, "apps/web", config);
-	else if (hasSvelteWeb && config.api === "orpc") processTemplatesFromPrefix(vfs, templates, `api/${config.api}/web/svelte`, "apps/web", config);
-	else if (hasSolidWeb && config.api === "orpc") processTemplatesFromPrefix(vfs, templates, `api/${config.api}/web/solid`, "apps/web", config);
+	else if (hasSvelteWeb && config.api === "orpc") {
+		processTemplatesFromPrefix(vfs, templates, `api/${config.api}/web/svelte`, "apps/web", config);
+		if (config.backend === "self") {
+			processTemplatesFromPrefix(vfs, templates, `api/${config.api}/fullstack/svelte`, "apps/web", config);
+			if (config.auth !== "better-auth") vfs.writeFile("apps/web/src/hooks.server.ts", "import \"./lib/orpc.server\";\n");
+		}
+	} else if (hasSolidWeb && config.api === "orpc") processTemplatesFromPrefix(vfs, templates, `api/${config.api}/web/solid`, "apps/web", config);
 	else if (hasAstroWeb && config.api === "orpc") {
 		processTemplatesFromPrefix(vfs, templates, `api/${config.api}/web/astro`, "apps/web", config);
 		if (config.backend === "self") processTemplatesFromPrefix(vfs, templates, `api/${config.api}/fullstack/astro`, "apps/web", config);
@@ -3442,7 +3609,10 @@ async function processEnvPackage(vfs, templates, config) {
 	processSingleTemplate(vfs, templates, "packages/env/tsconfig.json", "packages/env/tsconfig.json", config);
 	if (hasWebFrontend) processSingleTemplate(vfs, templates, "packages/env/src/web.ts", "packages/env/src/web.ts", config);
 	if (hasNative) processSingleTemplate(vfs, templates, "packages/env/src/native.ts", "packages/env/src/native.ts", config);
-	if (config.backend !== "none" && config.backend !== "convex") processSingleTemplate(vfs, templates, "packages/env/src/server.ts", "packages/env/src/server.ts", config);
+	if (config.backend !== "none" && config.backend !== "convex") {
+		processSingleTemplate(vfs, templates, "packages/env/src/server.ts", "packages/env/src/server.ts", config);
+		if (config.serverDeploy === "cloudflare" || config.backend === "self" && config.webDeploy === "cloudflare") processSingleTemplate(vfs, templates, "packages/env/src/cloudflare-local.ts", "packages/env/src/cloudflare-local.ts", config);
+	}
 }
 async function processUiPackage(vfs, templates, config) {
 	if (!config.frontend.some((f) => [
@@ -3534,8 +3704,10 @@ async function processAuthTemplates(vfs, templates, config) {
 	} else if (hasNuxtWeb) {
 		if (config.backend === "self") processTemplatesFromPrefix(vfs, templates, `auth/${authProvider}/fullstack/nuxt`, "apps/web", config);
 		processTemplatesFromPrefix(vfs, templates, `auth/${authProvider}/web/nuxt`, "apps/web", config);
-	} else if (hasSvelteWeb) processTemplatesFromPrefix(vfs, templates, `auth/${authProvider}/web/svelte`, "apps/web", config);
-	else if (hasSolidWeb) processTemplatesFromPrefix(vfs, templates, `auth/${authProvider}/web/solid`, "apps/web", config);
+	} else if (hasSvelteWeb) {
+		if (config.backend === "self" && authProvider === "better-auth") processTemplatesFromPrefix(vfs, templates, `auth/${authProvider}/fullstack/svelte`, "apps/web", config);
+		processTemplatesFromPrefix(vfs, templates, `auth/${authProvider}/web/svelte`, "apps/web", config);
+	} else if (hasSolidWeb) processTemplatesFromPrefix(vfs, templates, `auth/${authProvider}/web/solid`, "apps/web", config);
 	else if (hasAstroWeb) {
 		if (config.backend === "self" && authProvider === "better-auth") processTemplatesFromPrefix(vfs, templates, `auth/${authProvider}/fullstack/astro`, "apps/web", config);
 		processTemplatesFromPrefix(vfs, templates, `auth/${authProvider}/web/astro`, "apps/web", config);
@@ -3634,8 +3806,10 @@ async function processExampleTemplates(vfs, templates, config) {
 		} else if (hasNuxtWeb) {
 			if (config.backend === "self") processTemplatesFromPrefix(vfs, templates, `examples/${example}/fullstack/nuxt`, "apps/web", config);
 			processTemplatesFromPrefix(vfs, templates, `examples/${example}/web/nuxt`, "apps/web", config);
-		} else if (hasSvelteWeb) processTemplatesFromPrefix(vfs, templates, `examples/${example}/web/svelte`, "apps/web", config);
-		else if (hasSolidWeb) processTemplatesFromPrefix(vfs, templates, `examples/${example}/web/solid`, "apps/web", config);
+		} else if (hasSvelteWeb) {
+			if (config.backend === "self") processTemplatesFromPrefix(vfs, templates, `examples/${example}/fullstack/svelte`, "apps/web", config);
+			processTemplatesFromPrefix(vfs, templates, `examples/${example}/web/svelte`, "apps/web", config);
+		} else if (hasSolidWeb) processTemplatesFromPrefix(vfs, templates, `examples/${example}/web/solid`, "apps/web", config);
 		else if (hasAstroWeb) processTemplatesFromPrefix(vfs, templates, `examples/${example}/web/astro`, "apps/web", config);
 		if (hasNative) {
 			let nativeFramework = "";
@@ -4098,6 +4272,9 @@ export default defineConfig({
 });
 `],
 	["api/orpc/fullstack/astro/src/pages/rpc/[...rest].ts.hbs", `import type { APIRoute } from "astro";
+import { OpenAPIHandler } from "@orpc/openapi/fetch";
+import { OpenAPIReferencePlugin } from "@orpc/openapi/plugins";
+import { ZodToJsonSchemaConverter } from "@orpc/zod/zod4";
 import { RPCHandler } from "@orpc/server/fetch";
 import { onError } from "@orpc/server";
 import { appRouter } from "@{{projectName}}/api/routers/index";
@@ -4111,17 +4288,37 @@ const handler = new RPCHandler(appRouter, {
   ],
 });
 
+const apiHandler = new OpenAPIHandler(appRouter, {
+  plugins: [
+    new OpenAPIReferencePlugin({
+      schemaConverters: [new ZodToJsonSchemaConverter()],
+    }),
+  ],
+  interceptors: [
+    onError((error) => {
+      console.error(error);
+    }),
+  ],
+});
+
 export const prerender = false;
 
 export const ALL: APIRoute = async ({ request }) => {
   const context = await createContext({ headers: request.headers });
 
-  const { response } = await handler.handle(request, {
+  const rpcResult = await handler.handle(request, {
     prefix: "/rpc",
     context,
   });
+  if (rpcResult.response) return rpcResult.response;
 
-  return response ?? new Response("Not found", { status: 404 });
+  const apiResult = await apiHandler.handle(request, {
+    prefix: "/rpc/api-reference",
+    context,
+  });
+  if (apiResult.response) return apiResult.response;
+
+  return new Response("Not found", { status: 404 });
 };
 `],
 	["api/orpc/fullstack/next/src/app/api/rpc/[[...rest]]/route.ts.hbs", `import { createContext } from "@{{projectName}}/api/context";
@@ -4279,6 +4476,105 @@ export default defineEventHandler(async (event) => {
 });
 `],
 	["api/orpc/fullstack/nuxt/server/routes/rpc/index.ts.hbs", `export { default } from "./[...]";
+`],
+	["api/orpc/fullstack/svelte/src/lib/orpc.server.ts.hbs", `import { getRequestEvent } from "$app/server";
+import { createContext } from "@{{projectName}}/api/context";
+import { appRouter, type AppRouterClient } from "@{{projectName}}/api/routers/index";
+{{#if (eq webDeploy "cloudflare")}}
+import { env as localEnv } from "@{{projectName}}/env/server";
+{{/if}}
+import { createRouterClient } from "@orpc/server";
+
+if (typeof window !== "undefined") {
+	throw new Error("This file should only be imported on the server.");
+}
+
+const serverClient: AppRouterClient = createRouterClient(appRouter, {
+	context: async () => {
+		const event = getRequestEvent();
+{{#if (eq webDeploy "cloudflare")}}
+		const env = event.platform?.env ?? localEnv;
+
+{{/if}}
+		return createContext({
+			headers: event.request.headers,
+{{#if (eq webDeploy "cloudflare")}}
+			env,
+{{/if}}
+		});
+	},
+});
+
+// oRPC's SvelteKit SSR setup loads this from hooks.server.ts so $lib/orpc can
+// reuse the in-process server client during SSR and fall back to HTTP in the browser.
+globalThis.$client = serverClient;
+`],
+	["api/orpc/fullstack/svelte/src/routes/rpc/[...rest]/+server.ts.hbs", `import { createContext } from "@{{projectName}}/api/context";
+import { appRouter } from "@{{projectName}}/api/routers/index";
+{{#if (eq webDeploy "cloudflare")}}
+import { env as localEnv } from "@{{projectName}}/env/server";
+{{/if}}
+import { OpenAPIHandler } from "@orpc/openapi/fetch";
+import { OpenAPIReferencePlugin } from "@orpc/openapi/plugins";
+import { ZodToJsonSchemaConverter } from "@orpc/zod/zod4";
+import { onError } from "@orpc/server";
+import { RPCHandler } from "@orpc/server/fetch";
+import type { RequestHandler } from "@sveltejs/kit";
+
+const rpcHandler = new RPCHandler(appRouter, {
+	interceptors: [
+		onError((error) => {
+			console.error(error);
+		}),
+	],
+});
+
+const apiHandler = new OpenAPIHandler(appRouter, {
+	plugins: [
+		new OpenAPIReferencePlugin({
+			schemaConverters: [new ZodToJsonSchemaConverter()],
+		}),
+	],
+	interceptors: [
+		onError((error) => {
+			console.error(error);
+		}),
+	],
+});
+
+const handle: RequestHandler = async ({ request{{#if (eq webDeploy "cloudflare")}}, platform{{/if}} }) => {
+{{#if (eq webDeploy "cloudflare")}}
+	const env = platform?.env ?? localEnv;
+
+{{/if}}
+	const context = await createContext({
+		headers: request.headers,
+{{#if (eq webDeploy "cloudflare")}}
+		env,
+{{/if}}
+	});
+
+	const rpcResult = await rpcHandler.handle(request, {
+		prefix: "/rpc",
+		context,
+	});
+	if (rpcResult.response) return rpcResult.response;
+
+	const apiResult = await apiHandler.handle(request, {
+		prefix: "/rpc/api-reference",
+		context,
+	});
+	if (apiResult.response) return apiResult.response;
+
+	return new Response("Not found", { status: 404 });
+};
+
+export const HEAD = handle;
+export const GET = handle;
+export const POST = handle;
+export const PUT = handle;
+export const PATCH = handle;
+export const DELETE = handle;
 `],
 	["api/orpc/fullstack/tanstack-start/src/routes/api/rpc/$.ts.hbs", `import { createContext } from "@{{projectName}}/api/context";
 import { appRouter } from "@{{projectName}}/api/routers/index";
@@ -4467,6 +4763,8 @@ function toClerkContextAuth(auth: { userId: string | null } | null): ClerkContex
 {{/if}}
 
 {{#if (and (eq auth "clerk") (or (eq backend 'self') (eq backend 'hono') (eq backend 'elysia')))}}
+{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}
+{{else}}
 import { createClerkClient } from "@clerk/backend";
 import { env } from "@{{projectName}}/env/server";
 
@@ -4482,6 +4780,7 @@ async function authenticateClerkRequest(request: Request): Promise<ClerkContextA
 	return toClerkContextAuth(requestState.toAuth());
 }
 {{/if}}
+{{/if}}
 
 {{#if (and (eq backend 'self') (includes frontend "next"))}}
 import type { NextRequest } from "next/server";
@@ -4576,6 +4875,46 @@ export async function createContext({ headers }: CreateContextOptions) {
 {{/if}}
 }
 
+{{else if (and (eq backend 'self') (includes frontend "svelte"))}}
+{{#if (eq auth "better-auth")}}
+{{#if (or (eq runtime "workers") (eq serverDeploy "cloudflare") (and (eq backend "self") (eq webDeploy "cloudflare")))}}
+import { createAuth } from "@{{projectName}}/auth";
+{{else}}
+import { auth } from "@{{projectName}}/auth";
+{{/if}}
+{{/if}}
+{{#if (eq webDeploy "cloudflare")}}
+import type {} from "@{{projectName}}/env/server";
+{{/if}}
+
+export type CreateContextOptions = {
+	headers: Headers;
+{{#if (eq webDeploy "cloudflare")}}
+	env: Env;
+{{/if}}
+};
+
+export async function createContext({ headers{{#if (eq webDeploy "cloudflare")}}, env{{/if}} }: CreateContextOptions) {
+{{#if (eq auth "better-auth")}}
+	const session = await {{#if (or (eq runtime "workers") (eq serverDeploy "cloudflare") (and (eq backend "self") (eq webDeploy "cloudflare")))}}createAuth({{#if (eq webDeploy "cloudflare")}}env{{/if}}){{else}}auth{{/if}}.api.getSession({ headers });
+	return {
+		auth: null,
+		session,
+{{#if (eq webDeploy "cloudflare")}}
+		env,
+{{/if}}
+	};
+{{else}}
+	return {
+		auth: null,
+		session: null,
+{{#if (eq webDeploy "cloudflare")}}
+		env,
+{{/if}}
+	};
+{{/if}}
+}
+
 {{else if (and (eq backend 'self') (includes frontend "astro"))}}
 {{#if (eq auth "better-auth")}}
 {{#if (or (eq runtime "workers") (eq serverDeploy "cloudflare") (and (eq backend "self") (eq webDeploy "cloudflare")))}}
@@ -5144,7 +5483,9 @@ export const client: AppRouterClient = createORPCClient(link);
 
 export const orpc = createTanstackQueryUtils(client);
 `],
-	["api/orpc/web/svelte/src/lib/orpc.ts.hbs", `import { PUBLIC_SERVER_URL } from "$env/static/public";
+	["api/orpc/web/svelte/src/lib/orpc.ts.hbs", `{{#unless (eq backend "self")}}
+import { PUBLIC_SERVER_URL } from "$env/static/public";
+{{/unless}}
 import { createORPCClient } from "@orpc/client";
 import { RPCLink } from "@orpc/client/fetch";
 import { createTanstackQueryUtils } from "@orpc/tanstack-query";
@@ -5160,7 +5501,17 @@ export const queryClient = new QueryClient({
 });
 
 export const link = new RPCLink({
+	{{#if (eq backend "self")}}
+	url: () => {
+		if (typeof window === "undefined") {
+			throw new Error("This link is not allowed on the server side.");
+		}
+
+		return \`\${window.location.origin}/rpc\`;
+	},
+	{{else}}
 	url: \`\${PUBLIC_SERVER_URL}/rpc\`,
+	{{/if}}
 	{{#if (eq auth "better-auth")}}
 	fetch(url, options) {
 		return fetch(url, {
@@ -5171,7 +5522,11 @@ export const link = new RPCLink({
 	{{/if}}
 });
 
+{{#if (eq backend "self")}}
+export const client: AppRouterClient = globalThis.$client ?? createORPCClient(link);
+{{else}}
 export const client: AppRouterClient = createORPCClient(link);
+{{/if}}
 
 export const orpc = createTanstackQueryUtils(client);
 `],
@@ -8900,6 +9255,45 @@ export default defineEventHandler((event) => {
 {{/if}}
   return auth.handler(toWebRequest(event));
 });
+`],
+	["auth/better-auth/fullstack/svelte/src/hooks.server.ts.hbs", `{{#if (eq api "orpc")}}
+import "./lib/orpc.server";
+{{/if}}
+import { building } from "$app/environment";
+{{#if (or (eq runtime "workers") (eq serverDeploy "cloudflare") (and (eq backend "self") (eq webDeploy "cloudflare")))}}
+import { createAuth } from "@{{projectName}}/auth";
+{{#if (and (eq backend "self") (eq webDeploy "cloudflare"))}}
+import { env as localEnv } from "@{{projectName}}/env/server";
+{{/if}}
+{{else}}
+import { auth } from "@{{projectName}}/auth";
+{{/if}}
+import { svelteKitHandler } from "better-auth/svelte-kit";
+import type { Handle } from "@sveltejs/kit";
+
+export const handle: Handle = async ({ event, resolve }) => {
+{{#if (or (eq runtime "workers") (eq serverDeploy "cloudflare") (and (eq backend "self") (eq webDeploy "cloudflare")))}}
+{{#if (and (eq backend "self") (eq webDeploy "cloudflare"))}}
+	if (building) {
+		return resolve(event);
+	}
+
+	const authEnv = event.platform?.env ?? localEnv;
+	const authInstance = createAuth(authEnv);
+{{else}}
+	const authInstance = createAuth();
+{{/if}}
+{{else}}
+	const authInstance = auth;
+{{/if}}
+
+	return svelteKitHandler({
+		event,
+		resolve,
+		auth: authInstance,
+		building,
+	});
+};
 `],
 	["auth/better-auth/fullstack/tanstack-start/src/routes/api/auth/$.ts.hbs", `{{#if (or (eq runtime "workers") (eq serverDeploy "cloudflare") (and (eq backend "self") (eq webDeploy "cloudflare")))}}
 import { createAuth } from '@{{projectName}}/auth'
@@ -10835,15 +11229,23 @@ report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
 	["auth/better-auth/server/base/src/index.ts.hbs", `{{#if (eq orm "prisma")}}
 import { betterAuth } from "better-auth";
 import { prismaAdapter } from "better-auth/adapters/prisma";
+{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}
+import type {} from "@{{projectName}}/env/server";
+{{else}}
 import { env } from "@{{projectName}}/env/server";
+{{/if}}
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
+{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}
+import { createPolarClient } from "./lib/payments";
+{{else}}
 import { polarClient } from "./lib/payments";
 {{/if}}
+{{/if}}
 import { createPrismaClient } from "@{{projectName}}/db";
 
-export function createAuth() {
-	const prisma = createPrismaClient();
+export function createAuth({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}env: Env{{/if}}) {
+	const prisma = createPrismaClient({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}env{{/if}});
 
 	return betterAuth({
 		database: prismaAdapter(prisma, {
@@ -10884,7 +11286,7 @@ export function createAuth() {
 		plugins: [
 {{#if (eq payments "polar")}}
 			polar({
-				client: polarClient,
+				client: {{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}createPolarClient(env){{else}}polarClient{{/if}},
 				createCustomerOnSignUp: true,
 				enableCustomerPortal: true,
 				use: [
@@ -10915,17 +11317,25 @@ export const auth = createAuth();
 {{#if (or (eq runtime "bun") (eq runtime "node") (eq runtime "none"))}}
 import { betterAuth } from "better-auth";
 import { drizzleAdapter } from "better-auth/adapters/drizzle";
+{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}
+import type {} from "@{{projectName}}/env/server";
+{{else}}
 import { env } from "@{{projectName}}/env/server";
+{{/if}}
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
+{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}
+import { createPolarClient } from "./lib/payments";
+{{else}}
 import { polarClient } from "./lib/payments";
 {{/if}}
+{{/if}}
 import { createDb } from "@{{projectName}}/db";
 import * as schema from "@{{projectName}}/db/schema/auth";
 
 
-export function createAuth() {
-	const db = createDb();
+export function createAuth({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}env: Env{{/if}}) {
+	const db = createDb({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}env{{/if}});
 
 	return betterAuth({
 		database: drizzleAdapter(db, {
@@ -10965,7 +11375,7 @@ export function createAuth() {
 		plugins: [
 {{#if (eq payments "polar")}}
 			polar({
-				client: polarClient,
+				client: {{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}createPolarClient(env){{else}}polarClient{{/if}},
 				createCustomerOnSignUp: true,
 				enableCustomerPortal: true,
 				use: [
@@ -11083,14 +11493,22 @@ export function createAuth() {
 {{#if (eq orm "mongoose")}}
 import { betterAuth } from "better-auth";
 import { mongodbAdapter } from "better-auth/adapters/mongodb";
+{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}
+import type {} from "@{{projectName}}/env/server";
+{{else}}
 import { env } from "@{{projectName}}/env/server";
+{{/if}}
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
+{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}
+import { createPolarClient } from "./lib/payments";
+{{else}}
 import { polarClient } from "./lib/payments";
 {{/if}}
+{{/if}}
 import { client } from "@{{projectName}}/db";
 
-export function createAuth() {
+export function createAuth({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}env: Env{{/if}}) {
 	return betterAuth({
 		database: mongodbAdapter(client),
 		trustedOrigins: [
@@ -11124,7 +11542,7 @@ export function createAuth() {
 {{#if (eq payments "polar")}}
 		plugins: [
 			polar({
-				client: polarClient,
+				client: {{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}createPolarClient(env){{else}}polarClient{{/if}},
 				createCustomerOnSignUp: true,
 				enableCustomerPortal: true,
 				use: [
@@ -11153,14 +11571,22 @@ export const auth = createAuth();
 
 {{#if (eq orm "none")}}
 import { betterAuth } from "better-auth";
+{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}
+import type {} from "@{{projectName}}/env/server";
+{{else}}
 import { env } from "@{{projectName}}/env/server";
+{{/if}}
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
+{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}
+import { createPolarClient } from "./lib/payments";
+{{else}}
 import { polarClient } from "./lib/payments";
 {{/if}}
+{{/if}}
 
 
-export function createAuth() {
+export function createAuth({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}env: Env{{/if}}) {
 	return betterAuth({
 		database: "", // Invalid configuration
 		trustedOrigins: [
@@ -11194,7 +11620,7 @@ export function createAuth() {
 {{#if (eq payments "polar")}}
 		plugins: [
 			polar({
-				client: polarClient,
+				client: {{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}createPolarClient(env){{else}}polarClient{{/if}},
 				createCustomerOnSignUp: true,
 				enableCustomerPortal: true,
 				use: [
@@ -12597,10 +13023,14 @@ import { polarClient } from "@polar-sh/better-auth";
 {{/if}}
 
 export default defineNuxtPlugin(() => {
+  {{#if (ne backend "self")}}
   const config = useRuntimeConfig();
+  {{/if}}
 
   const authClient = createAuthClient({
+    {{#if (ne backend "self")}}
     baseURL: config.public.serverUrl,
+    {{/if}}
     {{#if (eq payments "polar")}}
     plugins: [polarClient()],
     {{/if}}
@@ -14995,6 +15425,8 @@ function RouteComponent() {
 			onSubmit: validationSchema,
 		},
 	}));
+
+	type SubmitState = Pick<typeof form.state, 'canSubmit' | 'isSubmitting'>;
 <\/script>
 
 <div class="mx-auto mt-10 w-full max-w-md p-6">
@@ -15058,8 +15490,8 @@ function RouteComponent() {
 			{/snippet}
 		</form.Field>
 
-		<form.Subscribe selector={(state) => ({ canSubmit: state.canSubmit, isSubmitting: state.isSubmitting })}>
-			{#snippet children(state)}
+		<form.Subscribe selector={(state: typeof form.state): SubmitState => ({ canSubmit: state.canSubmit, isSubmitting: state.isSubmitting })}>
+			{#snippet children(state: SubmitState)}
 				<button type="submit" class="w-full" disabled={!state.canSubmit || state.isSubmitting}>
 					{state.isSubmitting ? 'Submitting...' : 'Sign In'}
 				</button>
@@ -15113,6 +15545,8 @@ function RouteComponent() {
 			onSubmit: validationSchema,
 		},
 	}));
+
+	type SubmitState = Pick<typeof form.state, 'canSubmit' | 'isSubmitting'>;
 <\/script>
 
 <div class="mx-auto mt-10 w-full max-w-md p-6">
@@ -15201,8 +15635,8 @@ function RouteComponent() {
 			{/snippet}
 		</form.Field>
 
-		<form.Subscribe selector={(state) => ({ canSubmit: state.canSubmit, isSubmitting: state.isSubmitting })}>
-			{#snippet children(state)}
+		<form.Subscribe selector={(state: typeof form.state): SubmitState => ({ canSubmit: state.canSubmit, isSubmitting: state.isSubmitting })}>
+			{#snippet children(state: SubmitState)}
 				<button type="submit" class="w-full" disabled={!state.canSubmit || state.isSubmitting}>
 					{state.isSubmitting ? 'Submitting...' : 'Sign Up'}
 				</button>
@@ -15270,14 +15704,18 @@ function RouteComponent() {
 	{/if}
 </div>
 `],
-	["auth/better-auth/web/svelte/src/lib/auth-client.ts.hbs", `import { PUBLIC_SERVER_URL } from "$env/static/public";
+	["auth/better-auth/web/svelte/src/lib/auth-client.ts.hbs", `{{#unless (eq backend "self")}}
+import { PUBLIC_SERVER_URL } from "$env/static/public";
+{{/unless}}
 import { createAuthClient } from "better-auth/svelte";
 {{#if (eq payments "polar")}}
 import { polarClient } from "@polar-sh/better-auth";
 {{/if}}
 
 export const authClient = createAuthClient({
+{{#unless (eq backend "self")}}
 	baseURL: PUBLIC_SERVER_URL,
+{{/unless}}
 {{#if (eq payments "polar")}}
 	plugins: [polarClient()]
 {{/if}}
@@ -17132,7 +17570,7 @@ import { Elysia } from "elysia";
 import { cors } from "@elysiajs/cors";
 {{#if (includes examples "ai")}}
 import { google } from "@ai-sdk/google";
-import { convertToModelMessages, streamText, wrapLanguageModel } from "ai";
+import { convertToModelMessages, streamText, type UIMessage, wrapLanguageModel } from "ai";
 import { devToolsMiddleware } from "@ai-sdk/devtools";
 {{/if}}
 {{#if (eq api "trpc")}}
@@ -17176,9 +17614,9 @@ const apiHandler = new OpenAPIHandler(appRouter, {
 {{/if}}
 
 {{#if (eq runtime "node")}}
-const app = new Elysia({ adapter: node() })
+new Elysia({ adapter: node() })
 {{else}}
-const app = new Elysia()
+new Elysia()
 {{/if}}
 	.use(
 		cors({
@@ -17242,7 +17680,7 @@ const app = new Elysia()
 {{/if}}
 {{#if (includes examples "ai")}}
 	.post("/ai", async (context) => {
-		const body = await context.request.json();
+		const body = (await context.request.json()) as { messages?: UIMessage[] };
 		const uiMessages = body.messages || [];
 		const model = wrapLanguageModel({
 			model: google("gemini-2.5-flash"),
@@ -17250,7 +17688,7 @@ const app = new Elysia()
 		});
 		const result = streamText({
 			model,
-			messages: await convertToModelMessages(uiMessages)
+			messages: await convertToModelMessages(uiMessages),
 		});
 
 		return result.toUIMessageStreamResponse();
@@ -17998,13 +18436,17 @@ export default defineConfig({
 });
 `],
 	["db/drizzle/mysql/src/index.ts.hbs", `{{#if (or (eq runtime "bun") (eq runtime "node") (eq runtime "none"))}}
+{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}
+import type {} from "@{{projectName}}/env/server";
+{{else}}
 import { env } from "@{{projectName}}/env/server";
+{{/if}}
 import * as schema from "./schema";
 
 {{#if (eq dbSetup "planetscale")}}
 import { drizzle } from "drizzle-orm/planetscale-serverless";
 
-export function createDb() {
+export function createDb({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}env: Env{{/if}}) {
 	return drizzle({
 		connection: {
 			host: env.DATABASE_HOST,
@@ -18017,7 +18459,7 @@ export function createDb() {
 {{else}}
 import { drizzle } from "drizzle-orm/mysql2";
 
-export function createDb() {
+export function createDb({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}env: Env{{/if}}) {
 	return drizzle({
 		connection: {
 			uri: env.DATABASE_URL,
@@ -18085,14 +18527,18 @@ export default defineConfig({
 });
 `],
 	["db/drizzle/postgres/src/index.ts.hbs", `{{#if (or (eq runtime "bun") (eq runtime "node") (eq runtime "none"))}}
+{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}
+import type {} from "@{{projectName}}/env/server";
+{{else}}
 import { env } from "@{{projectName}}/env/server";
+{{/if}}
 import * as schema from "./schema";
 
 {{#if (eq dbSetup "neon")}}
 import { neon } from '@neondatabase/serverless';
 import { drizzle } from 'drizzle-orm/neon-http';
 
-export function createDb() {
+export function createDb({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}env: Env{{/if}}) {
 	const sql = neon(env.DATABASE_URL);
 	return drizzle(sql, { schema });
 }
@@ -18102,7 +18548,7 @@ import { drizzle } from "drizzle-orm/node-postgres";
 import { Pool } from "pg";
 {{/if}}
 
-export function createDb() {
+export function createDb({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}env: Env{{/if}}) {
 {{#if (and (eq backend "self") (eq webDeploy "cloudflare"))}}
 	const pool = new Pool({
 		connectionString: env.DATABASE_URL,
@@ -18181,18 +18627,26 @@ export default defineConfig({
 	["db/drizzle/sqlite/src/index.ts.hbs", `{{#if (eq dbSetup "d1")}}
 import * as schema from "./schema";
 import { drizzle } from "drizzle-orm/d1";
+{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}
+import type {} from "@{{projectName}}/env/server";
+{{else}}
 import { env } from "@{{projectName}}/env/server";
+{{/if}}
 
-export function createDb() {
+export function createDb({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}env: Env{{/if}}) {
 	return drizzle(env.DB, { schema });
 }
 {{else if (or (eq runtime "bun") (eq runtime "node") (eq runtime "none"))}}
+{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}
+import type {} from "@{{projectName}}/env/server";
+{{else}}
 import { env } from "@{{projectName}}/env/server";
+{{/if}}
 import * as schema from "./schema";
 import { drizzle } from "drizzle-orm/libsql";
 import { createClient } from "@libsql/client";
 
-export function createDb() {
+export function createDb({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}env: Env{{/if}}) {
 	const client = createClient({
 		url: env.DATABASE_URL,
 {{#if (eq dbSetup "turso")}}
@@ -18353,19 +18807,23 @@ export function createPrismaClient() {
 {{/if}}
 {{else}}
 import { PrismaClient } from "../prisma/generated/client";
+{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}
+import type {} from "@{{projectName}}/env/server";
+{{else}}
 import { env } from "@{{projectName}}/env/server";
+{{/if}}
 
 {{#if (eq dbSetup "planetscale")}}
 import { PrismaPlanetScale } from "@prisma/adapter-planetscale";
 
-export function createPrismaClient() {
+export function createPrismaClient({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}env: Env{{/if}}) {
 	const adapter = new PrismaPlanetScale({ url: env.DATABASE_URL });
 	return new PrismaClient({ adapter });
 }
 {{else}}
 import { PrismaMariaDb } from "@prisma/adapter-mariadb";
 
-export function createPrismaClient() {
+export function createPrismaClient({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}env: Env{{/if}}) {
 	const databaseUrl: string = env.DATABASE_URL;
 	const url: URL = new URL(databaseUrl);
 	const connectionConfig = {
@@ -18474,11 +18932,15 @@ export function createPrismaClient() {
 {{/if}}
 {{else}}
 import { PrismaClient } from "../prisma/generated/client";
+{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}
+import type {} from "@{{projectName}}/env/server";
+{{else}}
 import { env } from "@{{projectName}}/env/server";
+{{/if}}
 {{#if (eq dbSetup "neon")}}
 import { PrismaNeon } from "@prisma/adapter-neon";
 
-export function createPrismaClient() {
+export function createPrismaClient({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}env: Env{{/if}}) {
 	const adapter = new PrismaNeon({
 		connectionString: env.DATABASE_URL,
 	});
@@ -18489,7 +18951,7 @@ export function createPrismaClient() {
 {{else if (eq dbSetup "prisma-postgres")}}
 import { PrismaPg } from "@prisma/adapter-pg";
 
-export function createPrismaClient() {
+export function createPrismaClient({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}env: Env{{/if}}) {
 	const adapter = new PrismaPg({
 		connectionString: env.DATABASE_URL,
 {{#if (and (eq backend "self") (eq webDeploy "cloudflare"))}}
@@ -18503,7 +18965,7 @@ export function createPrismaClient() {
 {{else}}
 import { PrismaPg } from "@prisma/adapter-pg";
 
-export function createPrismaClient() {
+export function createPrismaClient({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}env: Env{{/if}}) {
 	const adapter = new PrismaPg({
 		connectionString: env.DATABASE_URL,
 {{#if (and (eq backend "self") (eq webDeploy "cloudflare"))}}
@@ -18568,9 +19030,13 @@ datasource db {
 
 {{#if (eq dbSetup "d1")}}
 import { PrismaD1 } from "@prisma/adapter-d1";
+{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}
+import type {} from "@{{projectName}}/env/server";
+{{else}}
 import { env } from "@{{projectName}}/env/server";
+{{/if}}
 
-export function createPrismaClient() {
+export function createPrismaClient({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}env: Env{{/if}}) {
 	const adapter = new PrismaD1(env.DB);
 	return new PrismaClient({ adapter });
 }
@@ -18581,9 +19047,13 @@ export default prisma;
 {{/if}}
 {{else}}
 import { PrismaLibSql } from "@prisma/adapter-libsql";
+{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}
+import type {} from "@{{projectName}}/env/server";
+{{else}}
 import { env } from "@{{projectName}}/env/server";
+{{/if}}
 
-export function createPrismaClient() {
+export function createPrismaClient({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}env: Env{{/if}}) {
 	const adapter = new PrismaLibSql({
 		url: env.DATABASE_URL,
 {{#if (eq dbSetup "turso")}}
@@ -18719,6 +19189,26 @@ export default defineEventHandler(async (event) => {
 
   return result.toUIMessageStreamResponse();
 });
+`],
+	["examples/ai/fullstack/svelte/src/routes/api/ai/+server.ts.hbs", `import { devToolsMiddleware } from "@ai-sdk/devtools";
+import { google } from "@ai-sdk/google";
+import { convertToModelMessages, streamText, type UIMessage, wrapLanguageModel } from "ai";
+import type { RequestHandler } from "@sveltejs/kit";
+
+export const POST: RequestHandler = async ({ request }) => {
+	const { messages }: { messages: UIMessage[] } = await request.json();
+
+	const model = wrapLanguageModel({
+		model: google("gemini-2.5-flash"),
+		middleware: devToolsMiddleware(),
+	});
+	const result = streamText({
+		model,
+		messages: await convertToModelMessages(messages),
+	});
+
+	return result.toUIMessageStreamResponse();
+};
 `],
 	["examples/ai/fullstack/tanstack-start/src/routes/api/ai/$.ts.hbs", `import { createFileRoute } from "@tanstack/react-router";
 import { google } from "@ai-sdk/google";
@@ -21489,14 +21979,20 @@ function RouteComponent() {
 {{/if}}
 `],
 	["examples/ai/web/svelte/src/routes/ai/+page.svelte.hbs", `<script lang="ts">
+	{{#unless (eq backend "self")}}
 	import { PUBLIC_SERVER_URL } from "$env/static/public";
+	{{/unless}}
 	import { Chat } from "@ai-sdk/svelte";
 	import { DefaultChatTransport } from "ai";
 
 	let input = $state("");
 	const chat = new Chat({
 		transport: new DefaultChatTransport({
+			{{#if (eq backend "self")}}
+			api: "/api/ai",
+			{{else}}
 			api: \`\${PUBLIC_SERVER_URL}/ai\`,
+			{{/if}}
 		}),
 	});
 
@@ -22794,18 +23290,18 @@ import { todo } from "@{{projectName}}/db/schema/todo";
 import { publicProcedure } from "../index";
 
 export const todoRouter = {
-  getAll: publicProcedure.handler(async () => {
+  getAll: publicProcedure.handler(async ({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}{ context }{{/if}}) => {
 {{#if (or (eq runtime "workers") (eq serverDeploy "cloudflare") (and (eq backend "self") (eq webDeploy "cloudflare")))}}
-    const db = createDb();
+    const db = createDb({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}context.env{{/if}});
 {{/if}}
     return await db.select().from(todo);
   }),
 
   create: publicProcedure
     .input(z.object({ text: z.string().min(1) }))
-    .handler(async ({ input }) => {
+    .handler(async ({ input{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}, context{{/if}} }) => {
 {{#if (or (eq runtime "workers") (eq serverDeploy "cloudflare") (and (eq backend "self") (eq webDeploy "cloudflare")))}}
-      const db = createDb();
+      const db = createDb({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}context.env{{/if}});
 {{/if}}
       return await db
         .insert(todo)
@@ -22816,9 +23312,9 @@ export const todoRouter = {
 
   toggle: publicProcedure
     .input(z.object({ id: z.number(), completed: z.boolean() }))
-    .handler(async ({ input }) => {
+    .handler(async ({ input{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}, context{{/if}} }) => {
 {{#if (or (eq runtime "workers") (eq serverDeploy "cloudflare") (and (eq backend "self") (eq webDeploy "cloudflare")))}}
-      const db = createDb();
+      const db = createDb({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}context.env{{/if}});
 {{/if}}
       return await db
         .update(todo)
@@ -22828,9 +23324,9 @@ export const todoRouter = {
 
   delete: publicProcedure
     .input(z.object({ id: z.number() }))
-    .handler(async ({ input }) => {
+    .handler(async ({ input{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}, context{{/if}} }) => {
 {{#if (or (eq runtime "workers") (eq serverDeploy "cloudflare") (and (eq backend "self") (eq webDeploy "cloudflare")))}}
-      const db = createDb();
+      const db = createDb({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}context.env{{/if}});
 {{/if}}
       return await db.delete(todo).where(eq(todo.id, input.id));
     }),
@@ -23016,9 +23512,9 @@ import prisma from "@{{projectName}}/db";
 import { publicProcedure } from "../index";
 
 export const todoRouter = {
-  getAll: publicProcedure.handler(async () => {
+  getAll: publicProcedure.handler(async ({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}{ context }{{/if}}) => {
 {{#if (or (eq runtime "workers") (eq serverDeploy "cloudflare") (and (eq backend "self") (eq webDeploy "cloudflare")))}}
-    const prisma = createPrismaClient();
+    const prisma = createPrismaClient({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}context.env{{/if}});
 {{/if}}
     return await prisma.todo.findMany({
       orderBy: {
@@ -23029,9 +23525,9 @@ export const todoRouter = {
 
   create: publicProcedure
     .input(z.object({ text: z.string().min(1) }))
-    .handler(async ({ input }) => {
+    .handler(async ({ input{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}, context{{/if}} }) => {
 {{#if (or (eq runtime "workers") (eq serverDeploy "cloudflare") (and (eq backend "self") (eq webDeploy "cloudflare")))}}
-      const prisma = createPrismaClient();
+      const prisma = createPrismaClient({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}context.env{{/if}});
 {{/if}}
       return await prisma.todo.create({
         data: {
@@ -23046,9 +23542,9 @@ export const todoRouter = {
     {{else}}
     .input(z.object({ id: z.number(), completed: z.boolean() }))
     {{/if}}
-    .handler(async ({ input }) => {
+    .handler(async ({ input{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}, context{{/if}} }) => {
 {{#if (or (eq runtime "workers") (eq serverDeploy "cloudflare") (and (eq backend "self") (eq webDeploy "cloudflare")))}}
-      const prisma = createPrismaClient();
+      const prisma = createPrismaClient({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}context.env{{/if}});
 {{/if}}
       return await prisma.todo.update({
         where: { id: input.id },
@@ -23062,9 +23558,9 @@ export const todoRouter = {
     {{else}}
     .input(z.object({ id: z.number() }))
     {{/if}}
-    .handler(async ({ input }) => {
+    .handler(async ({ input{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}, context{{/if}} }) => {
 {{#if (or (eq runtime "workers") (eq serverDeploy "cloudflare") (and (eq backend "self") (eq webDeploy "cloudflare")))}}
-      const prisma = createPrismaClient();
+      const prisma = createPrismaClient({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}context.env{{/if}});
 {{/if}}
       return await prisma.todo.delete({
         where: { id: input.id },
@@ -28912,7 +29408,7 @@ export default defineNuxtConfig({
   {{else if (and (ne backend "self") (ne backend "none"))}}
   runtimeConfig: {
     public: {
-      serverUrl: process.env.NUXT_PUBLIC_SERVER_URL,
+      serverUrl: process.env.NUXT_PUBLIC_SERVER_URL ?? "",
     }
   },
   {{/if}}
@@ -28931,7 +29427,7 @@ export default defineNuxtConfig({
   },
   "dependencies": {
     "@nuxt/ui": "^4.5.1",
-    "nuxt": "^4.4.2"
+    "nuxt": "^4.4.4"
   },
   "devDependencies": {
     "tailwindcss": "^4.2.1",
@@ -28984,7 +29480,7 @@ const nextConfig: NextConfig = {
 	{{#if (includes examples "ai")}}
 	transpilePackages: ["shiki"],
 	{{/if}}
-	{{#if (eq dbSetup "turso")}}
+	{{#if (and (eq backend "self") (eq dbSetup "turso"))}}
 	serverExternalPackages: ["libsql", "@libsql/client"],
 	{{/if}}
 };
@@ -31507,13 +32003,13 @@ vite.config.ts.timestamp-*
 	},
 	"devDependencies": {
 		"@sveltejs/adapter-auto": "^7.0.1",
-		"@sveltejs/kit": "^2.57.1",
+		"@sveltejs/kit": "^2.58.0",
 		"@sveltejs/vite-plugin-svelte": "^7.0.0",
-		"@tailwindcss/vite": "^4.2.2",
-		"svelte": "^5.55.4",
+		"@tailwindcss/vite": "^4.2.4",
+		"svelte": "^5.55.5",
 		"svelte-check": "^4.4.6",
-		"tailwindcss": "^4.2.2",
-		"vite": "^8.0.8"
+		"tailwindcss": "^4.2.4",
+		"vite": "^8.0.10"
 	},
 	"dependencies": {}
 }
@@ -31524,16 +32020,36 @@ body {
   @apply bg-neutral-950 text-neutral-100;
 }
 `],
-	["frontend/svelte/src/app.d.ts", `// See https://svelte.dev/docs/kit/types#app.d.ts
+	["frontend/svelte/src/app.d.ts.hbs", `{{#if (eq webDeploy "cloudflare")}}
+/// <reference path="../../../packages/env/env.d.ts" />
+{{/if}}
+{{#if (and (eq backend "self") (eq api "orpc"))}}
+import type { AppRouterClient } from "@{{projectName}}/api/routers/index";
+
+{{/if}}
+// See https://svelte.dev/docs/kit/types#app.d.ts
 // for information about these interfaces
 declare global {
-  namespace App {
-    // interface Error {}
-    // interface Locals {}
-    // interface PageData {}
-    // interface PageState {}
-    // interface Platform {}
-  }
+{{#if (and (eq backend "self") (eq api "orpc"))}}
+	var $client: AppRouterClient | undefined;
+
+{{/if}}
+	namespace App {
+		// interface Error {}
+		// interface Locals {}
+		// interface PageData {}
+		// interface PageState {}
+{{#if (eq webDeploy "cloudflare")}}
+		interface Platform {
+			env: Env;
+			ctx: ExecutionContext;
+			caches: CacheStorage;
+			cf: IncomingRequestCfProperties;
+		}
+{{else}}
+		// interface Platform {}
+{{/if}}
+	}
 }
 
 export {};
@@ -31556,32 +32072,22 @@ export {};
     {{#if (eq auth "better-auth")}}
 	import UserMenu from './UserMenu.svelte';
     {{/if}}
-    const links = [
-        { to: "/", label: "Home" },
-        {{#if (eq auth "better-auth")}}
-        { to: "/dashboard", label: "Dashboard" },
-        {{/if}}
-        {{#if (includes examples "todo")}}
-        { to: "/todos", label: "Todos" },
-        {{/if}}
-        {{#if (includes examples "ai")}}
-        { to: "/ai", label: "AI Chat" },
-        {{/if}}
-    ];
 
 <\/script>
 
 <div>
 	<div class="flex flex-row items-center justify-between px-4 py-2 md:px-6">
 		<nav class="flex gap-4 text-lg">
-			{#each links as link (link.to)}
-				<a
-					href={link.to}
-					class="hover:text-neutral-400 transition-colors"
-				>
-					{link.label}
-				</a>
-			{/each}
+			<a href="/" class="hover:text-neutral-400 transition-colors">Home</a>
+		    {{#if (eq auth "better-auth")}}
+			<a href="/dashboard" class="hover:text-neutral-400 transition-colors">Dashboard</a>
+		    {{/if}}
+		    {{#if (includes examples "todo")}}
+			<a href="/todos" class="hover:text-neutral-400 transition-colors">Todos</a>
+		    {{/if}}
+		    {{#if (includes examples "ai")}}
+			<a href="/ai" class="hover:text-neutral-400 transition-colors">AI Chat</a>
+		    {{/if}}
 		</nav>
 		<div class="flex items-center gap-2">
 		    {{#if (eq auth "better-auth")}}
@@ -31744,7 +32250,11 @@ const TITLE_TEXT = \`
 {{/if}}
 `],
 	["frontend/svelte/static/favicon.png", `[Binary file]`],
-	["frontend/svelte/svelte.config.js.hbs", `import adapter from '@sveltejs/adapter-auto';
+	["frontend/svelte/svelte.config.js.hbs", `{{#if (eq webDeploy "cloudflare")}}
+import alchemy from 'alchemy/cloudflare/sveltekit';
+{{else}}
+import adapter from '@sveltejs/adapter-auto';
+{{/if}}
 import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
 
 /** @type {import('@sveltejs/kit').Config} */
@@ -31754,10 +32264,15 @@ const config = {
 	preprocess: vitePreprocess(),
 
 	kit: {
+{{#if (eq webDeploy "cloudflare")}}
+		// Alchemy's adapter wraps SvelteKit's Cloudflare adapter for local platform.env and Worker builds.
+		adapter: alchemy()
+{{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.
 		// See https://svelte.dev/docs/kit/adapters for more information about adapters.
 		adapter: adapter()
+{{/if}}
 	}
 };
 
@@ -31774,7 +32289,8 @@ export default config;
 		"skipLibCheck": true,
 		"sourceMap": true,
 		"strict": true,
-		"moduleResolution": "bundler"
+		"moduleResolution": "bundler"{{#if (eq webDeploy "cloudflare")}},
+			"types": ["@cloudflare/workers-types"]{{/if}}
 	}
 	// Path aliases are handled by https://svelte.dev/docs/kit/configuration#alias
 	// except $lib which is handled by https://svelte.dev/docs/kit/configuration#files
@@ -31837,6 +32353,24 @@ export default defineConfig({
 	"type": "module",
 	"exports": {}
 }`],
+	["packages/env/src/cloudflare-local.ts.hbs", `import { config } from "dotenv";
+import { fileURLToPath } from "node:url";
+
+config({ path: fileURLToPath(new URL("../../../.env", import.meta.url)) });
+config();
+
+const runtimeEnv = typeof process === "undefined" ? {} : process.env;
+
+export const env = new Proxy({} as Env, {
+	get(_target, prop) {
+		if (typeof prop !== "string") {
+			return undefined;
+		}
+
+		return runtimeEnv[prop];
+	},
+});
+`],
 	["packages/env/src/native.ts.hbs", `import { createEnv } from "@t3-oss/env-core";
 import { z } from "zod";
 
@@ -31859,7 +32393,8 @@ export const env = createEnv({
 	emptyStringAsUndefined: true,
 });
 `],
-	["packages/env/src/server.ts.hbs", `{{#if (eq serverDeploy "cloudflare")}}
+	["packages/env/src/server.ts.hbs", `{{#if (and (eq serverDeploy "cloudflare") (or (ne backend "self") (ne webDeploy "cloudflare")))}}
+/// <reference types="@cloudflare/workers-types" />
 /// <reference path="../env.d.ts" />
 // For Cloudflare Workers, env is accessed via cloudflare:workers module
 // Types are defined in env.d.ts based on your alchemy.run.ts bindings
@@ -31869,6 +32404,10 @@ export { env } from "cloudflare:workers";
 import { getCloudflareContext } from "@opennextjs/cloudflare";
 
 function getNodeEnvValue(key: string) {
+	if (key === "DB") {
+		return undefined;
+	}
+
 	return process.env[key];
 }
 
@@ -31921,7 +32460,27 @@ export async function getEnvAsync() {
 }
 
 export const env = createEnvProxy(resolveEnvValue);
+{{else if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}
+/// <reference path="../env.d.ts" />
+import { config } from "dotenv";
+import { fileURLToPath } from "node:url";
+
+config({ path: fileURLToPath(new URL("../../../.env", import.meta.url)) });
+config();
+
+const runtimeEnv = typeof process === "undefined" ? {} : process.env;
+
+export const env = new Proxy({} as Env, {
+	get(_target, prop) {
+		if (typeof prop !== "string") {
+			return undefined;
+		}
+
+		return runtimeEnv[prop];
+	},
+});
 {{else if (and (eq backend "self") (eq webDeploy "cloudflare"))}}
+/// <reference types="@cloudflare/workers-types" />
 /// <reference path="../env.d.ts" />
 // For Cloudflare Workers, env is accessed via cloudflare:workers module
 // Types are defined in env.d.ts based on your alchemy.run.ts bindings
@@ -32265,7 +32824,39 @@ export const web = await SvelteKit("web", {
     {{else if (ne backend "self")}}
     PUBLIC_SERVER_URL: alchemy.env.PUBLIC_SERVER_URL!,
     {{/if}}
-  }
+    {{#if (eq backend "self")}}
+    {{#if (eq dbSetup "d1")}}
+    DB: db,
+    {{else if (ne database "none")}}
+    DATABASE_URL: alchemy.secret.env.DATABASE_URL!,
+    {{/if}}
+    CORS_ORIGIN: alchemy.env.CORS_ORIGIN!,
+    {{#if (eq auth "better-auth")}}
+    BETTER_AUTH_SECRET: alchemy.secret.env.BETTER_AUTH_SECRET!,
+    BETTER_AUTH_URL: alchemy.env.BETTER_AUTH_URL!,
+    {{/if}}
+    {{#if (and (includes examples "ai") (ne backend "convex"))}}
+    GOOGLE_GENERATIVE_AI_API_KEY: alchemy.secret.env.GOOGLE_GENERATIVE_AI_API_KEY!,
+    {{/if}}
+    {{#if (eq payments "polar")}}
+    POLAR_ACCESS_TOKEN: alchemy.secret.env.POLAR_ACCESS_TOKEN!,
+    POLAR_SUCCESS_URL: alchemy.env.POLAR_SUCCESS_URL!,
+    {{/if}}
+    {{#if (eq dbSetup "turso")}}
+    DATABASE_AUTH_TOKEN: alchemy.secret.env.DATABASE_AUTH_TOKEN!,
+    {{/if}}
+    {{#if (eq database "mysql")}}
+    {{#if (eq orm "drizzle")}}
+    DATABASE_HOST: alchemy.env.DATABASE_HOST!,
+    DATABASE_USERNAME: alchemy.env.DATABASE_USERNAME!,
+    DATABASE_PASSWORD: alchemy.secret.env.DATABASE_PASSWORD!,
+    {{/if}}
+    {{/if}}
+    {{/if}}
+  },
+  dev: {
+    domain: "localhost:5173",
+  },
 });
 {{else if (includes frontend "tanstack-start")}}
 export const web = await TanStackStart("web", {
@@ -33257,12 +33848,25 @@ export function cn(...inputs: ClassValue[]) {
 }
 `],
 	["payments/polar/server/base/src/lib/payments.ts.hbs", `import { Polar } from "@polar-sh/sdk";
+{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}
+import type {} from "@{{projectName}}/env/server";
+{{else}}
 import { env } from "@{{projectName}}/env/server";
+{{/if}}
 
+{{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}
+export function createPolarClient({{#if (and (eq backend "self") (eq webDeploy "cloudflare") (includes frontend "svelte"))}}env: Env{{/if}}) {
+	return new Polar({
+		accessToken: env.POLAR_ACCESS_TOKEN,
+		server: "sandbox",
+	});
+}
+{{else}}
 export const polarClient = new Polar({
 	accessToken: env.POLAR_ACCESS_TOKEN,
 	server: "sandbox",
 });
+{{/if}}
 `],
 	["payments/polar/web/nuxt/app/pages/success.vue.hbs", `<script setup lang="ts">
 const route = useRoute()
@@ -33400,7 +34004,7 @@ function SuccessPage() {
 </div>
 `]
 ]);
-const TEMPLATE_COUNT = 462;
+const TEMPLATE_COUNT = 467;
 //#endregion
 export { EMBEDDED_TEMPLATES, GeneratorError, Handlebars, TEMPLATE_COUNT, VirtualFileSystem, dependencyVersionMap, generate, generateReproducibleCommand, isBinaryFile, processAddonTemplates, processAddonsDeps, processFileContent, processTemplateString, transformFilename, writeBtsConfigToVfs };