create-better-t-stack 2.50.1-canary.58bbe5f6 → 2.50.1-canary.9643d88e

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { createBtsCli } from "./src-CulfT5QB.js";
+import { createBtsCli } from "./src-B0pvu6Z-.js";
 
 //#region src/cli.ts
 createBtsCli().run();

package/dist/index.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-import { builder, createBtsCli, docs, init, router, sponsors } from "./src-CulfT5QB.js";
+import { builder, createBtsCli, docs, init, router, sponsors } from "./src-B0pvu6Z-.js";
 
 export { builder, createBtsCli, docs, init, router, sponsors };

package/dist/{src-CulfT5QB.js → src-B0pvu6Z-.js}

@@ -352,8 +352,9 @@ function validateSelfBackendCompatibility(providedFlags, options, config) {
 	const backend = config.backend || options.backend;
 	const frontends = config.frontend || options.frontend || [];
 	if (backend === "self") {
-		if (!frontends.some((f) => FULLSTACK_FRONTENDS$1.includes(f))) exitWithError("Backend 'self' (fullstack) currently only supports Next.js frontend. Please use --frontend next. Support for Nuxt, SvelteKit, and TanStack Start will be added in a future update.");
-		if (frontends.length > 1) exitWithError("Backend 'self' (fullstack) can only be used with a single frontend framework.");
+		const { web, native } = splitFrontends(frontends);
+		if (!(web.length === 1 && FULLSTACK_FRONTENDS$1.includes(web[0]))) exitWithError("Backend 'self' (fullstack) currently only supports Next.js frontend. Please use --frontend next. Support for Nuxt, SvelteKit, and TanStack Start will be added in a future update.");
+		if (native.length > 1) exitWithError("Cannot select multiple native frameworks. Choose only one of: native-nativewind, native-unistyles");
 	}
 	const hasFullstackFrontend = frontends.some((f) => FULLSTACK_FRONTENDS$1.includes(f));
 	if (providedFlags.has("backend") && !hasFullstackFrontend && backend === "self") exitWithError("Backend 'self' (fullstack) currently only supports Next.js frontend. Please use --frontend next or choose a different backend. Support for Nuxt, SvelteKit, and TanStack Start will be added in a future update.");
@@ -1766,6 +1767,12 @@ function validateBackendNoneConstraints(config, providedFlags) {
 	if (has("dbSetup") && config.dbSetup !== "none") exitWithError("Backend 'none' requires '--db-setup none'. Please remove the --db-setup flag or set it to 'none'.");
 	if (has("serverDeploy") && config.serverDeploy !== "none") exitWithError("Backend 'none' requires '--server-deploy none'. Please remove the --server-deploy flag or set it to 'none'.");
 }
+function validateSelfBackendConstraints(config, providedFlags) {
+	const { backend } = config;
+	if (backend !== "self") return;
+	const has = (k) => providedFlags.has(k);
+	if (has("runtime") && config.runtime !== "none") exitWithError("Backend 'self' (fullstack) requires '--runtime none'. Please remove the --runtime flag or set it to 'none'.");
+}
 function validateBackendConstraints(config, providedFlags, options) {
 	const { backend } = config;
 	if (config.auth === "clerk" && backend !== "convex") exitWithError("Clerk authentication is only supported with the Convex backend. Please use '--backend convex' or choose a different auth provider.");
@@ -1804,6 +1811,7 @@ function validateFullConfig(config, providedFlags, options) {
 	validateDatabaseSetup(config, providedFlags);
 	validateConvexConstraints(config, providedFlags);
 	validateBackendNoneConstraints(config, providedFlags);
+	validateSelfBackendConstraints(config, providedFlags);
 	validateBackendConstraints(config, providedFlags, options);
 	validateFrontendConstraints(config, providedFlags);
 	validateApiConstraints(config, options);
@@ -4001,6 +4009,7 @@ async function setupCatalogs(projectDir, options) {
 	const packagePaths = [
 		"apps/server",
 		"apps/web",
+		"apps/native",
 		"packages/api",
 		"packages/db",
 		"packages/auth",
@@ -4624,7 +4633,7 @@ async function setupEnvironmentVariables(config) {
 		const nativeDir = path.join(projectDir, "apps/native");
 		if (await fs.pathExists(nativeDir)) {
 			let envVarName = "EXPO_PUBLIC_SERVER_URL";
-			let serverUrl = "http://localhost:3000";
+			let serverUrl = backend === "self" ? "http://localhost:3001" : "http://localhost:3000";
 			if (backend === "convex") {
 				envVarName = "EXPO_PUBLIC_CONVEX_URL";
 				serverUrl = "https://<YOUR_CONVEX_URL>";
@@ -6146,7 +6155,6 @@ function generateFeaturesList(database, auth, addons, orm, runtime, frontend, ba
 		else if (backend === "express") addonsList.push("- **Express** - Fast, unopinionated web framework");
 		else if (backend === "fastify") addonsList.push("- **Fastify** - Fast, low-overhead web framework");
 		else if (backend === "elysia") addonsList.push("- **Elysia** - Type-safe, high-performance framework");
-		else if (backend === "next") addonsList.push("- **Next.js** - Full-stack React framework");
 		if (api === "trpc") addonsList.push("- **tRPC** - End-to-end type-safe APIs");
 		else if (api === "orpc") addonsList.push("- **oRPC** - End-to-end type-safe APIs with OpenAPI integration");
 		if (runtime !== "none") addonsList.push(`- **${runtime === "bun" ? "Bun" : runtime === "node" ? "Node.js" : runtime}** - Runtime environment`);
@@ -6398,7 +6406,7 @@ async function displayPostInstallInstructions(config) {
 	const databaseInstructions = !isConvex && database !== "none" ? await getDatabaseInstructions(database, orm, runCmd, runtime, dbSetup, serverDeploy, backend) : "";
 	const tauriInstructions = addons?.includes("tauri") ? getTauriInstructions(runCmd) : "";
 	const lintingInstructions = hasHuskyOrBiome ? getLintingInstructions(runCmd) : "";
-	const nativeInstructions = frontend?.includes("native-nativewind") || frontend?.includes("native-unistyles") ? getNativeInstructions(isConvex) : "";
+	const nativeInstructions = frontend?.includes("native-nativewind") || frontend?.includes("native-unistyles") ? getNativeInstructions(isConvex, isBackendSelf) : "";
 	const pwaInstructions = addons?.includes("pwa") && frontend?.includes("react-router") ? getPwaInstructions() : "";
 	const starlightInstructions = addons?.includes("starlight") ? getStarlightInstructions(runCmd) : "";
 	const clerkInstructions = isConvex && config.auth === "clerk" ? getClerkInstructions() : "";
@@ -6464,9 +6472,9 @@ async function displayPostInstallInstructions(config) {
 	output += pc.cyan("https://github.com/AmanVarshney01/create-better-t-stack");
 	consola$1.box(output);
 }
-function getNativeInstructions(isConvex) {
+function getNativeInstructions(isConvex, isBackendSelf) {
 	const envVar = isConvex ? "EXPO_PUBLIC_CONVEX_URL" : "EXPO_PUBLIC_SERVER_URL";
-	const exampleUrl = isConvex ? "https://<YOUR_CONVEX_URL>" : "http://<YOUR_LOCAL_IP>:3000";
+	const exampleUrl = isConvex ? "https://<YOUR_CONVEX_URL>" : isBackendSelf ? "http://<YOUR_LOCAL_IP>:3001" : "http://<YOUR_LOCAL_IP>:3000";
 	const envFileName = ".env";
 	const ipNote = isConvex ? "your Convex deployment URL (find after running 'dev:setup')" : "your local IP address";
 	let instructions = `${pc.yellow("NOTE:")} For Expo connectivity issues, update\n   apps/native/${envFileName} with ${ipNote}:\n   ${`${envVar}=${exampleUrl}`}\n`;
@@ -6617,6 +6625,15 @@ async function setupWorkspaceDependencies(projectDir, options) {
 			projectDir: webPackageDir
 		});
 	}
+	const nativePackageDir = path.join(projectDir, "apps/native");
+	if (await fs.pathExists(nativePackageDir)) {
+		const nativeDeps = {};
+		nativeDeps[`@${projectName}/api`] = workspaceVersion;
+		if (Object.keys(nativeDeps).length > 0) await addPackageDependency({
+			customDependencies: nativeDeps,
+			projectDir: nativePackageDir
+		});
+	}
 	const runtimeDevDeps = getRuntimeDevDeps(options);
 	await addPackageDependency({
 		dependencies: commonDeps,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "2.50.1-canary.58bbe5f6",
+  "version": "2.50.1-canary.9643d88e",
   "description": "A modern CLI tool for scaffolding end-to-end type-safe TypeScript projects with best practices and customizable configurations",
   "type": "module",
   "license": "MIT",

package/templates/api/orpc/native/utils/orpc.ts.hbs

@@ -2,7 +2,7 @@ import { createORPCClient } from "@orpc/client";
 import { RPCLink } from "@orpc/client/fetch";
 import { createTanstackQueryUtils } from "@orpc/tanstack-query";
 import { QueryCache, QueryClient } from "@tanstack/react-query";
-import type { AppRouterClient } from "../../server/src/routers";
+import type { AppRouterClient } from "@{{projectName}}/api/routers/index";
 {{#if (eq auth "better-auth")}}
 import { authClient } from "@/lib/auth-client";
 {{/if}}
@@ -16,7 +16,11 @@ export const queryClient = new QueryClient({
 });
 
 export const link = new RPCLink({
+  {{#if (eq backend "self")}}
+  url: `${process.env.EXPO_PUBLIC_SERVER_URL}/api/rpc`,
+  {{else}}
   url: `${process.env.EXPO_PUBLIC_SERVER_URL}/rpc`,
+  {{/if}}
   {{#if (eq auth "better-auth")}}
   headers() {
     const headers = new Map<string, string>();

package/templates/api/trpc/native/utils/trpc.ts.hbs

@@ -4,14 +4,18 @@ import { authClient } from "@/lib/auth-client";
 import { QueryClient } from "@tanstack/react-query";
 import { createTRPCClient, httpBatchLink } from "@trpc/client";
 import { createTRPCOptionsProxy } from "@trpc/tanstack-react-query";
-import type { AppRouter } from "../../server/src/routers";
+import type { AppRouter } from "@{{projectName}}/api/routers/index";
 
 export const queryClient = new QueryClient();
 
 const trpcClient = createTRPCClient<AppRouter>({
 	links: [
 		httpBatchLink({
+			 {{#if  (eq backend "self")}}
+			url: `${process.env.EXPO_PUBLIC_SERVER_URL}/api/trpc`,
+			{{else}}
 			url: `${process.env.EXPO_PUBLIC_SERVER_URL}/trpc`,
+			{{/if}}
 			{{#if (eq auth "better-auth")}}
 			headers() {
 				const headers = new Map<string, string>();

package/templates/base/tsconfig.base.json.hbs

@@ -25,8 +25,7 @@
       {{else if (eq runtime "workers")}}
         "node"
       {{else}}
-        "node",
-        "bun"
+        "node"
       {{/if}}{{#if (eq serverDeploy "alchemy")}},
       "@cloudflare/workers-types"{{/if}}
     ]

package/templates/extras/bunfig.toml.hbs

@@ -1,5 +1,5 @@
 [install]
-{{#if (includes frontend "nuxt")}}
+{{#if (or (includes frontend "nuxt") (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
 # linker = "isolated"  # Commented out for Nuxt compatibility
 {{else}}
 linker = "isolated"