From 5cfd3d38dd7541c061714f53359d8700310e193d Mon Sep 17 00:00:00 2001
From: Aman Varshney <amanvarshney.work@gmail.com>
Date: Wed, 21 May 2025 16:02:33 +0530
Subject: [PATCH] fix zod v4

---
 .changeset/thin-bottles-grow.md                           | 5 +++++
 apps/cli/src/constants.ts                                 | 3 ++-
 apps/cli/src/helpers/examples-setup.ts                    | 8 +++++++-
 .../templates/auth/web/nuxt/app/components/SignInForm.vue | 2 +-
 .../templates/auth/web/nuxt/app/components/SignUpForm.vue | 2 +-
 .../auth/web/react/next/src/components/sign-in-form.tsx   | 2 +-
 .../auth/web/react/next/src/components/sign-up-form.tsx   | 2 +-
 .../react/react-router/src/components/sign-in-form.tsx    | 2 +-
 .../react/react-router/src/components/sign-up-form.tsx    | 2 +-
 .../react/tanstack-router/src/components/sign-in-form.tsx | 2 +-
 .../react/tanstack-router/src/components/sign-up-form.tsx | 2 +-
 .../react/tanstack-start/src/components/sign-in-form.tsx  | 2 +-
 .../react/tanstack-start/src/components/sign-up-form.tsx  | 2 +-
 .../auth/web/solid/src/components/sign-in-form.tsx        | 2 +-
 .../auth/web/solid/src/components/sign-up-form.tsx        | 2 +-
 .../auth/web/svelte/src/components/SignInForm.svelte      | 2 +-
 .../auth/web/svelte/src/components/SignUpForm.svelte      | 2 +-
 .../templates/backend/server/server-base/package.json.hbs | 2 +-
 .../todo/server/drizzle/base/src/routers/todo.ts.hbs      | 4 ++--
 .../todo/server/mongoose/base/src/routers/todo.ts.hbs     | 4 ++--
 .../todo/server/prisma/base/src/routers/todo.ts.hbs       | 4 ++--
 apps/cli/templates/frontend/nuxt/package.json             | 2 +-
 apps/cli/templates/frontend/react/next/package.json.hbs   | 2 +-
 .../templates/frontend/react/react-router/package.json    | 2 +-
 .../templates/frontend/react/tanstack-router/package.json | 2 +-
 .../templates/frontend/react/tanstack-start/package.json  | 2 +-
 apps/cli/templates/frontend/solid/package.json            | 2 +-
 apps/cli/templates/frontend/svelte/package.json           | 2 +-
 28 files changed, 42 insertions(+), 30 deletions(-)
 create mode 100644 .changeset/thin-bottles-grow.md

