From 4fb08c9584ae115fdac17ebaeec5b8e1880971af Mon Sep 17 00:00:00 2001 From: HimanshuKumarDutt094 Date: Sat, 8 Nov 2025 17:03:48 +0530 Subject: [PATCH 1/5] fix: add nextCookies to better-auth plugins for server action --- cli/template/extras/src/server/better-auth/config/base.ts | 2 ++ .../extras/src/server/better-auth/config/with-drizzle.ts | 2 ++ .../extras/src/server/better-auth/config/with-prisma.ts | 2 ++ 3 files changed, 6 insertions(+) diff --git a/cli/template/extras/src/server/better-auth/config/base.ts b/cli/template/extras/src/server/better-auth/config/base.ts index abf50facaa..499d964e9d 100644 --- a/cli/template/extras/src/server/better-auth/config/base.ts +++ b/cli/template/extras/src/server/better-auth/config/base.ts @@ -1,9 +1,11 @@ import { betterAuth } from "better-auth"; +import { nextCookies } from "better-auth/next-js"; export const auth = betterAuth({ emailAndPassword: { enabled: true, }, + plugins: [nextCookies()], }); export type Session = typeof auth.$Infer.Session; diff --git a/cli/template/extras/src/server/better-auth/config/with-drizzle.ts b/cli/template/extras/src/server/better-auth/config/with-drizzle.ts index b1784e3af9..f25000d405 100644 --- a/cli/template/extras/src/server/better-auth/config/with-drizzle.ts +++ b/cli/template/extras/src/server/better-auth/config/with-drizzle.ts @@ -1,5 +1,6 @@ import { betterAuth } from "better-auth"; import { drizzleAdapter } from "better-auth/adapters/drizzle"; +import { nextCookies } from "better-auth/next-js"; import { env } from "~/env"; import { db } from "~/server/db"; @@ -18,6 +19,7 @@ export const auth = betterAuth({ redirectURI: "http://localhost:3000/api/auth/callback/github", }, }, + plugins: [nextCookies()], }); export type Session = typeof auth.$Infer.Session; diff --git a/cli/template/extras/src/server/better-auth/config/with-prisma.ts b/cli/template/extras/src/server/better-auth/config/with-prisma.ts index e3643a3bcf..50897c4124 100644 --- a/cli/template/extras/src/server/better-auth/config/with-prisma.ts +++ b/cli/template/extras/src/server/better-auth/config/with-prisma.ts @@ -1,5 +1,6 @@ import { betterAuth } from "better-auth"; import { prismaAdapter } from "better-auth/adapters/prisma"; +import { nextCookies } from "better-auth/next-js"; import { env } from "~/env"; import { db } from "~/server/db"; @@ -18,6 +19,7 @@ export const auth = betterAuth({ redirectURI: "http://localhost:3000/api/auth/callback/github", }, }, + plugins: [nextCookies()], }); export type Session = typeof auth.$Infer.Session; From ed67c5c2c9f50fb06b16a8ed9168ea04505517d7 Mon Sep 17 00:00:00 2001 From: HimanshuKumarDutt094 Date: Tue, 18 Nov 2025 08:27:41 +0530 Subject: [PATCH 2/5] fix: add value to import-alias option --- cli/src/cli/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/src/cli/index.ts b/cli/src/cli/index.ts index e63c05f23a..3d55102855 100644 --- a/cli/src/cli/index.ts +++ b/cli/src/cli/index.ts @@ -144,7 +144,7 @@ export const runCli = async (): Promise => { ) /** @experimental - Used for CI E2E tests. Used in conjunction with `--CI` to skip prompting. */ .option( - "-i, --import-alias", + "-i, --import-alias [alias]", "Explicitly tell the CLI to use a custom import alias", defaultOptions.flags.importAlias ) From 7a3980a5d0d2ad2fb3fbf46d77bd175e6be247db Mon Sep 17 00:00:00 2001 From: HimanshuKumarDutt094 Date: Tue, 18 Nov 2025 07:57:32 +0530 Subject: [PATCH 3/5] fix: add generated folder in template gitignore --- cli/template/base/_gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/cli/template/base/_gitignore b/cli/template/base/_gitignore index c24a8359cf..ab2955018b 100644 --- a/cli/template/base/_gitignore +++ b/cli/template/base/_gitignore @@ -12,6 +12,7 @@ /prisma/db.sqlite /prisma/db.sqlite-journal db.sqlite +/generated/ # next.js /.next/ From 8962e7e354cdf915b8ec30786078e635e6fdf9c6 Mon Sep 17 00:00:00 2001 From: HimanshuKumarDutt094 Date: Thu, 27 Nov 2025 09:57:22 +0530 Subject: [PATCH 4/5] chore: changeset --- .changeset/beige-clouds-behave.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/beige-clouds-behave.md diff --git a/.changeset/beige-clouds-behave.md b/.changeset/beige-clouds-behave.md new file mode 100644 index 0000000000..217d9ef8b6 --- /dev/null +++ b/.changeset/beige-clouds-behave.md @@ -0,0 +1,5 @@ +--- +"create-t3-app": patch +--- + +fix #1903 #2157 #2163 From 44f2d775b9b7c16fdd44f8e20bd7dd98e578f953 Mon Sep 17 00:00:00 2001 From: HimanshuKumarDutt094 Date: Fri, 28 Nov 2025 07:32:41 +0530 Subject: [PATCH 5/5] mention nextCookies to be last in array --- cli/template/extras/src/server/better-auth/config/base.ts | 1 + .../extras/src/server/better-auth/config/with-drizzle.ts | 1 + cli/template/extras/src/server/better-auth/config/with-prisma.ts | 1 + 3 files changed, 3 insertions(+) diff --git a/cli/template/extras/src/server/better-auth/config/base.ts b/cli/template/extras/src/server/better-auth/config/base.ts index 499d964e9d..5896d7b8d6 100644 --- a/cli/template/extras/src/server/better-auth/config/base.ts +++ b/cli/template/extras/src/server/better-auth/config/base.ts @@ -5,6 +5,7 @@ export const auth = betterAuth({ emailAndPassword: { enabled: true, }, + // Make sure nextCookies() is the last plugin in the array plugins: [nextCookies()], }); diff --git a/cli/template/extras/src/server/better-auth/config/with-drizzle.ts b/cli/template/extras/src/server/better-auth/config/with-drizzle.ts index f25000d405..b0a86371d1 100644 --- a/cli/template/extras/src/server/better-auth/config/with-drizzle.ts +++ b/cli/template/extras/src/server/better-auth/config/with-drizzle.ts @@ -19,6 +19,7 @@ export const auth = betterAuth({ redirectURI: "http://localhost:3000/api/auth/callback/github", }, }, + // Make sure nextCookies() is the last plugin in the array plugins: [nextCookies()], }); diff --git a/cli/template/extras/src/server/better-auth/config/with-prisma.ts b/cli/template/extras/src/server/better-auth/config/with-prisma.ts index 50897c4124..6404e72c68 100644 --- a/cli/template/extras/src/server/better-auth/config/with-prisma.ts +++ b/cli/template/extras/src/server/better-auth/config/with-prisma.ts @@ -19,6 +19,7 @@ export const auth = betterAuth({ redirectURI: "http://localhost:3000/api/auth/callback/github", }, }, + // Make sure nextCookies() is the last plugin in the array plugins: [nextCookies()], });