create-ej-app 8.0.0 → 11.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-ej-app",
-  "version": "8.0.0",
+  "version": "11.0.0",
   "description": "Bootstrap a next.js app with my preferred setup",
   "main": "cli.js",
   "scripts": {
@@ -35,7 +35,7 @@
     "enquirer": "^2.4.1"
   },
   "devDependencies": {
-    "@types/node": "^25.0.1",
+    "@types/node": "^25.0.3",
     "typescript": "^5.9.3"
   }
 }

package/template/base/.dockerignore

@@ -0,0 +1,7 @@
+node_modules
+.next
+out
+build
+next-env.d.ts
+.DS_Store
+.env

package/template/base/package.json

@@ -5,9 +5,10 @@
   "private": true,
   "scripts": {
     "dev": "next dev",
-    "build": "next build",
-    "analyze": "ANALYZE=true next build --webpack",
-    "start": "next start",
+    "build": "bun --bun next build",
+    "build:docker": "docker build -t my-app .",
+    "analyze": "ANALYZE=true bun --bun next build --webpack",
+    "start": "bun --bun next start",
     "lint": "eslint",
     "format": "prettier --write \"./src/**/*.{js,cjs,mjs,jsx,ts,tsx}\"",
     "db:push": "drizzle-kit push",
@@ -16,19 +17,20 @@
   },
   "dependencies": {
     "@hookform/resolvers": "5.2.2",
-    "@next/third-parties": "16.0.10",
+    "@next/third-parties": "16.1.0",
     "@paralleldrive/cuid2": "3.0.4",
     "@radix-ui/react-label": "2.1.8",
     "@radix-ui/react-separator": "1.1.8",
     "@radix-ui/react-slot": "1.2.4",
-    "@t3-oss/env-nextjs": "0.13.8",
+    "@t3-oss/env-nextjs": "0.13.10",
     "@tanstack/react-query": "5.90.12",
-    "better-auth": "1.4.6",
+    "better-auth": "1.4.7",
     "class-variance-authority": "0.7.1",
     "clsx": "2.1.1",
     "drizzle-orm": "0.45.1",
-    "lucide-react": "0.561.0",
-    "next": "16.0.10",
+    "fakefilter": "0.1.1401",
+    "lucide-react": "0.562.0",
+    "next": "16.1.0",
     "next-safe-action": "8.0.11",
     "next-themes": "0.4.6",
     "nextjs-toploader": "3.9.17",
@@ -36,24 +38,24 @@
     "postgres": "3.4.7",
     "react": "19.2.3",
     "react-dom": "19.2.3",
-    "react-hook-form": "7.68.0",
+    "react-hook-form": "7.69.0",
     "sonner": "2.0.7",
     "tailwind-merge": "3.4.0",
     "tw-animate-css": "1.4.0",
-    "workflow": "4.0.1-beta.29",
-    "zod": "4.1.13"
+    "workflow": "4.0.1-beta.35",
+    "zod": "4.2.1"
   },
   "devDependencies": {
-    "@next/bundle-analyzer": "16.0.10",
+    "@next/bundle-analyzer": "16.1.0",
     "@tailwindcss/postcss": "4.1.18",
-    "@types/bun": "1.3.4",
+    "@types/bun": "1.3.5",
     "@types/nodemailer": "7.0.4",
     "@types/react": "19.2.7",
     "@types/react-dom": "19.2.3",
     "babel-plugin-react-compiler": "1.0.0",
     "drizzle-kit": "0.31.8",
     "eslint": "9.39.2",
-    "eslint-config-next": "16.0.10",
+    "eslint-config-next": "16.1.0",
     "prettier": "3.7.4",
     "prettier-plugin-organize-imports": "4.3.0",
     "prettier-plugin-tailwindcss": "0.7.2",

package/template/base/src/app/(app)/layout.tsx

@@ -9,7 +9,7 @@ export default async function Layout({
   const authSession = await getAuthSession()
 
   if (!authSession) {
-    redirect('/auth')
+    redirect('/login')
   }
 
   return (

package/template/base/src/app/(auth)/login/email-login-form.tsx

@@ -16,7 +16,7 @@ import {
 } from '~/components/ui/form'
 import { Input } from '~/components/ui/input'
 import { signIn } from '~/lib/auth-client'
-import { toastSuccessMessage } from '~/lib/toast-message'
+import { toastErrorMessage, toastSuccessMessage } from '~/lib/toast-message'
 
 const emailLoginFormSchema = z.object({
   email: z.email()
@@ -49,6 +49,14 @@ export const EmailLoginForm = () => {
       toastSuccessMessage('Magic link sent! Check your email.')
     } catch (err) {
       console.error('Error sending magic link:', err)
+      if (
+        typeof err === 'object' &&
+        err &&
+        'message' in err &&
+        typeof err.message === 'string'
+      )
+        toastErrorMessage(err.message)
+      else toastErrorMessage('Something went wrong. Please try again.')
     } finally {
       setIsLoading(false)
     }

package/template/base/src/components/site-footer.tsx

@@ -3,8 +3,8 @@ import { siteConfig } from '~/lib/siteConfig'
 
 export const SiteFooter = () => {
   return (
-    <footer className="container border-t">
-      <div className="text-muted-foreground flex flex-col items-center justify-between gap-4 text-sm sm:flex-row">
+    <footer className="border-t">
+      <div className="text-muted-foreground container flex flex-col items-center justify-between gap-4 py-6 text-sm sm:flex-row">
         <p>
           &copy; {new Date().getUTCFullYear()} {siteConfig.name}. All rights
           reserved.

package/template/base/src/lib/auth.ts

@@ -1,7 +1,13 @@
 import { createId } from '@paralleldrive/cuid2'
-import { betterAuth } from 'better-auth'
+import { APIError, betterAuth } from 'better-auth'
 import { drizzleAdapter } from 'better-auth/adapters/drizzle'
-import { admin, lastLoginMethod, magicLink } from 'better-auth/plugins'
+import {
+  admin,
+  createAuthMiddleware,
+  lastLoginMethod,
+  magicLink
+} from 'better-auth/plugins'
+import { isFakeEmail } from 'fakefilter'
 import { headers } from 'next/headers'
 import { cache } from 'react'
 import { db } from '~/db'
@@ -57,7 +63,20 @@ export const auth = betterAuth({
     }),
     admin(),
     lastLoginMethod()
-  ]
+  ],
+  hooks: {
+    before: createAuthMiddleware(async ctx => {
+      if (
+        ctx.path === '/sign-in/magic-link' &&
+        ctx.body?.email &&
+        isFakeEmail(ctx.body.email)
+      ) {
+        throw new APIError('BAD_REQUEST', {
+          message: 'Please use a valid email address.'
+        })
+      }
+    })
+  }
 })
 
 export const getAuthSession = cache(async () => {

package/template/base/src/lib/safe-action-client.ts

@@ -0,0 +1,75 @@
+'use client'
+
+import {
+  useMutation,
+  useQuery,
+  type UseMutationOptions,
+  type UseQueryOptions
+} from '@tanstack/react-query'
+import type { SafeActionResult } from 'next-safe-action'
+
+type AnyAction = (
+  ...args: any[]
+) => Promise<SafeActionResult<any, any, any, any, any>>
+type ActionInput<T extends AnyAction> = Parameters<T>[0]
+type ActionData<T extends AnyAction> = Awaited<ReturnType<T>>['data']
+
+class SafeActionError extends Error {
+  constructor(
+    public message: string,
+    public validationErrors?: Record<string, string[] | undefined>
+  ) {
+    super(message)
+  }
+}
+
+export function useSafeActionQuery<TAction extends AnyAction>(
+  key: string,
+  action: TAction,
+  input: ActionInput<TAction>,
+  options?: Omit<UseQueryOptions<ActionData<TAction>>, 'queryKey' | 'queryFn'>
+) {
+  return useQuery({
+    queryKey: [key, input],
+    queryFn: async () => {
+      const result = await action(input)
+
+      if (result?.serverError) {
+        throw new SafeActionError(result.serverError)
+      }
+
+      if (result?.validationErrors) {
+        throw new SafeActionError('Validation failed', result.validationErrors)
+      }
+
+      return result?.data
+    },
+    ...options
+  })
+}
+
+export function useSafeActionMutation<TAction extends AnyAction>(
+  action: TAction,
+  options?: UseMutationOptions<
+    ActionData<TAction>,
+    SafeActionError,
+    ActionInput<TAction>
+  >
+) {
+  return useMutation({
+    mutationFn: async (input: ActionInput<TAction>) => {
+      const result = await action(input)
+
+      if (result?.serverError) {
+        throw new SafeActionError(result.serverError)
+      }
+
+      if (result?.validationErrors) {
+        throw new SafeActionError('Validation failed', result.validationErrors)
+      }
+
+      return result?.data
+    },
+    ...options
+  })
+}

package/template/base/src/lib/toast-message.ts

@@ -8,8 +8,8 @@ export const toastSuccessMessage = (message: string) =>
     position: 'top-center'
   })
 
-export const toastErrorMessage = () =>
-  toast.error('Something went wrong. Please try again later.', {
+export const toastErrorMessage = (message?: string) =>
+  toast.error(message || 'Something went wrong. Please try again later.', {
     richColors: true,
     position: 'top-center'
   })