@better-t-stack/template-generator 3.23.1 → 3.25.3

package/dist/index.mjs

@@ -4,6 +4,7 @@ import { memfs } from "memfs";
 import { dirname, extname, join, normalize } from "pathe";
 import Handlebars from "handlebars";
 import yaml from "yaml";
+import { desktopWebFrontends } from "@better-t-stack/types";
 import { IndentationText, Node, Project, QuoteKind, SyntaxKind } from "ts-morph";
 
 //#region src/types.ts
@@ -267,6 +268,7 @@ const PACKAGE_PATHS = [
 	"apps/server",
 	"apps/web",
 	"apps/native",
+	"apps/desktop",
 	"apps/fumadocs",
 	"apps/docs",
 	"packages/api",
@@ -408,6 +410,10 @@ function getDbScriptSupport(config) {
 //#endregion
 //#region src/post-process/package-configs.ts
 /**
+* Package.json configuration post-processor
+* Updates package names, scripts, and workspaces after template generation
+*/
+/**
 * Update all package.json files with proper names, scripts, and workspaces
 */
 function processPackageConfigs(vfs, config) {
@@ -416,6 +422,7 @@ function processPackageConfigs(vfs, config) {
 	updateEnvPackageJson(vfs, config);
 	updateUiPackageJson(vfs, config);
 	updateInfraPackageJson(vfs, config);
+	updateDesktopPackageJson(vfs, config);
 	renameDevScriptsForAlchemy(vfs, config);
 	if (config.backend === "convex") updateConvexPackageJson(vfs, config);
 	else if (config.backend !== "none") {
@@ -435,16 +442,7 @@ function updateRootPackageJson(vfs, config) {
 	pkgJson.workspaces = workspaces;
 	const scripts = pkgJson.scripts;
 	const { projectName, packageManager, backend, database, orm, dbSetup, addons, frontend } = config;
-	const hasWebApp = frontend.some((item) => [
-		"tanstack-router",
-		"react-router",
-		"tanstack-start",
-		"next",
-		"nuxt",
-		"svelte",
-		"solid",
-		"astro"
-	].includes(item));
+	const hasWebApp = frontend.some((item) => desktopWebFrontends.includes(item));
 	const hasNativeApp = frontend.some((item) => [
 		"native-bare",
 		"native-uniwind",
@@ -466,6 +464,11 @@ function updateRootPackageJson(vfs, config) {
 	scripts["check-types"] = pmConfig.checkTypes;
 	if (hasNativeApp) scripts["dev:native"] = pmConfig.filter("native", "dev");
 	if (hasWebApp) scripts["dev:web"] = pmConfig.filter("web", "dev");
+	if (addons.includes("electrobun")) {
+		scripts["dev:desktop"] = pmConfig.filter("desktop", "dev:hmr");
+		scripts["build:desktop"] = pmConfig.filter("desktop", "build:stable");
+		scripts["build:desktop:canary"] = pmConfig.filter("desktop", "build:canary");
+	}
 	if (addons.includes("opentui")) scripts["dev:tui"] = pmConfig.filter("tui", "dev");
 	if (backend !== "self" && backend !== "none") scripts["dev:server"] = pmConfig.filter(backendPackageName, "dev");
 	if (backend === "convex") scripts["dev:setup"] = pmConfig.filter(backendPackageName, "dev:setup");
@@ -537,6 +540,53 @@ function getPackageManagerConfig(packageManager, options) {
 		};
 	}
 }
+function updateDesktopPackageJson(vfs, config) {
+	const pkgJson = vfs.readJson("apps/desktop/package.json");
+	if (!pkgJson) return;
+	const { packageManager, addons, frontend } = config;
+	const hasTurborepo = addons.includes("turborepo");
+	const hasNx = addons.includes("nx");
+	const desktopBuildScript = frontend.includes("nuxt") ? "generate" : "build";
+	const webBuildCommand = getDesktopWebCommand(packageManager, {
+		hasTurborepo,
+		hasNx
+	}, desktopBuildScript);
+	const webDevCommand = getDesktopWebCommand(packageManager, {
+		hasTurborepo,
+		hasNx
+	}, "dev");
+	const localRunCommand = getLocalRunCommand(packageManager);
+	pkgJson.scripts = {
+		...pkgJson.scripts,
+		start: `${webBuildCommand} && electrobun dev`,
+		dev: "electrobun dev --watch",
+		"dev:hmr": `concurrently "${localRunCommand} hmr" "${localRunCommand} start"`,
+		hmr: webDevCommand,
+		build: `${webBuildCommand} && electrobun build`,
+		"build:stable": `${webBuildCommand} && electrobun build --env=stable`,
+		"build:canary": `${webBuildCommand} && electrobun build --env=canary`,
+		"check-types": "tsc --noEmit"
+	};
+	vfs.writeJson("apps/desktop/package.json", pkgJson);
+}
+function getDesktopWebCommand(packageManager, options, script) {
+	if (options.hasTurborepo) return `turbo -F web ${script}`;
+	if (options.hasNx) return `nx run-many -t ${script} --projects=web`;
+	switch (packageManager) {
+		case "npm": return `npm run ${script} --workspace web`;
+		case "pnpm": return `pnpm -w --filter web ${script}`;
+		case "bun":
+		default: return `bun run --filter web ${script}`;
+	}
+}
+function getLocalRunCommand(packageManager) {
+	switch (packageManager) {
+		case "npm": return "npm run";
+		case "pnpm": return "pnpm run";
+		case "bun":
+		default: return "bun run";
+	}
+}
 function updateDbPackageJson(vfs, config) {
 	const pkgJson = vfs.readJson("packages/db/package.json");
 	if (!pkgJson) return;
@@ -551,6 +601,7 @@ function updateDbPackageJson(vfs, config) {
 			scripts["db:push"] = "prisma db push";
 			scripts["db:generate"] = "prisma generate";
 			scripts["db:migrate"] = "prisma migrate dev";
+			scripts.postinstall ??= "prisma generate";
 			if (!isD1Alchemy) scripts["db:studio"] = "prisma studio";
 		} else if (orm === "drizzle") {
 			scripts["db:push"] = "drizzle-kit push";
@@ -591,15 +642,7 @@ function updateEnvPackageJson(vfs, config) {
 	const pkgJson = vfs.readJson("packages/env/package.json");
 	if (!pkgJson) return;
 	pkgJson.name = `@${config.projectName}/env`;
-	const hasWebFrontend = config.frontend.some((f) => [
-		"tanstack-router",
-		"react-router",
-		"tanstack-start",
-		"next",
-		"nuxt",
-		"svelte",
-		"solid"
-	].includes(f));
+	const hasWebFrontend = config.frontend.some((f) => desktopWebFrontends.includes(f));
 	const hasNative = config.frontend.some((f) => [
 		"native-bare",
 		"native-uniwind",
@@ -755,8 +798,9 @@ const dependencyVersionMap = {
 	"nitro-cloudflare-dev": "^0.2.2",
 	"@sveltejs/adapter-cloudflare": "^7.2.4",
 	"@cloudflare/workers-types": "^4.20251213.0",
-	"@astrojs/cloudflare": "^12.6.12",
-	alchemy: "^0.82.1",
+	"@astrojs/cloudflare": "^13.0.1",
+	"@astrojs/node": "^10.0.0-beta.9",
+	alchemy: "^0.87.0",
 	dotenv: "^17.2.2",
 	tsdown: "^0.16.5",
 	zod: "^4.1.13",
@@ -2203,6 +2247,20 @@ function setupAIDependencies(vfs, config) {
 	});
 }
 
+//#endregion
+//#region src/processors/frontend-deps.ts
+function processFrontendDeps(vfs, config) {
+	const { frontend, webDeploy } = config;
+	if (!frontend.includes("astro") || webDeploy === "cloudflare") return;
+	const webPackagePath = "apps/web/package.json";
+	if (!vfs.exists(webPackagePath)) return;
+	addPackageDependency({
+		vfs,
+		packagePath: webPackagePath,
+		dependencies: ["@astrojs/node"]
+	});
+}
+
 //#endregion
 //#region src/processors/infra-deps.ts
 function processInfraDeps(vfs, config) {
@@ -2374,6 +2432,18 @@ function processPwaPlugins(vfs, config) {
 
 //#endregion
 //#region src/processors/readme-generator.ts
+function getDesktopStaticBuildNote(frontend) {
+	const staticBuildFrontends = new Map([
+		["tanstack-start", "TanStack Start"],
+		["next", "Next.js"],
+		["nuxt", "Nuxt"],
+		["svelte", "SvelteKit"],
+		["astro", "Astro"]
+	]);
+	const staticBuildFrontend = frontend.find((value) => staticBuildFrontends.has(value));
+	if (!staticBuildFrontend) return "";
+	return `Desktop builds package static web assets. ${staticBuildFrontends.get(staticBuildFrontend)} needs a static/export build configuration before desktop packaging will work.`;
+}
 function processReadme(vfs, config) {
 	const content = generateReadmeContent(config);
 	vfs.writeFile("README.md", content);
@@ -2638,6 +2708,7 @@ function generateFeaturesList(database, auth, addons, orm, runtime, frontend, ba
 	const addonFeatures = {
 		pwa: "- **PWA** - Progressive Web App support",
 		tauri: "- **Tauri** - Build native desktop applications",
+		electrobun: "- **Electrobun** - Lightweight desktop shell for web frontends",
 		biome: "- **Biome** - Linting and formatting",
 		oxlint: "- **Oxlint** - Oxlint + Oxfmt (linting & formatting)",
 		husky: "- **Husky** - Git hooks for code quality",
@@ -2725,8 +2796,19 @@ function generateScriptsList(packageManagerRunCmd, config, hasNative) {
 	if (addons.includes("biome")) scripts += `\n- \`${packageManagerRunCmd} check\`: Run Biome formatting and linting`;
 	if (addons.includes("oxlint")) scripts += `\n- \`${packageManagerRunCmd} check\`: Run Oxlint and Oxfmt`;
 	if (addons.includes("pwa")) scripts += `\n- \`cd apps/web && ${packageManagerRunCmd} generate-pwa-assets\`: Generate PWA assets`;
-	if (addons.includes("tauri")) scripts += `\n- \`cd apps/web && ${packageManagerRunCmd} desktop:dev\`: Start Tauri desktop app in development
+	if (addons.includes("tauri")) {
+		scripts += `\n- \`cd apps/web && ${packageManagerRunCmd} desktop:dev\`: Start Tauri desktop app in development
 - \`cd apps/web && ${packageManagerRunCmd} desktop:build\`: Build Tauri desktop app`;
+		const staticBuildNote = getDesktopStaticBuildNote(frontend);
+		if (staticBuildNote) scripts += `\n- Note: ${staticBuildNote}`;
+	}
+	if (addons.includes("electrobun")) {
+		scripts += `\n- \`${packageManagerRunCmd} dev:desktop\`: Start the Electrobun desktop app with HMR
+- \`${packageManagerRunCmd} build:desktop\`: Build the stable Electrobun desktop app
+- \`${packageManagerRunCmd} build:desktop:canary\`: Build the canary Electrobun desktop app`;
+		const staticBuildNote = getDesktopStaticBuildNote(frontend);
+		if (staticBuildNote) scripts += `\n- Note: ${staticBuildNote}`;
+	}
 	if (addons.includes("starlight")) scripts += `\n- \`cd apps/docs && ${packageManagerRunCmd} dev\`: Start documentation site
 - \`cd apps/docs && ${packageManagerRunCmd} build\`: Build documentation site`;
 	return scripts;
@@ -3035,6 +3117,7 @@ function getRuntimeDevDeps(runtime, backend) {
 //#region src/processors/index.ts
 function processDependencies(vfs, config) {
 	processWorkspaceDeps(vfs, config);
+	processFrontendDeps(vfs, config);
 	processEnvDeps(vfs, config);
 	processInfraDeps(vfs, config);
 	processDatabaseDeps(vfs, config);
@@ -3440,7 +3523,7 @@ async function processExtrasTemplates(vfs, templates, config) {
 	}
 	if (config.packageManager === "bun") processTemplatesFromPrefix(vfs, templates, "extras/bunfig.toml", "", config);
 	if (config.packageManager === "pnpm" && (hasNative || hasNuxt)) processTemplatesFromPrefix(vfs, templates, "extras/_npmrc", "", config);
-	if (config.serverDeploy === "cloudflare") processSingleTemplate(vfs, templates, "extras/env.d.ts", "packages/env/env.d.ts", config);
+	if (config.serverDeploy === "cloudflare" || config.backend === "self" && config.webDeploy === "cloudflare") processSingleTemplate(vfs, templates, "extras/env.d.ts", "packages/env/env.d.ts", config);
 }
 
 //#endregion
@@ -3673,6 +3756,114 @@ const EMBEDDED_TEMPLATES = new Map([
 	]
 	{{/if}}
 }
+`],
+	["addons/electrobun/apps/desktop/.gitignore", `artifacts
+`],
+	["addons/electrobun/apps/desktop/electrobun.config.ts.hbs", `import type { ElectrobunConfig } from "electrobun";
+
+const webBuildDir =
+  "{{#if (includes frontend "react-router")}}../web/build/client{{else if (includes frontend "tanstack-start")}}../web/dist/client{{else if (includes frontend "next")}}../web/out{{else if (includes frontend "nuxt")}}../web/.output/public{{else if (includes frontend "svelte")}}../web/build{{else}}../web/dist{{/if}}";
+
+export default {
+  app: {
+    name: "{{projectName}}",
+    identifier: "dev.bettertstack.{{projectName}}.desktop",
+    version: "0.0.1",
+  },
+  runtime: {
+    exitOnLastWindowClosed: true,
+  },
+  build: {
+    bun: {
+      entrypoint: "src/bun/index.ts",
+    },
+    copy: {
+      [webBuildDir]: "views/mainview",
+    },
+    watchIgnore: [\`\${webBuildDir}/**\`],
+    mac: {
+      bundleCEF: true,
+      defaultRenderer: "cef",
+    },
+    linux: {
+      bundleCEF: true,
+      defaultRenderer: "cef",
+    },
+    win: {
+      bundleCEF: true,
+      defaultRenderer: "cef",
+    },
+  },
+} satisfies ElectrobunConfig;
+`],
+	["addons/electrobun/apps/desktop/package.json.hbs", `{
+  "name": "desktop",
+  "private": true,
+  "type": "module",
+  "scripts": {},
+  "dependencies": {
+    "electrobun": "^1.15.1"
+  },
+  "devDependencies": {
+    "@types/bun": "^1.3.4",
+    "concurrently": "^9.1.0",
+    "typescript": "^5"
+  }
+}
+`],
+	["addons/electrobun/apps/desktop/src/bun/index.ts.hbs", `import { BrowserWindow, Updater } from "electrobun/bun";
+
+const DEV_SERVER_PORT = {{#if (or (includes frontend "react-router") (includes frontend "svelte"))}}5173{{else if (includes frontend "astro")}}4321{{else}}3001{{/if}};
+const DEV_SERVER_URL = \`http://localhost:\${DEV_SERVER_PORT}\`;
+
+// Check if the web dev server is running for HMR
+async function getMainViewUrl(): Promise<string> {
+  const channel = await Updater.localInfo.channel();
+  if (channel === "dev") {
+    try {
+      await fetch(DEV_SERVER_URL, { method: "HEAD" });
+      console.log(\`HMR enabled: Using web dev server at \${DEV_SERVER_URL}\`);
+      return DEV_SERVER_URL;
+    } catch {
+      console.log(
+        'Web dev server not running. Run "{{packageManager}} run dev:hmr" for HMR support.',
+      );
+    }
+  }
+
+  return "views://mainview/index.html";
+}
+
+const url = await getMainViewUrl();
+
+new BrowserWindow({
+  title: "{{projectName}}",
+  url,
+  frame: {
+    width: 1280,
+    height: 820,
+    x: 120,
+    y: 120,
+  },
+});
+
+console.log("Electrobun desktop shell started.");
+`],
+	["addons/electrobun/apps/desktop/tsconfig.json.hbs", `{
+  "extends": "../../packages/config/tsconfig.base.json",
+  "compilerOptions": {
+    "lib": ["ESNext", "DOM"],
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "noEmit": true,
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["./src/*"]
+    }
+  },
+  "include": ["src/**/*.ts", "electrobun.config.ts"]
+}
 `],
 	["addons/husky/.husky/pre-commit", `lint-staged
 `],
@@ -3773,142 +3964,6 @@ export default defineConfig({
   preset,
   images: ["public/logo.png"],
 });
-`],
-	["addons/ruler/.ruler/bts.md.hbs", `# Better-T-Stack Project Rules
-
-This is a {{projectName}} project created with Better-T-Stack CLI.
-
-## Project Structure
-
-This is a monorepo with the following structure:
-
-{{#if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "tanstack-start")
-(includes frontend "next") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
-- **\`apps/web/\`** - {{#if (eq backend "self")}}Fullstack application{{else}}Frontend application{{/if}}{{#if (includes frontend "tanstack-router")}} (React with TanStack Router){{else if (includes frontend "react-router")}} (React with React Router){{else if (includes frontend "tanstack-start")}} (TanStack Start){{else if (includes frontend "next")}} (Next.js){{else if (includes frontend "nuxt")}} (Nuxt.js){{else if (includes frontend "svelte")}} (SvelteKit){{else if (includes frontend "solid")}} (SolidStart){{/if}}
-{{/if}}
-
-{{#if (ne backend "convex")}}
-{{#if (and (ne backend "none") (ne backend "self"))}}
-- **\`apps/server/\`** - Backend server{{#if (eq backend "hono")}} (Hono){{else if (eq backend "express")}} (Express){{else if (eq backend "fastify")}} (Fastify){{else if (eq backend "elysia")}} (Elysia){{/if}}
-{{/if}}
-{{else}}
-- **\`packages/backend/\`** - Convex backend functions
-{{/if}}
-
-{{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
-- **\`apps/native/\`** - React Native mobile app{{#if (includes frontend "native-uniwind")}} (with NativeWind){{else if (includes frontend "native-unistyles")}} (with Unistyles){{else if (includes frontend "native-bare")}} (bare styling){{/if}}
-{{/if}}
-
-{{#if (ne backend "convex")}}
-{{#if (ne api "none")}}
-- **\`packages/api/\`** - Shared API logic and types
-{{/if}}
-{{#if (and (ne auth "none") (ne backend "convex"))}}
-- **\`packages/auth/\`** - Authentication logic and utilities
-{{/if}}
-{{#if (and (ne database "none") (ne orm "none"))}}
-- **\`packages/db/\`** - Database schema and utilities
-{{/if}}
-- **\`packages/env/\`** - Shared environment variables and validation
-- **\`packages/config/\`** - Shared TypeScript configuration
-{{#if (or (eq webDeploy "cloudflare") (eq serverDeploy "cloudflare"))}}
-- **\`packages/infra/\`** - Infrastructure as code (Alchemy for Cloudflare)
-{{/if}}
-{{/if}}
-
-## Available Scripts
-
-- \`{{packageManager}} run dev\` - Start all apps in development mode
-{{#if (and (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "tanstack-start")
-(includes frontend "next") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid")) (ne backend "self"))}}
-- \`{{packageManager}} run dev:web\` - Start only the web app
-{{/if}}
-{{#if (and (ne backend "none") (ne backend "convex") (ne backend "self"))}}
-- \`{{packageManager}} run dev:server\` - Start only the server
-{{/if}}
-{{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
-- \`{{packageManager}} run dev:native\` - Start only the native app
-{{/if}}
-- \`{{packageManager}} run build\` - Build all apps
-- \`{{packageManager}} run lint\` - Lint all packages
-- \`{{packageManager}} run typecheck\` - Type check all packages
-
-{{#if (and (ne database "none") (ne orm "none") (ne backend "convex"))}}
-## Database Commands
-
-All database operations should be run from the {{#if (eq backend "self")}}web{{else}}server{{/if}} workspace:
-
-- \`{{packageManager}} run db:push\` - Push schema changes to database
-- \`{{packageManager}} run db:studio\` - Open database studio
-- \`{{packageManager}} run db:generate\` - Generate {{#if (eq orm "drizzle")}}Drizzle{{else if (eq orm "prisma")}}Prisma{{else}}{{orm}}{{/if}} files
-- \`{{packageManager}} run db:migrate\` - Run database migrations
-
-{{#if (eq orm "drizzle")}}
-Database schema files are located in {{#if (eq backend "self")}}\`apps/web/src/db/schema/\`{{else}}\`packages/db/src/schema/\`{{/if}}
-{{else if (eq orm "prisma")}}
-Database schema is located in {{#if (eq backend "self")}}\`apps/web/prisma/schema.prisma\`{{else}}\`packages/db/prisma/schema.prisma\`{{/if}}
-{{else if (eq orm "mongoose")}}
-Database models are located in {{#if (eq backend "self")}}\`apps/web/src/db/models/\`{{else}}\`packages/db/src/models/\`{{/if}}
-{{/if}}
-{{/if}}
-
-{{#if (ne api "none")}}
-## API Structure
-
-{{#if (eq api "trpc")}}
-- tRPC routers are in \`packages/api/src/routers/\`
-- Client-side tRPC utils are in \`apps/web/src/utils/trpc.ts\`
-{{else if (eq api "orpc")}}
-- oRPC contracts and routers are in \`packages/api/src/\`
-- Client-side oRPC client is in \`apps/web/src/utils/orpc.ts\`
-{{/if}}
-{{/if}}
-
-{{#if (eq auth "better-auth")}}
-## Authentication
-
-Authentication is powered by Better Auth:
-- Auth configuration is in \`packages/auth/src/\`
-{{#if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "tanstack-start")
-(includes frontend "next") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
-- Web app auth client is in \`apps/web/src/lib/auth-client.ts\`
-{{/if}}
-{{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
-- Native app auth client is in \`apps/native/src/lib/auth-client.ts\`
-{{/if}}
-{{/if}}
-
-## Project Configuration
-
-This project includes a \`bts.jsonc\` configuration file that stores your Better-T-Stack settings:
-
-- Contains your selected stack configuration (database, ORM, backend, frontend, etc.)
-- Used by the CLI to understand your project structure
-- Safe to delete if not needed
-
-## Key Points
-
-- This is a {{#if (includes addons "turborepo")}}Turborepo {{/if}}monorepo using {{packageManager}} workspaces
-- Each app has its own \`package.json\` and dependencies
-- Run commands from the root to execute across all workspaces
-- Run workspace-specific commands with \`{{packageManager}} run command-name\`
-{{#if (includes addons "turborepo")}}
-- Turborepo handles build caching and parallel execution
-{{/if}}
-{{#if (or (includes addons "husky") (includes addons "lefthook"))}}
-- Git hooks are configured with {{#if (includes addons "husky")}}Husky{{else}}Lefthook{{/if}} for pre-commit checks
-{{/if}}
-`],
-	["addons/ruler/.ruler/ruler.toml.hbs", `# Ruler Configuration File
-# See https://okigu.com/ruler for documentation.
-
-# Default agents to run when --agents is not specified
-default_agents = []
-
-# --- Global .gitignore Configuration ---
-[gitignore]
-# Enable/disable automatic .gitignore updates (default: true)
-enabled = true
 `],
 	["api/orpc/fullstack/astro/src/pages/rpc/[...rest].ts.hbs", `import type { APIRoute } from "astro";
 import { RPCHandler } from "@orpc/server/fetch";
@@ -4172,24 +4227,23 @@ export const queryClient = new QueryClient({
 
 export const link = new RPCLink({
 {{#if (eq backend "self")}}
-{{#unless (includes frontend "astro")}}
+{{#if (or (includes frontend "next") (includes frontend "tanstack-start"))}}
 	url: \`\${env.EXPO_PUBLIC_SERVER_URL}/api/rpc\`,
 {{else}}
 	url: \`\${env.EXPO_PUBLIC_SERVER_URL}/rpc\`,
-{{/unless}}
+{{/if}}
 {{else}}
 	url: \`\${env.EXPO_PUBLIC_SERVER_URL}/rpc\`,
 {{/if}}
 {{#if (eq auth "better-auth")}}
 	fetch:
-		Platform.OS !== "web"
-			? undefined
-			: function (url, options) {
-					return fetch(url, {
-						...options,
-						credentials: "include",
-					});
-				},
+		function (url, options) {
+			return fetch(url, {
+				...options,
+				// Better Auth Expo forwards the session cookie manually on native.
+				credentials: Platform.OS === "web" ? "include" : "omit",
+			});
+		},
 	headers() {
 		if (Platform.OS === "web") {
 			return {};
@@ -4877,14 +4931,13 @@ const trpcClient = createTRPCClient<AppRouter>({
 {{/if}}
 {{#if (eq auth "better-auth")}}
 			fetch:
-				Platform.OS !== "web"
-					? undefined
-					: function (url, options) {
-							return fetch(url, {
-								...options,
-								credentials: "include",
-							});
-						},
+				function (url, options) {
+					return fetch(url, {
+						...options,
+						// Better Auth Expo forwards the session cookie manually on native.
+						credentials: Platform.OS === "web" ? "include" : "omit",
+					});
+				},
 			headers() {
 				if (Platform.OS === "web") {
 					return {};
@@ -9911,6 +9964,8 @@ export const auth = betterAuth({
 	emailAndPassword: {
 		enabled: true,
 	},
+	secret: env.BETTER_AUTH_SECRET,
+	baseURL: env.BETTER_AUTH_URL,
 {{#if (ne backend "self")}}
 	advanced: {
 		defaultCookieAttributes: {
@@ -9982,6 +10037,8 @@ export const auth = betterAuth({
 	emailAndPassword: {
 		enabled: true,
 	},
+	secret: env.BETTER_AUTH_SECRET,
+	baseURL: env.BETTER_AUTH_URL,
 {{#if (ne backend "self")}}
 	advanced: {
 		defaultCookieAttributes: {
@@ -10129,6 +10186,8 @@ export const auth = betterAuth({
 	emailAndPassword: {
 		enabled: true,
 	},
+	secret: env.BETTER_AUTH_SECRET,
+	baseURL: env.BETTER_AUTH_URL,
 {{#if (ne backend "self")}}
 	advanced: {
 		defaultCookieAttributes: {
@@ -10191,6 +10250,8 @@ export const auth = betterAuth({
 	emailAndPassword: {
 		enabled: true,
 	},
+	secret: env.BETTER_AUTH_SECRET,
+	baseURL: env.BETTER_AUTH_URL,
 {{#if (ne backend "self")}}
 	advanced: {
 		defaultCookieAttributes: {
@@ -22663,7 +22724,11 @@ linker = "hoisted" # having issues with Nuxt when linker is isolated
 {{else}}
 linker = "isolated"
 {{/if}}`],
-	["extras/env.d.ts.hbs", `import { type server } from "@{{projectName}}/infra/alchemy.run";
+	["extras/env.d.ts.hbs", `{{#if (eq serverDeploy "cloudflare")}}
+import { type server } from "@{{projectName}}/infra/alchemy.run";
+{{else}}
+import { type web as server } from "@{{projectName}}/infra/alchemy.run";
+{{/if}}
 
 // This file infers types for the cloudflare:workers environment from your Alchemy Worker.
 // @see https://alchemy.run/concepts/bindings/#type-safe-bindings
@@ -22746,8 +22811,7 @@ export default defineConfig({
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/node": "^9.5.2",
-    "astro": "^5.16.11"
+    "astro": "^6.0.1"
   },
   "devDependencies": {
     "@tailwindcss/vite": "^4.1.18",
@@ -28913,7 +28977,7 @@ export const env = createEnv({
 	runtimeEnv: process.env,
 	emptyStringAsUndefined: true,
 });`],
-	["packages/env/src/server.ts.hbs", `{{#if (eq serverDeploy "cloudflare")}}
+	["packages/env/src/server.ts.hbs", `{{#if (or (eq serverDeploy "cloudflare") (and (eq backend "self") (eq webDeploy "cloudflare")))}}
 /// <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
@@ -28951,7 +29015,8 @@ export const env = createEnv({
 	runtimeEnv: process.env,
 	emptyStringAsUndefined: true,
 });
-{{/if}}`],
+{{/if}}
+`],
 	["packages/env/src/web.ts.hbs", `{{#if (includes frontend "next")}}
 import { createEnv } from "@t3-oss/env-nextjs";
 {{else if (includes frontend "nuxt")}}
@@ -29317,6 +29382,11 @@ export const web = await Vite("web", {
 {{else if (includes frontend "astro")}}
 export const web = await Astro("web", {
   cwd: "../../apps/web",
+  entrypoint: "dist/server/entry.mjs",
+  assets: "dist/client",
+  {{#if (eq backend "self")}}
+  compatibility: "node",
+  {{/if}}
   bindings: {
     {{#if (ne backend "self")}}
     PUBLIC_SERVER_URL: alchemy.env.PUBLIC_SERVER_URL!,
@@ -30348,7 +30418,7 @@ function SuccessPage() {
 </div>
 `]
 ]);
-const TEMPLATE_COUNT = 441;
+const TEMPLATE_COUNT = 444;
 
 //#endregion
 export { EMBEDDED_TEMPLATES, GeneratorError, Handlebars, TEMPLATE_COUNT, VirtualFileSystem, dependencyVersionMap, generate, generateReproducibleCommand, isBinaryFile, processAddonTemplates, processAddonsDeps, processFileContent, processTemplateString, transformFilename, writeBtsConfigToVfs };