@better-t-stack/template-generator 3.19.2 → 3.19.4

package/dist/index.d.mts

@@ -79,8 +79,8 @@ declare const TEMPLATE_COUNT = 435;
 //#region src/utils/add-deps.d.ts
 declare const dependencyVersionMap: {
   readonly typescript: "^5";
-  readonly "better-auth": "^1.4.9";
-  readonly "@better-auth/expo": "^1.4.9";
+  readonly "better-auth": "^1.4.18";
+  readonly "@better-auth/expo": "^1.4.18";
   readonly "@clerk/nextjs": "^6.31.5";
   readonly "@clerk/clerk-react": "^5.45.0";
   readonly "@clerk/tanstack-react-start": "^0.26.3";

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../src/core/virtual-fs.ts","../src/core/template-processor.ts","../src/template-handlers/utils.ts","../src/template-handlers/addons.ts","../src/generator.ts","../src/processors/addons-deps.ts","../src/bts-config.ts","../src/templates.generated.ts","../src/utils/add-deps.ts","../src/utils/reproducible-command.ts"],"sourcesContent":[],"mappings":";;;;;;;cAOa,iBAAA;;;;;;EAAA,QAAA,CAAA,QAAA,EAAA,MAAiB,CAAA,EAAA,MAAA,GAAA,SAAA;EA6Ea,MAAA,CAAA,IAAA,EAAA,MAAA,CAAA,EAAA,OAAA;EAkCX,UAAA,CAAA,QAAA,EAAA,MAAA,CAAA,EAAA,OAAA;EAAgB,eAcrC,CAAA,OAAA,EAAA,MAAA,CAAA,EAAA,OAAA;EAAA,KAGJ,CAAA,OAAA,EAAA,MAAA,CAAA,EAAA,IAAA;EAAA,UAAA,CAAA,QAAA,EAAA,MAAA,CAAA,EAAA,OAAA;;2CAnDoC;;ECzE3B,WAAA,CAAA,CAAA,EAAA,MAAA,EAAA;EAIA,iBAAY,CAAA,CAAA,EAAA,MAAA,EAAA;EAIZ,YAAA,CAAA,CAAA,EAAA,MAAiB;EAUjB,iBAAA,CAAA,CAAA,EAAkB,MAAA;6BDyFF;;eAAgB,MAAA,CAcrC;EE9HC,KAAA,CAAA,CAAA,EF8HD,MAAA,CAGJ,GEjIoB;;;;ECAL,QAAA,aAAA;;;;iBFKN,qBAAA,2BAAgD;iBAIhD,YAAA;iBAIA,iBAAA;iBAUA,kBAAA,6CAGL;;;KC1BC,YAAA,GAAe;;;iBCAL,qBAAA,MACf,8BACM,sBACH,gBACP;;;;;AHHH;;;;;;;;;ACIA;AAIA;AAIgB,iBG8BM,QAAA,CH9BW,OAAA,EG+BtB,gBH/BsB,CAAA,EGgC9B,OHhC8B,CGgCtB,MHhCsB,CGgCf,eHhCe,EGgCE,cHhCF,CAAA,CAAA;;;iBIJjB,iBAAA,MAAuB,2BAA2B;;;;;;;iBCLlD,mBAAA,MACT,kCACU;;;cCTJ,oBAAoB;cA+9xBpB,cAAA;;;cCr9xBA;;;ERNA,SAAA,mBAAiB,EAAA,QAAA;EA6Ea,SAAA,eAAA,EAAA,SAAA;EAkCX,SAAA,oBAAA,EAAA,SAAA;EAAgB,SAcrC,6BAAA,EAAA,SAAA;EAAA,SAGJ,mBAAA,EAAA,UAAA;EAAA,SAAA,aAAA,EAAA,SAAA;;;;EC5HS,SAAA,MAAA,EAAA,QAAqB;EAIrB,SAAA,0BAAY,EAAA,QAAA;EAIZ,SAAA,EAAA,EAAA,SAAiB;EAUjB,SAAA,WAAA,EAAkB,SAAA;;;;ECvBtB,SAAA,gBAAY,EAAG,QAAG;;;;ECAR,SAAA,yBAAqB,EAAA,QAAA;EACpC,SAAA,wBAAA,EAAA,QAAA;EACM,SAAA,gCAAA,EAAA,QAAA;EACH,SAAA,oBAAA,EAAA,QAAA;EACP,SAAA,6BAAA,EAAA,QAAA;EAAO,SAAA,QAAA,EAAA,SAAA;;;;ECuCY,SAAA,gBAAQ,EAAA,QAAA;EACnB,SAAA,MAAA,EAAA,SAAA;EACO,SAAA,KAAA,EAAA,SAAA;EAAiB,SAAA,KAAA,EAAA,QAAA;EAAxB,SAAA,QAAA,EAAA,SAAA;EAAR,SAAA,aAAA,EAAA,SAAA;EAAO,SAAA,GAAA,EAAA,SAAA;;;;ECpCM,SAAA,gBAAiB,EAAA,QAAM;;;;ECLvB,SAAA,mBAAmB,EAAA,QAC5B;;;;ECRM,SAAA,gBA69xBX,EAAA,QA79xB+B;EA+9xBpB,SAAA,aAAc,EAAA,SAAA;;;;ECr9xBd,SAAA,EAAA,EAAA,QAAA;EA8ID,SAAA,gBAAqB,EAAA,QAAA;;;;ECzJjB,SAAA,kBAAA,EAAA,QAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KDyJ/B,qBAAA,gBAAqC;;;iBCzJjC,2BAAA,SAAoC"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../src/core/virtual-fs.ts","../src/core/template-processor.ts","../src/template-handlers/utils.ts","../src/template-handlers/addons.ts","../src/generator.ts","../src/processors/addons-deps.ts","../src/bts-config.ts","../src/templates.generated.ts","../src/utils/add-deps.ts","../src/utils/reproducible-command.ts"],"sourcesContent":[],"mappings":";;;;;;;cAOa,iBAAA;;;;;;EAAA,QAAA,CAAA,QAAA,EAAA,MAAiB,CAAA,EAAA,MAAA,GAAA,SAAA;EA6Ea,MAAA,CAAA,IAAA,EAAA,MAAA,CAAA,EAAA,OAAA;EAkCX,UAAA,CAAA,QAAA,EAAA,MAAA,CAAA,EAAA,OAAA;EAAgB,eAcrC,CAAA,OAAA,EAAA,MAAA,CAAA,EAAA,OAAA;EAAA,KAGJ,CAAA,OAAA,EAAA,MAAA,CAAA,EAAA,IAAA;EAAA,UAAA,CAAA,QAAA,EAAA,MAAA,CAAA,EAAA,OAAA;;2CAnDoC;;ECzE3B,WAAA,CAAA,CAAA,EAAA,MAAA,EAAA;EAIA,iBAAY,CAAA,CAAA,EAAA,MAAA,EAAA;EAIZ,YAAA,CAAA,CAAA,EAAA,MAAiB;EAUjB,iBAAA,CAAA,CAAA,EAAkB,MAAA;6BDyFF;;eAAgB,MAAA,CAcrC;EE9HC,KAAA,CAAA,CAAA,EF8HD,MAAA,CAGJ,GEjIoB;;;;ECAL,QAAA,aAAA;;;;iBFKN,qBAAA,2BAAgD;iBAIhD,YAAA;iBAIA,iBAAA;iBAUA,kBAAA,6CAGL;;;KC1BC,YAAA,GAAe;;;iBCAL,qBAAA,MACf,8BACM,sBACH,gBACP;;;;;AHHH;;;;;;;;;ACIA;AAIA;AAIgB,iBG8BM,QAAA,CH9BW,OAAA,EG+BtB,gBH/BsB,CAAA,EGgC9B,OHhC8B,CGgCtB,MHhCsB,CGgCf,eHhCe,EGgCE,cHhCF,CAAA,CAAA;;;iBIJjB,iBAAA,MAAuB,2BAA2B;;;;;;;iBCLlD,mBAAA,MACT,kCACU;;;cCTJ,oBAAoB;cAmiyBpB,cAAA;;;cCzhyBA;;;ERNA,SAAA,mBAAiB,EAAA,SAAA;EA6Ea,SAAA,eAAA,EAAA,SAAA;EAkCX,SAAA,oBAAA,EAAA,SAAA;EAAgB,SAcrC,6BAAA,EAAA,SAAA;EAAA,SAGJ,mBAAA,EAAA,UAAA;EAAA,SAAA,aAAA,EAAA,SAAA;;;;EC5HS,SAAA,MAAA,EAAA,QAAqB;EAIrB,SAAA,0BAAY,EAAA,QAAA;EAIZ,SAAA,EAAA,EAAA,SAAiB;EAUjB,SAAA,WAAA,EAAkB,SAAA;;;;ECvBtB,SAAA,gBAAY,EAAG,QAAG;;;;ECAR,SAAA,yBAAqB,EAAA,QAAA;EACpC,SAAA,wBAAA,EAAA,QAAA;EACM,SAAA,gCAAA,EAAA,QAAA;EACH,SAAA,oBAAA,EAAA,QAAA;EACP,SAAA,6BAAA,EAAA,QAAA;EAAO,SAAA,QAAA,EAAA,SAAA;;;;ECuCY,SAAA,gBAAQ,EAAA,QAAA;EACnB,SAAA,MAAA,EAAA,SAAA;EACO,SAAA,KAAA,EAAA,SAAA;EAAiB,SAAA,KAAA,EAAA,QAAA;EAAxB,SAAA,QAAA,EAAA,SAAA;EAAR,SAAA,aAAA,EAAA,SAAA;EAAO,SAAA,GAAA,EAAA,SAAA;;;;ECpCM,SAAA,gBAAiB,EAAA,QAAM;;;;ECLvB,SAAA,mBAAmB,EAAA,QAC5B;;;;ECRM,SAAA,gBAiiyBX,EAAA,QAjiyB+B;EAmiyBpB,SAAA,aAAc,EAAA,SAAA;;;;ECzhyBd,SAAA,EAAA,EAAA,QAAA;EA8ID,SAAA,gBAAqB,EAAA,QAAA;;;;EC5IjB,SAAA,kBAAA,EAAA,QAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KD4I/B,qBAAA,gBAAqC;;;iBC5IjC,2BAAA,SAAoC"}