diff --git a/.changeset/thin-bottles-grow.md b/.changeset/thin-bottles-grow.md
new file mode 100644
index 0000000..48a9edb
--- /dev/null
+++ b/.changeset/thin-bottles-grow.md
@@ -0,0 +1,5 @@
+---
+"create-better-t-stack": patch
+---
+
+fix zod v4 madness
diff --git a/apps/cli/src/constants.ts b/apps/cli/src/constants.ts
index e90e35e..2ae1357 100644
--- a/apps/cli/src/constants.ts
+++ b/apps/cli/src/constants.ts
@@ -76,10 +76,11 @@ export const dependencyVersionMap = {
 
 	turbo: "^2.4.2",
 
-	ai: "^4.2.8",
+	ai: "^4.3.16",
 	"@ai-sdk/google": "^1.2.3",
 	"@ai-sdk/vue": "^1.2.8",
 	"@ai-sdk/svelte": "^2.1.9",
+	"@ai-sdk/react": "^1.2.12",
 
 	"@prisma/extension-accelerate": "^1.3.0",
 
diff --git a/apps/cli/src/helpers/examples-setup.ts b/apps/cli/src/helpers/examples-setup.ts
index d7a6e27..790828d 100644
--- a/apps/cli/src/helpers/examples-setup.ts
+++ b/apps/cli/src/helpers/examples-setup.ts
@@ -24,6 +24,11 @@ export async function setupExamples(config: ProjectConfig): Promise<void> {
 
 		const hasNuxt = frontend.includes("nuxt");
 		const hasSvelte = frontend.includes("svelte");
+		const hasReact =
+			frontend.includes("react-router") ||
+			frontend.includes("tanstack-router") ||
+			frontend.includes("next") ||
+			frontend.includes("tanstack-start");
 
 		if (clientDirExists) {
 			const dependencies: AvailableDependencies[] = ["ai"];
@@ -31,7 +36,8 @@ export async function setupExamples(config: ProjectConfig): Promise<void> {
 				dependencies.push("@ai-sdk/vue");
 			} else if (hasSvelte) {
 				dependencies.push("@ai-sdk/svelte");
-			} else {
+			} else if (hasReact) {
+				dependencies.push("@ai-sdk/react");
 			}
 			await addPackageDependency({
 				dependencies,
diff --git a/apps/cli/templates/auth/web/nuxt/app/components/SignInForm.vue b/apps/cli/templates/auth/web/nuxt/app/components/SignInForm.vue
index 508f238..2adcb27 100644
--- a/apps/cli/templates/auth/web/nuxt/app/components/SignInForm.vue
+++ b/apps/cli/templates/auth/web/nuxt/app/components/SignInForm.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { z } from 'zod'
+import z from 'zod/v4'
 const {$authClient} = useNuxtApp()
 import type { FormSubmitEvent } from '#ui/types'
 
diff --git a/apps/cli/templates/auth/web/nuxt/app/components/SignUpForm.vue b/apps/cli/templates/auth/web/nuxt/app/components/SignUpForm.vue
index 7bb6749..ac65bb3 100644
--- a/apps/cli/templates/auth/web/nuxt/app/components/SignUpForm.vue
+++ b/apps/cli/templates/auth/web/nuxt/app/components/SignUpForm.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { z } from 'zod'
+import z from 'zod/v4'
 import type { FormSubmitEvent } from '#ui/types'
 const {$authClient} = useNuxtApp()
 
diff --git a/apps/cli/templates/auth/web/react/next/src/components/sign-in-form.tsx b/apps/cli/templates/auth/web/react/next/src/components/sign-in-form.tsx
index 6f4c924..6e0be0a 100644
--- a/apps/cli/templates/auth/web/react/next/src/components/sign-in-form.tsx
+++ b/apps/cli/templates/auth/web/react/next/src/components/sign-in-form.tsx
@@ -1,7 +1,7 @@
 import { authClient } from "@/lib/auth-client";
 import { useForm } from "@tanstack/react-form";
 import { toast } from "sonner";
-import { z } from "zod";
+import z from "zod/v4";
 import Loader from "./loader";
 import { Button } from "./ui/button";
 import { Input } from "./ui/input";
diff --git a/apps/cli/templates/auth/web/react/next/src/components/sign-up-form.tsx b/apps/cli/templates/auth/web/react/next/src/components/sign-up-form.tsx
index 33d10eb..3b20cce 100644
--- a/apps/cli/templates/auth/web/react/next/src/components/sign-up-form.tsx
+++ b/apps/cli/templates/auth/web/react/next/src/components/sign-up-form.tsx
@@ -1,7 +1,7 @@
 import { authClient } from "@/lib/auth-client";
 import { useForm } from "@tanstack/react-form";
 import { toast } from "sonner";
-import { z } from "zod";
+import z from "zod/v4";
 import Loader from "./loader";
 import { Button } from "./ui/button";
 import { Input } from "./ui/input";
diff --git a/apps/cli/templates/auth/web/react/react-router/src/components/sign-in-form.tsx b/apps/cli/templates/auth/web/react/react-router/src/components/sign-in-form.tsx
index a56a88b..46aa64c 100644
--- a/apps/cli/templates/auth/web/react/react-router/src/components/sign-in-form.tsx
+++ b/apps/cli/templates/auth/web/react/react-router/src/components/sign-in-form.tsx
@@ -2,7 +2,7 @@ import { authClient } from "@/lib/auth-client";
 import { useForm } from "@tanstack/react-form";
 import { useNavigate } from "react-router";
 import { toast } from "sonner";
-import { z } from "zod";
+import z from "zod/v4";
 import Loader from "./loader";
 import { Button } from "./ui/button";
 import { Input } from "./ui/input";
diff --git a/apps/cli/templates/auth/web/react/react-router/src/components/sign-up-form.tsx b/apps/cli/templates/auth/web/react/react-router/src/components/sign-up-form.tsx
index cced840..9bd7758 100644
--- a/apps/cli/templates/auth/web/react/react-router/src/components/sign-up-form.tsx
+++ b/apps/cli/templates/auth/web/react/react-router/src/components/sign-up-form.tsx
@@ -2,7 +2,7 @@ import { authClient } from "@/lib/auth-client";
 import { useForm } from "@tanstack/react-form";
 import { useNavigate } from "react-router";
 import { toast } from "sonner";
-import { z } from "zod";
+import z from "zod/v4";
 import Loader from "./loader";
 import { Button } from "./ui/button";
 import { Input } from "./ui/input";
diff --git a/apps/cli/templates/auth/web/react/tanstack-router/src/components/sign-in-form.tsx b/apps/cli/templates/auth/web/react/tanstack-router/src/components/sign-in-form.tsx
index 5919262..4ddad03 100644
--- a/apps/cli/templates/auth/web/react/tanstack-router/src/components/sign-in-form.tsx
+++ b/apps/cli/templates/auth/web/react/tanstack-router/src/components/sign-in-form.tsx
@@ -2,7 +2,7 @@ import { authClient } from "@/lib/auth-client";
 import { useForm } from "@tanstack/react-form";
 import { useNavigate } from "@tanstack/react-router";
 import { toast } from "sonner";
-import { z } from "zod";
+import z from "zod/v4";
 import Loader from "./loader";
 import { Button } from "./ui/button";
 import { Input } from "./ui/input";
diff --git a/apps/cli/templates/auth/web/react/tanstack-router/src/components/sign-up-form.tsx b/apps/cli/templates/auth/web/react/tanstack-router/src/components/sign-up-form.tsx
index 7aa1e14..1d20319 100644
--- a/apps/cli/templates/auth/web/react/tanstack-router/src/components/sign-up-form.tsx
+++ b/apps/cli/templates/auth/web/react/tanstack-router/src/components/sign-up-form.tsx
@@ -2,7 +2,7 @@ import { authClient } from "@/lib/auth-client";
 import { useForm } from "@tanstack/react-form";
 import { useNavigate } from "@tanstack/react-router";
 import { toast } from "sonner";
-import { z } from "zod";
+import z from "zod/v4";
 import Loader from "./loader";
 import { Button } from "./ui/button";
 import { Input } from "./ui/input";
diff --git a/apps/cli/templates/auth/web/react/tanstack-start/src/components/sign-in-form.tsx b/apps/cli/templates/auth/web/react/tanstack-start/src/components/sign-in-form.tsx
index 5919262..4ddad03 100644
--- a/apps/cli/templates/auth/web/react/tanstack-start/src/components/sign-in-form.tsx
+++ b/apps/cli/templates/auth/web/react/tanstack-start/src/components/sign-in-form.tsx
@@ -2,7 +2,7 @@ import { authClient } from "@/lib/auth-client";
 import { useForm } from "@tanstack/react-form";
 import { useNavigate } from "@tanstack/react-router";
 import { toast } from "sonner";
-import { z } from "zod";
+import z from "zod/v4";
 import Loader from "./loader";
 import { Button } from "./ui/button";
 import { Input } from "./ui/input";
diff --git a/apps/cli/templates/auth/web/react/tanstack-start/src/components/sign-up-form.tsx b/apps/cli/templates/auth/web/react/tanstack-start/src/components/sign-up-form.tsx
index 7aa1e14..1d20319 100644
--- a/apps/cli/templates/auth/web/react/tanstack-start/src/components/sign-up-form.tsx
+++ b/apps/cli/templates/auth/web/react/tanstack-start/src/components/sign-up-form.tsx
@@ -2,7 +2,7 @@ import { authClient } from "@/lib/auth-client";
 import { useForm } from "@tanstack/react-form";
 import { useNavigate } from "@tanstack/react-router";
 import { toast } from "sonner";
-import { z } from "zod";
+import z from "zod/v4";
 import Loader from "./loader";
 import { Button } from "./ui/button";
 import { Input } from "./ui/input";
diff --git a/apps/cli/templates/auth/web/solid/src/components/sign-in-form.tsx b/apps/cli/templates/auth/web/solid/src/components/sign-in-form.tsx
index de4ab82..716fd94 100644
--- a/apps/cli/templates/auth/web/solid/src/components/sign-in-form.tsx
+++ b/apps/cli/templates/auth/web/solid/src/components/sign-in-form.tsx
@@ -1,7 +1,7 @@
 import { authClient } from "@/lib/auth-client";
 import { createForm } from "@tanstack/solid-form";
 import { useNavigate } from "@tanstack/solid-router";
-import { z } from "zod";
+import z from "zod/v4";
 import { For } from "solid-js";
 
 export default function SignInForm({
diff --git a/apps/cli/templates/auth/web/solid/src/components/sign-up-form.tsx b/apps/cli/templates/auth/web/solid/src/components/sign-up-form.tsx
index aac8e69..bb3c456 100644
--- a/apps/cli/templates/auth/web/solid/src/components/sign-up-form.tsx
+++ b/apps/cli/templates/auth/web/solid/src/components/sign-up-form.tsx
@@ -1,7 +1,7 @@
 import { authClient } from "@/lib/auth-client";
 import { createForm } from "@tanstack/solid-form";
 import { useNavigate } from "@tanstack/solid-router";
-import { z } from "zod";
+import z from "zod/v4";
 import { For } from "solid-js";
 
 export default function SignUpForm({
diff --git a/apps/cli/templates/auth/web/svelte/src/components/SignInForm.svelte b/apps/cli/templates/auth/web/svelte/src/components/SignInForm.svelte
index 4bf6474..39198c1 100644
--- a/apps/cli/templates/auth/web/svelte/src/components/SignInForm.svelte
+++ b/apps/cli/templates/auth/web/svelte/src/components/SignInForm.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { createForm } from '@tanstack/svelte-form';
-	import { z } from 'zod';
+	import z from 'zod/v4';
 	import { authClient } from '$lib/auth-client';
 	import { goto } from '$app/navigation';
 
diff --git a/apps/cli/templates/auth/web/svelte/src/components/SignUpForm.svelte b/apps/cli/templates/auth/web/svelte/src/components/SignUpForm.svelte
index 30f0c0e..f98daf7 100644
--- a/apps/cli/templates/auth/web/svelte/src/components/SignUpForm.svelte
+++ b/apps/cli/templates/auth/web/svelte/src/components/SignUpForm.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { createForm } from '@tanstack/svelte-form';
-	import { z } from 'zod';
+	import z from 'zod/v4';
 	import { authClient } from '$lib/auth-client';
 	import { goto } from '$app/navigation';
 
diff --git a/apps/cli/templates/backend/server/server-base/package.json.hbs b/apps/cli/templates/backend/server/server-base/package.json.hbs
index 710c737..fd7304d 100644
--- a/apps/cli/templates/backend/server/server-base/package.json.hbs
+++ b/apps/cli/templates/backend/server/server-base/package.json.hbs
@@ -14,7 +14,7 @@
     {{/if}}
 	"dependencies": {
 		"dotenv": "^16.4.7",
-		"zod": "^3.24.2"
+		"zod": "^3.25.16"
 	},
 	"devDependencies": {
 		"tsc-alias": "^1.8.11",
diff --git a/apps/cli/templates/examples/todo/server/drizzle/base/src/routers/todo.ts.hbs b/apps/cli/templates/examples/todo/server/drizzle/base/src/routers/todo.ts.hbs
index 8183c20..aaeea9b 100644
--- a/apps/cli/templates/examples/todo/server/drizzle/base/src/routers/todo.ts.hbs
+++ b/apps/cli/templates/examples/todo/server/drizzle/base/src/routers/todo.ts.hbs
@@ -1,6 +1,6 @@
 {{#if (eq api "orpc")}}
 import { eq } from "drizzle-orm";
-import { z } from "zod";
+import z from "zod/v4";
 import { db } from "../db";
 import { todo } from "../db/schema/todo";
 import { publicProcedure } from "../lib/orpc";
@@ -42,7 +42,7 @@ export const todoRouter = {
 {{/if}}
 
 {{#if (eq api "trpc")}}
-import { z } from "zod";
+import z from "zod/v4";
 import { router, publicProcedure } from "../lib/trpc";
 import { todo } from "../db/schema/todo";
 import { eq } from "drizzle-orm";
diff --git a/apps/cli/templates/examples/todo/server/mongoose/base/src/routers/todo.ts.hbs b/apps/cli/templates/examples/todo/server/mongoose/base/src/routers/todo.ts.hbs
index 0f79624..e5c03f1 100644
--- a/apps/cli/templates/examples/todo/server/mongoose/base/src/routers/todo.ts.hbs
+++ b/apps/cli/templates/examples/todo/server/mongoose/base/src/routers/todo.ts.hbs
@@ -1,5 +1,5 @@
 {{#if (eq api "orpc")}}
-import { z } from "zod";
+import z from "zod/v4";
 import { publicProcedure } from "../lib/orpc";
 import { Todo } from "../db/models/todo.model";
 
@@ -33,7 +33,7 @@ export const todoRouter = {
 {{/if}}
 
 {{#if (eq api "trpc")}}
-import { z } from "zod";
+import z from "zod/v4";
 import { router, publicProcedure } from "../lib/trpc";
 import { Todo } from "../db/models/todo.model";
 
diff --git a/apps/cli/templates/examples/todo/server/prisma/base/src/routers/todo.ts.hbs b/apps/cli/templates/examples/todo/server/prisma/base/src/routers/todo.ts.hbs
index dc1724b..eaeef11 100644
--- a/apps/cli/templates/examples/todo/server/prisma/base/src/routers/todo.ts.hbs
+++ b/apps/cli/templates/examples/todo/server/prisma/base/src/routers/todo.ts.hbs
@@ -1,5 +1,5 @@
 {{#if (eq api "orpc")}}
-import { z } from "zod";
+import z from "zod/v4";
 import prisma from "../../prisma";
 import { publicProcedure } from "../lib/orpc";
 
@@ -53,7 +53,7 @@ export const todoRouter = {
 
 {{#if (eq api "trpc")}}
 import { TRPCError } from "@trpc/server";
-import { z } from "zod";
+import z from "zod/v4";
 import prisma from "../../prisma";
 import { publicProcedure, router } from "../lib/trpc";
 
diff --git a/apps/cli/templates/frontend/nuxt/package.json b/apps/cli/templates/frontend/nuxt/package.json
index 045efd1..5e728b2 100644
--- a/apps/cli/templates/frontend/nuxt/package.json
+++ b/apps/cli/templates/frontend/nuxt/package.json
@@ -16,7 +16,7 @@
     "typescript": "^5.6.3",
     "vue": "^3.5.13",
     "vue-router": "^4.5.0",
-    "zod": "^3.24.3"
+    "zod": "^3.25.16"
   },
   "devDependencies": {
     "@tanstack/vue-query-devtools": "^5.74.5",
diff --git a/apps/cli/templates/frontend/react/next/package.json.hbs b/apps/cli/templates/frontend/react/next/package.json.hbs
index d932046..f62e941 100644
--- a/apps/cli/templates/frontend/react/next/package.json.hbs
+++ b/apps/cli/templates/frontend/react/next/package.json.hbs
@@ -24,7 +24,7 @@
     "sonner": "^2.0.3",
     "tailwind-merge": "^3.2.0",
     "tw-animate-css": "^1.2.5",
-    "zod": "^3.24.2"
+    "zod": "^3.25.16"
   },
   "devDependencies": {
     "@tailwindcss/postcss": "^4",
diff --git a/apps/cli/templates/frontend/react/react-router/package.json b/apps/cli/templates/frontend/react/react-router/package.json
index c598e15..f45a970 100644
--- a/apps/cli/templates/frontend/react/react-router/package.json
+++ b/apps/cli/templates/frontend/react/react-router/package.json
@@ -28,7 +28,7 @@
     "sonner": "^2.0.3",
     "tailwind-merge": "^3.1.0",
     "tw-animate-css": "^1.2.5",
-    "zod": "^3.24.3"
+    "zod": "^3.25.16"
   },
   "devDependencies": {
     "@react-router/dev": "^7.4.1",
diff --git a/apps/cli/templates/frontend/react/tanstack-router/package.json b/apps/cli/templates/frontend/react/tanstack-router/package.json
index 7aea06f..372eeaf 100644
--- a/apps/cli/templates/frontend/react/tanstack-router/package.json
+++ b/apps/cli/templates/frontend/react/tanstack-router/package.json
@@ -39,6 +39,6 @@
 		"sonner": "^1.7.4",
 		"tailwind-merge": "^2.6.0",
 		"tw-animate-css": "^1.2.5",
-		"zod": "^3.24.2"
+		"zod": "^3.25.16"
 	}
 }
diff --git a/apps/cli/templates/frontend/react/tanstack-start/package.json b/apps/cli/templates/frontend/react/tanstack-start/package.json
index 43629e1..1b36b82 100644
--- a/apps/cli/templates/frontend/react/tanstack-start/package.json
+++ b/apps/cli/templates/frontend/react/tanstack-start/package.json
@@ -32,7 +32,7 @@
     "tw-animate-css": "^1.2.5",
     "vinxi": "^0.5.3",
     "vite-tsconfig-paths": "^5.1.4",
-    "zod": "^3.24.2"
+    "zod": "^3.25.16"
   },
   "devDependencies": {
     "@tanstack/react-router-devtools": "^1.114.3",
diff --git a/apps/cli/templates/frontend/solid/package.json b/apps/cli/templates/frontend/solid/package.json
index 6bd462f..86dff15 100644
--- a/apps/cli/templates/frontend/solid/package.json
+++ b/apps/cli/templates/frontend/solid/package.json
@@ -23,7 +23,7 @@
     "lucide-solid": "^0.507.0",
     "solid-js": "^1.9.4",
     "tailwindcss": "^4.0.6",
-    "zod": "^3.24.3"
+    "zod": "^3.25.16"
   },
   "devDependencies": {
     "typescript": "^5.7.2",
diff --git a/apps/cli/templates/frontend/svelte/package.json b/apps/cli/templates/frontend/svelte/package.json
index 00c16aa..3a125f1 100644
--- a/apps/cli/templates/frontend/svelte/package.json
+++ b/apps/cli/templates/frontend/svelte/package.json
@@ -26,6 +26,6 @@
 	"dependencies": {
 		"@tanstack/svelte-form": "^1.7.0",
 		"@tanstack/svelte-query": "^5.74.4",
-		"zod": "^3.24.3"
+		"zod": "^3.25.16"
 	}
 }