package/dist/index.mjs

@@ -380,6 +380,28 @@ function updatePackageJsonsWithCatalogs(vfs, packagesInfo, catalog) {
 	}
 }
 
+//#endregion
+//#region src/utils/db-scripts.ts
+function getDbScriptSupport(config) {
+	const isD1Alchemy = config.dbSetup === "d1" && config.serverDeploy === "cloudflare";
+	if (!(config.backend !== "convex" && config.backend !== "none" && config.database !== "none" && config.orm !== "none" && config.orm !== "mongoose")) return {
+		hasDbScripts: false,
+		hasDbPush: false,
+		hasDbGenerate: false,
+		hasDbMigrate: false,
+		hasDbStudio: false,
+		isD1Alchemy
+	};
+	return {
+		hasDbScripts: true,
+		hasDbPush: true,
+		hasDbGenerate: true,
+		hasDbMigrate: config.orm === "prisma" || config.orm === "drizzle" && !isD1Alchemy,
+		hasDbStudio: !isD1Alchemy,
+		isD1Alchemy
+	};
+}
+
 //#endregion
 //#region src/post-process/package-configs.ts
 /**
@@ -408,12 +430,13 @@ function updateRootPackageJson(vfs, config) {
 	else if (pkgJson.workspaces && typeof pkgJson.workspaces === "object" && pkgJson.workspaces.packages) workspaces = pkgJson.workspaces.packages;
 	pkgJson.workspaces = workspaces;
 	const scripts = pkgJson.scripts;
-	const { projectName, packageManager, backend, database, orm, dbSetup, serverDeploy, addons } = config;
+	const { projectName, packageManager, backend, database, orm, dbSetup, addons } = config;
 	const backendPackageName = backend === "convex" ? `@${projectName}/backend` : "server";
 	const dbPackageName = `@${projectName}/db`;
 	const hasTurborepo = addons.includes("turborepo");
-	const needsDbScripts = backend !== "convex" && database !== "none" && orm !== "none" && orm !== "mongoose";
-	const isD1Alchemy = dbSetup === "d1" && serverDeploy === "cloudflare";
+	const dbSupport = getDbScriptSupport(config);
+	const needsDbScripts = dbSupport.hasDbScripts;
+	const isD1Alchemy = dbSupport.isD1Alchemy;
 	const pmConfig = getPackageManagerConfig(packageManager, hasTurborepo);
 	scripts.dev = pmConfig.dev;
 	scripts.build = pmConfig.build;
@@ -490,8 +513,8 @@ function updateDbPackageJson(vfs, config) {
 	pkgJson.name = `@${config.projectName}/db`;
 	pkgJson.scripts = pkgJson.scripts || {};
 	const scripts = pkgJson.scripts;
-	const { database, orm, dbSetup, serverDeploy } = config;
-	const isD1Alchemy = dbSetup === "d1" && serverDeploy === "cloudflare";
+	const { database, orm, dbSetup } = config;
+	const { isD1Alchemy } = getDbScriptSupport(config);
 	if (database !== "none") {
 		if (database === "sqlite" && dbSetup !== "d1") scripts["db:local"] = "turso dev --db-file local.db";
 		if (orm === "prisma") {
@@ -599,8 +622,8 @@ function renameDevScriptsForAlchemy(vfs, config) {
 //#region src/utils/add-deps.ts
 const dependencyVersionMap = {
 	typescript: "^5",
-	"better-auth": "^1.4.9",
-	"@better-auth/expo": "^1.4.9",
+	"better-auth": "^1.4.18",
+	"@better-auth/expo": "^1.4.18",
 	"@clerk/nextjs": "^6.31.5",
 	"@clerk/clerk-react": "^5.45.0",
 	"@clerk/tanstack-react-start": "^0.26.3",
@@ -2179,7 +2202,7 @@ function processReadme(vfs, config) {
 	vfs.writeFile("README.md", content);
 }
 function generateReadmeContent(options) {
-	const { projectName, packageManager, database, auth, addons = [], orm = "drizzle", runtime = "bun", frontend = ["tanstack-router"], backend = "hono", api = "trpc", webDeploy, serverDeploy, dbSetup } = options;
+	const { projectName, packageManager, database, auth, addons = [], orm = "drizzle", runtime = "bun", frontend = ["tanstack-router"], backend = "hono", api = "trpc", webDeploy, serverDeploy } = options;
 	const isConvex = backend === "convex";
 	const hasReactRouter = frontend.includes("react-router");
 	const hasNative = frontend.some((f) => [
@@ -2224,7 +2247,7 @@ ${auth === "clerk" ? `
 
 - Follow the guide: [Convex + Clerk](https://docs.convex.dev/auth/clerk)
 - Set \`CLERK_JWT_ISSUER_DOMAIN\` in Convex Dashboard
-- Set \`CLERK_PUBLISHABLE_KEY\` in \`apps/*/.env\`` : ""}` : generateDatabaseSetup(database, packageManagerRunCmd, orm, dbSetup, backend)}
+- Set \`CLERK_PUBLISHABLE_KEY\` in \`apps/*/.env\`` : ""}` : generateDatabaseSetup(options, packageManagerRunCmd)}
 
 Then, run the development server:
 
@@ -2240,12 +2263,12 @@ ${generateGitHooksSection(packageManagerRunCmd, addons)}
 ## Project Structure
 
 \`\`\`
-${generateProjectStructure(projectName, frontend, backend, addons, isConvex, api, auth)}
+${generateProjectStructure(options)}
 \`\`\`
 
 ## Available Scripts
 
-${generateScriptsList(packageManagerRunCmd, database, orm, hasNative, addons, backend, dbSetup)}
+${generateScriptsList(packageManagerRunCmd, options, hasNative)}
 `;
 }
 function generateStackDescription(frontend, backend, api, isConvex) {
@@ -2281,7 +2304,9 @@ function generateRunningInstructions(frontend, backend, webPort, hasNative, isCo
 	else if (backend !== "none" && !isBackendSelf) instructions.push("The API is running at [http://localhost:3000](http://localhost:3000).");
 	return instructions.join("\n");
 }
-function generateProjectStructure(projectName, frontend, backend, addons, isConvex, api, auth) {
+function generateProjectStructure(config) {
+	const { projectName, frontend, backend, addons, api, auth, database, orm } = config;
+	const isConvex = backend === "convex";
 	const structure = [`${projectName}/`, "├── apps/"];
 	const hasFrontend = frontend.length > 0 && !frontend.includes("none");
 	const isBackendSelf = backend === "self";
@@ -2290,6 +2315,7 @@ function generateProjectStructure(projectName, frontend, backend, addons, isConv
 		"native-uniwind",
 		"native-unistyles"
 	].includes(f));
+	const hasDbPackage = !isConvex && database !== "none" && orm !== "none";
 	if (hasFrontend) {
 		const frontendTypes = {
 			"tanstack-router": "React + TanStack Router",
@@ -2321,9 +2347,9 @@ function generateProjectStructure(projectName, frontend, backend, addons, isConv
 			if (auth === "clerk") structure.push("│   │   ├── convex/    # Convex functions and schema", "│   │   └── .env.local # Convex environment variables");
 		}
 		if (!isConvex) {
-			structure.push("│   ├── api/         # API layer / business logic");
+			if (api !== "none") structure.push("│   ├── api/         # API layer / business logic");
 			if (auth !== "none") structure.push("│   ├── auth/        # Authentication configuration & logic");
-			if (api !== "none" || auth !== "none") structure.push("│   └── db/          # Database schema & queries");
+			if (hasDbPackage) structure.push("│   └── db/          # Database schema & queries");
 		}
 	}
 	return structure.join("\n");
@@ -2393,11 +2419,18 @@ function generateFeaturesList(database, auth, addons, orm, runtime, frontend, ba
 	for (const addon of addons) if (addonFeatures[addon]) features.push(addonFeatures[addon]);
 	return features.join("\n");
 }
-function generateDatabaseSetup(database, packageManagerRunCmd, orm, dbSetup, backend) {
+function generateDatabaseSetup(config, packageManagerRunCmd) {
+	const { database, orm, dbSetup, backend } = config;
 	if (database === "none") return "";
 	const isBackendSelf = backend === "self";
 	const envPath = isBackendSelf ? "apps/web/.env" : "apps/server/.env";
-	const ormDesc = orm === "drizzle" ? " with Drizzle ORM" : orm === "prisma" ? " with Prisma" : ` with ${orm}`;
+	const ormDesc = orm === "none" ? "" : ` with ${{
+		drizzle: "Drizzle ORM",
+		prisma: "Prisma",
+		mongoose: "Mongoose",
+		none: "ORM"
+	}[orm] || orm}`;
+	const dbSupport = getDbScriptSupport(config);
 	let setup = "## Database Setup\n\n";
 	const dbDescriptions = {
 		sqlite: `This project uses SQLite${ormDesc}.
@@ -2422,7 +2455,7 @@ ${packageManagerRunCmd} db:local
 2. Update your \`${envPath}\` file with your MongoDB connection URI.`
 	};
 	setup += dbDescriptions[database] || "";
-	setup += `
+	if (dbSupport.hasDbPush) setup += `
 
 3. Apply the schema to your database:
 \`\`\`bash
@@ -2431,9 +2464,11 @@ ${packageManagerRunCmd} db:push
 `;
 	return setup;
 }
-function generateScriptsList(packageManagerRunCmd, database, orm, hasNative, addons, backend, dbSetup) {
+function generateScriptsList(packageManagerRunCmd, config, hasNative) {
+	const { database, addons, backend, dbSetup } = config;
 	const isConvex = backend === "convex";
 	const isBackendSelf = backend === "self";
+	const dbSupport = getDbScriptSupport(config);
 	let scripts = `- \`${packageManagerRunCmd} dev\`: Start all applications in development mode
 - \`${packageManagerRunCmd} build\`: Build all applications`;
 	if (!isBackendSelf) scripts += `\n- \`${packageManagerRunCmd} dev:web\`: Start only the web application`;
@@ -2441,11 +2476,13 @@ function generateScriptsList(packageManagerRunCmd, database, orm, hasNative, add
 	else if (backend !== "none" && !isBackendSelf) scripts += `\n- \`${packageManagerRunCmd} dev:server\`: Start only the server`;
 	scripts += `\n- \`${packageManagerRunCmd} check-types\`: Check TypeScript types across all apps`;
 	if (hasNative) scripts += `\n- \`${packageManagerRunCmd} dev:native\`: Start the React Native/Expo development server`;
-	if (database !== "none" && !isConvex) {
-		scripts += `\n- \`${packageManagerRunCmd} db:push\`: Push schema changes to database
-- \`${packageManagerRunCmd} db:studio\`: Open database studio UI`;
-		if (database === "sqlite" && dbSetup !== "d1") scripts += `\n- \`${packageManagerRunCmd} db:local\`: Start the local SQLite database`;
+	if (dbSupport.hasDbScripts) {
+		scripts += `\n- \`${packageManagerRunCmd} db:push\`: Push schema changes to database`;
+		if (dbSupport.hasDbGenerate) scripts += `\n- \`${packageManagerRunCmd} db:generate\`: Generate database client/types`;
+		if (dbSupport.hasDbMigrate) scripts += `\n- \`${packageManagerRunCmd} db:migrate\`: Run database migrations`;
+		if (dbSupport.hasDbStudio) scripts += `\n- \`${packageManagerRunCmd} db:studio\`: Open database studio UI`;
 	}
+	if (database === "sqlite" && dbSetup !== "d1" && dbSupport.hasDbScripts) scripts += `\n- \`${packageManagerRunCmd} db:local\`: Start the local SQLite database`;
 	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`;
@@ -2522,11 +2559,12 @@ function processTurboConfig(vfs, config) {
 	vfs.writeFile("turbo.json", JSON.stringify(turboConfig, null, "	"));
 }
 function generateTurboConfig(config) {
-	const { backend, database, orm, dbSetup, webDeploy, serverDeploy, frontend } = config;
+	const { backend, database, dbSetup, webDeploy, serverDeploy, frontend } = config;
 	const isConvex = backend === "convex";
-	const hasDatabase = database !== "none" && orm !== "none";
+	const dbSupport = getDbScriptSupport(config);
+	const hasDatabase = dbSupport.hasDbScripts;
 	const isDocker = dbSetup === "docker";
-	const isSqliteLocal = database === "sqlite" && dbSetup !== "d1";
+	const isSqliteLocal = database === "sqlite" && dbSetup !== "d1" && hasDatabase;
 	const hasCloudflare = webDeploy === "cloudflare" || serverDeploy === "cloudflare";
 	return {
 		$schema: "https://turbo.build/schema.json",
@@ -2534,7 +2572,7 @@ function generateTurboConfig(config) {
 		tasks: {
 			...getBaseTasks(frontend),
 			...isConvex ? getConvexTasks() : {},
-			...!isConvex && hasDatabase ? getDatabaseTasks() : {},
+			...!isConvex && hasDatabase ? getDatabaseTasks(dbSupport) : {},
 			...isDocker ? getDockerTasks() : {},
 			...isSqliteLocal ? getSqliteLocalTask() : {},
 			...hasCloudflare ? getDeployTasks() : {}
@@ -2567,19 +2605,19 @@ function getConvexTasks() {
 		persistent: true
 	} };
 }
-function getDatabaseTasks() {
-	return {
-		"db:push": { cache: false },
-		"db:studio": {
-			cache: false,
-			persistent: true
-		},
-		"db:migrate": {
-			cache: false,
-			persistent: true
-		},
-		"db:generate": { cache: false }
+function getDatabaseTasks(dbSupport) {
+	const tasks = {};
+	if (dbSupport.hasDbPush) tasks["db:push"] = { cache: false };
+	if (dbSupport.hasDbGenerate) tasks["db:generate"] = { cache: false };
+	if (dbSupport.hasDbMigrate) tasks["db:migrate"] = {
+		cache: false,
+		persistent: true
+	};
+	if (dbSupport.hasDbStudio) tasks["db:studio"] = {
+		cache: false,
+		persistent: true
 	};
+	return tasks;
 }
 function getDockerTasks() {
 	return {
@@ -3167,10 +3205,21 @@ async function processDeployTemplates(vfs, templates, config) {
 
 //#endregion
 //#region src/utils/reproducible-command.ts
+function normalizeMultiValues(values) {
+	if (!values || values.length === 0) return [];
+	const filtered = values.filter((value) => value !== "none");
+	return Array.from(new Set(filtered));
+}
+function formatMultiFlag(flag, values) {
+	if (values.length === 0) return `${flag} none`;
+	return `${flag} ${values.join(" ")}`;
+}
 function generateReproducibleCommand(config) {
 	const flags = [];
-	if (config.frontend && config.frontend.length > 0) flags.push(`--frontend ${config.frontend.join(" ")}`);
-	else flags.push("--frontend none");
+	const frontend = normalizeMultiValues(config.frontend);
+	const addons = normalizeMultiValues(config.addons);
+	const examples = normalizeMultiValues(config.examples);
+	flags.push(formatMultiFlag("--frontend", frontend));
 	flags.push(`--backend ${config.backend}`);
 	flags.push(`--runtime ${config.runtime}`);
 	flags.push(`--database ${config.database}`);
@@ -3178,10 +3227,8 @@ function generateReproducibleCommand(config) {
 	flags.push(`--api ${config.api}`);
 	flags.push(`--auth ${config.auth}`);
 	flags.push(`--payments ${config.payments}`);
-	if (config.addons && config.addons.length > 0) flags.push(`--addons ${config.addons.join(" ")}`);
-	else flags.push("--addons none");
-	if (config.examples && config.examples.length > 0) flags.push(`--examples ${config.examples.join(" ")}`);
-	else flags.push("--examples none");
+	flags.push(formatMultiFlag("--addons", addons));
+	flags.push(formatMultiFlag("--examples", examples));
 	flags.push(`--db-setup ${config.dbSetup}`);
 	flags.push(`--web-deploy ${config.webDeploy}`);
 	flags.push(`--server-deploy ${config.serverDeploy}`);
@@ -3918,6 +3965,7 @@ import type { AppRouterClient } from "@{{projectName}}/api/routers/index";
 import { env } from "@{{projectName}}/env/native";
 {{#if (eq auth "better-auth")}}
 import { authClient } from "@/lib/auth-client";
+import { Platform } from "react-native";
 {{/if}}
 
 export const queryClient = new QueryClient({
@@ -3939,7 +3987,19 @@ export const link = new RPCLink({
 	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",
+					});
+				},
 	headers() {
+		if (Platform.OS === "web") {
+			return {};
+		}
 		const headers = new Map<string, string>();
 		const cookies = authClient.getCookie();
 		if (cookies) {
@@ -4602,6 +4662,7 @@ export const Route = createFileRoute('/api/trpc/$')({
 `],
 	["api/trpc/native/utils/trpc.ts.hbs", `{{#if (eq auth "better-auth")}}
 import { authClient } from "@/lib/auth-client";
+import { Platform } from "react-native";
 {{/if}}
 import { QueryClient } from "@tanstack/react-query";
 import { createTRPCClient, httpBatchLink } from "@trpc/client";
@@ -4620,7 +4681,19 @@ const trpcClient = createTRPCClient<AppRouter>({
 			url: \`\${env.EXPO_PUBLIC_SERVER_URL}/trpc\`,
 {{/if}}
 {{#if (eq auth "better-auth")}}
+			fetch:
+				Platform.OS !== "web"
+					? undefined
+					: function (url, options) {
+							return fetch(url, {
+								...options,
+								credentials: "include",
+							});
+						},
 			headers() {
+				if (Platform.OS === "web") {
+					return {};
+				}
 				const headers = new Map<string, string>();
 				const cookies = authClient.getCookie();
 				if (cookies) {
@@ -5064,11 +5137,11 @@ function createAuth(ctx: GenericCtx<DataModel>) {
   return betterAuth({
     {{#if (and (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles")) (or (includes frontend "tanstack-start") (includes frontend "next")))}}
     baseURL: siteUrl,
-    trustedOrigins: [siteUrl, nativeAppUrl],
+    trustedOrigins: [siteUrl, nativeAppUrl, ...(process.env.NODE_ENV === "development" ? ["exp://", "exp://**", "exp://192.168.*.*:*/**"] : [])],
     {{else if (and (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles")) (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid")))}}
-    trustedOrigins: [siteUrl, nativeAppUrl],
+    trustedOrigins: [siteUrl, nativeAppUrl, ...(process.env.NODE_ENV === "development" ? ["exp://", "exp://**", "exp://192.168.*.*:*/**"] : [])],
     {{else if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
-    trustedOrigins: [nativeAppUrl],
+    trustedOrigins: [nativeAppUrl, ...(process.env.NODE_ENV === "development" ? ["exp://", "exp://**", "exp://192.168.*.*:*/**"] : [])],
     {{else if (or (includes frontend "tanstack-start") (includes frontend "next"))}}
     baseURL: siteUrl,
     trustedOrigins: [siteUrl],
@@ -8515,7 +8588,15 @@ export const auth = betterAuth({
 	trustedOrigins: [
 		env.CORS_ORIGIN,
 {{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
-		"mybettertapp://", "exp://"
+		"mybettertapp://",
+		...(env.NODE_ENV === "development"
+			? [
+				"exp://",
+				"exp://**",
+				"exp://192.168.*.*:*/**",
+				"http://localhost:8081",
+			]
+			: []),
 {{/if}}
 	],
 	emailAndPassword: {
@@ -8578,7 +8659,15 @@ export const auth = betterAuth({
 	trustedOrigins: [
 		env.CORS_ORIGIN,
 {{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
-		"mybettertapp://", "exp://"
+		"mybettertapp://",
+		...(env.NODE_ENV === "development"
+			? [
+				"exp://",
+				"exp://**",
+				"exp://192.168.*.*:*/**",
+				"http://localhost:8081",
+			]
+			: []),
 {{/if}}
 	],
 	emailAndPassword: {
@@ -8640,7 +8729,15 @@ export const auth = betterAuth({
 	trustedOrigins: [
 		env.CORS_ORIGIN,
 {{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
-		"mybettertapp://", "exp://"
+		"mybettertapp://",
+		...(env.NODE_ENV === "development"
+			? [
+				"exp://",
+				"exp://**",
+				"exp://192.168.*.*:*/**",
+				"http://localhost:8081",
+			]
+			: []),
 {{/if}}
 	],
 	emailAndPassword: {
@@ -8709,7 +8806,15 @@ export const auth = betterAuth({
 	trustedOrigins: [
 		env.CORS_ORIGIN,
 {{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
-		"mybettertapp://", "exp://"
+		"mybettertapp://",
+		...(env.NODE_ENV === "development"
+			? [
+				"exp://",
+				"exp://**",
+				"exp://192.168.*.*:*/**",
+				"http://localhost:8081",
+			]
+			: []),
 {{/if}}
 	],
 	emailAndPassword: {
@@ -8763,7 +8868,15 @@ export const auth = betterAuth({
 	trustedOrigins: [
 		env.CORS_ORIGIN,
 {{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
-		"mybettertapp://", "exp://"
+		"mybettertapp://",
+		...(env.NODE_ENV === "development"
+			? [
+				"exp://",
+				"exp://**",
+				"exp://192.168.*.*:*/**",
+				"http://localhost:8081",
+			]
+			: []),
 {{/if}}
 	],
 	emailAndPassword: {
@@ -23529,19 +23642,21 @@ module.exports = config;
     "web": "expo start --web"
   },
   "dependencies": {
-    "@expo/vector-icons": "^15.0.2",
-    "@react-navigation/bottom-tabs": "^7.3.10",
-    "@react-navigation/drawer": "^7.3.9",
-    "@react-navigation/native": "^7.1.6",
+    "@expo/vector-icons": "^15.0.3",
+    "@react-navigation/bottom-tabs": "^7.4.0",
+    "@react-navigation/drawer": "^7.5.0",
+    "@react-navigation/native": "^7.1.8",
     {{#if (includes examples "ai")}}
     "@stardazed/streams-text-encoding": "^1.0.2",
     "@ungap/structured-clone": "^1.3.0",
     {{/if}}
     "@tanstack/react-form": "^1.0.5",
-    "expo": "^54.0.0",
+    "babel-preset-expo": "~54.0.10",
+    "expo": "~54.0.33",
     "expo-constants": "~18.0.8",
     "expo-crypto": "~15.0.6",
     "expo-linking": "~8.0.7",
+    "expo-network": "~8.0.8",
     "expo-router": "~6.0.0",
     "expo-secure-store": "~15.0.6",
     "expo-splash-screen": "~31.0.8",
@@ -23551,15 +23666,15 @@ module.exports = config;
     "expo-web-browser": "~15.0.6",
     "react": "19.1.0",
     "react-dom": "19.1.0",
-    "react-native": "0.81.4",
+    "react-native": "0.81.5",
 		"react-native-edge-to-edge": "^1.7.0",
     "react-native-gesture-handler": "~2.28.0",
-		"react-native-nitro-modules": "^0.29.4",
+		"react-native-nitro-modules": "^0.33.2",
     "react-native-reanimated": "~4.1.0",
     "react-native-safe-area-context": "~5.6.0",
     "react-native-screens": "~4.16.0",
-		"react-native-unistyles": "^3.0.12",
-    "react-native-web": "^0.21.0",
+		"react-native-unistyles": "^3.0.22",
+    "react-native-web": "^0.21.2",
     "react-native-worklets": "^0.5.1"
   },
   "devDependencies": {