better-ts-stack 2.0.2 → 2.1.0

package/templates/modules/auth/tanstack/src/components/auth/sign-up-form.tsx

@@ -1,153 +1,151 @@
-"use client";
-
-import { Link, useNavigate } from "@tanstack/react-router";
-import { useState, useTransition } from "react";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { LoaderCircle } from "lucide-react";
-import { useForm } from "react-hook-form";
-
-import { authClient } from "~/lib/auth-client";
-import {
-  getAuthErrorMessage,
-  signUpSchema,
-  type SignUpValues,
-} from "~/lib/auth-schema";
-import { Button } from "~/components/ui/button";
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardFooter,
-  CardHeader,
-  CardTitle,
-} from "~/components/ui/card";
-import {
-  Field,
-  FieldDescription,
-  FieldError,
-  FieldGroup,
-  FieldLabel,
-} from "~/components/ui/field";
-import { Input } from "~/components/ui/input";
-
-export function SignUpForm() {
-  const navigate = useNavigate();
-  const [isPending, startTransition] = useTransition();
-  const [authError, setAuthError] = useState<string | null>(null);
-  const form = useForm<SignUpValues>({
-    resolver: zodResolver(signUpSchema),
-    defaultValues: {
-      name: "",
-      email: "",
-      password: "",
-    },
-  });
-
-  const onSubmit = form.handleSubmit((values) => {
-    setAuthError(null);
-
-    startTransition(async () => {
-      const result = await authClient.signUp.email({
-        name: values.name,
-        email: values.email,
-        password: values.password,
-      });
-
-      if (result.error) {
-        setAuthError(getAuthErrorMessage(result.error));
-        return;
-      }
-
-      navigate({ to: "/dashboard" });
-    });
-  });
-
-  return (
-    <Card className="border-white/80 bg-white/90 shadow-2xl shadow-slate-200/70 backdrop-blur">
-      <CardHeader className="space-y-2">
-        <CardTitle>Create your account</CardTitle>
-        <CardDescription>
-          Start with a simple email and password sign-up flow powered by Better
-          Auth.
-        </CardDescription>
-      </CardHeader>
-      <CardContent>
-        <form className="space-y-6" onSubmit={onSubmit} noValidate>
-          <FieldGroup>
-            <Field data-invalid={Boolean(form.formState.errors.name)}>
-              <FieldLabel htmlFor="name">Full name</FieldLabel>
-              <Input
-                id="name"
-                autoComplete="name"
-                aria-invalid={Boolean(form.formState.errors.name)}
-                placeholder="Ada Lovelace"
-                {...form.register("name")}
-              />
-              <FieldError errors={[form.formState.errors.name]} />
-            </Field>
-
-            <Field data-invalid={Boolean(form.formState.errors.email)}>
-              <FieldLabel htmlFor="email">Email</FieldLabel>
-              <Input
-                id="email"
-                type="email"
-                autoComplete="email"
-                aria-invalid={Boolean(form.formState.errors.email)}
-                placeholder="you@example.com"
-                {...form.register("email")}
-              />
-              <FieldDescription>
-                This email will be used for future sign-ins.
-              </FieldDescription>
-              <FieldError errors={[form.formState.errors.email]} />
-            </Field>
-
-            <Field data-invalid={Boolean(form.formState.errors.password)}>
-              <FieldLabel htmlFor="password">Password</FieldLabel>
-              <Input
-                id="password"
-                type="password"
-                autoComplete="new-password"
-                aria-invalid={Boolean(form.formState.errors.password)}
-                placeholder="Create a strong password"
-                {...form.register("password")}
-              />
-              <FieldDescription>
-                Use at least 8 characters for the generated starter flow.
-              </FieldDescription>
-              <FieldError errors={[form.formState.errors.password]} />
-            </Field>
-          </FieldGroup>
-
-          {authError ? (
-            <div className="rounded-2xl border border-rose-200 bg-rose-50 px-4 py-3 text-sm text-rose-700">
-              {authError}
-            </div>
-          ) : null}
-
-          <Button className="w-full" type="submit" disabled={isPending}>
-            {isPending ? (
-              <>
-                <LoaderCircle className="mr-2 size-4 animate-spin" />
-                Creating account
-              </>
-            ) : (
-              "Signup"
-            )}
-          </Button>
-        </form>
-      </CardContent>
-      <CardFooter className="justify-center">
-        <p className="text-sm text-slate-600">
-          Already have an account?{" "}
-          <Link
-            className="font-medium text-sky-700 hover:text-sky-800"
-            to="/sign-in"
-          >
-            Login
-          </Link>
-        </p>
-      </CardFooter>
-    </Card>
-  );
+import { Link, useNavigate } from "@tanstack/react-router";
+import { useState, useTransition } from "react";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { LoaderCircle } from "lucide-react";
+import { useForm } from "react-hook-form";
+
+import { authClient } from "~/lib/auth-client";
+import {
+  getAuthErrorMessage,
+  signUpSchema,
+  type SignUpValues,
+} from "~/lib/auth-schema";
+import { Button } from "~/components/ui/button";
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardFooter,
+  CardHeader,
+  CardTitle,
+} from "~/components/ui/card";
+import {
+  Field,
+  FieldDescription,
+  FieldError,
+  FieldGroup,
+  FieldLabel,
+} from "~/components/ui/field";
+import { Input } from "~/components/ui/input";
+
+export function SignUpForm() {
+  const navigate = useNavigate();
+  const [isPending, startTransition] = useTransition();
+  const [authError, setAuthError] = useState<string | null>(null);
+  const form = useForm<SignUpValues>({
+    resolver: zodResolver(signUpSchema),
+    defaultValues: {
+      name: "",
+      email: "",
+      password: "",
+    },
+  });
+
+  const onSubmit = form.handleSubmit((values) => {
+    setAuthError(null);
+
+    startTransition(async () => {
+      const result = await authClient.signUp.email({
+        name: values.name,
+        email: values.email,
+        password: values.password,
+      });
+
+      if (result.error) {
+        setAuthError(getAuthErrorMessage(result.error));
+        return;
+      }
+
+      navigate({ to: "/dashboard" });
+    });
+  });
+
+  return (
+    <Card className="border-white/80 bg-white/90 shadow-2xl shadow-slate-200/70 backdrop-blur">
+      <CardHeader className="space-y-2">
+        <CardTitle>Create your account</CardTitle>
+        <CardDescription>
+          Start with a simple email and password sign-up flow powered by Better
+          Auth.
+        </CardDescription>
+      </CardHeader>
+      <CardContent>
+        <form className="space-y-6" onSubmit={onSubmit} noValidate>
+          <FieldGroup>
+            <Field data-invalid={Boolean(form.formState.errors.name)}>
+              <FieldLabel htmlFor="name">Full name</FieldLabel>
+              <Input
+                id="name"
+                autoComplete="name"
+                aria-invalid={Boolean(form.formState.errors.name)}
+                placeholder="Ada Lovelace"
+                {...form.register("name")}
+              />
+              <FieldError errors={[form.formState.errors.name]} />
+            </Field>
+
+            <Field data-invalid={Boolean(form.formState.errors.email)}>
+              <FieldLabel htmlFor="email">Email</FieldLabel>
+              <Input
+                id="email"
+                type="email"
+                autoComplete="email"
+                aria-invalid={Boolean(form.formState.errors.email)}
+                placeholder="you@example.com"
+                {...form.register("email")}
+              />
+              <FieldDescription>
+                This email will be used for future sign-ins.
+              </FieldDescription>
+              <FieldError errors={[form.formState.errors.email]} />
+            </Field>
+
+            <Field data-invalid={Boolean(form.formState.errors.password)}>
+              <FieldLabel htmlFor="password">Password</FieldLabel>
+              <Input
+                id="password"
+                type="password"
+                autoComplete="new-password"
+                aria-invalid={Boolean(form.formState.errors.password)}
+                placeholder="Create a strong password"
+                {...form.register("password")}
+              />
+              <FieldDescription>
+                Use at least 8 characters for the generated starter flow.
+              </FieldDescription>
+              <FieldError errors={[form.formState.errors.password]} />
+            </Field>
+          </FieldGroup>
+
+          {authError ? (
+            <div className="rounded-2xl border border-rose-200 bg-rose-50 px-4 py-3 text-sm text-rose-700">
+              {authError}
+            </div>
+          ) : null}
+
+          <Button className="w-full" type="submit" disabled={isPending}>
+            {isPending ? (
+              <>
+                <LoaderCircle className="mr-2 size-4 animate-spin" />
+                Creating account
+              </>
+            ) : (
+              "Signup"
+            )}
+          </Button>
+        </form>
+      </CardContent>
+      <CardFooter className="justify-center">
+        <p className="text-sm text-slate-600">
+          Already have an account?{" "}
+          <Link
+            className="font-medium text-sky-700 hover:text-sky-800"
+            to="/sign-in"
+          >
+            Login
+          </Link>
+        </p>
+      </CardFooter>
+    </Card>
+  );
 }

package/templates/modules/docker/.dockerignore

@@ -12,3 +12,4 @@ coverage
 *.log
 
 .next
+.output

package/templates/modules/docker/Dockerfile.hbs

@@ -1,136 +1,147 @@
-{{#if (eq framework 'nextjs')}}
-# Base stage
-FROM node:24-alpine AS base
-WORKDIR /app
-RUN apk add --no-cache libc6-compat
-
-# Dependencies stage
-FROM base AS deps
-COPY package*.json ./
-RUN if [ -f package-lock.json ]; then npm ci; else npm install; fi
-
-# Build stage
-FROM base AS builder
-COPY --from=deps /app/node_modules ./node_modules
-COPY . .
-{{#if useAuth}}
-# next build loads the auth route, which initializes Better Auth. The build gets
-# a placeholder secret for this command only; the real one is supplied at runtime.
-{{/if}}
-{{#if (eq database 'prisma')}}
-RUN {{#if useAuth}}BETTER_AUTH_SECRET="build-only-placeholder-secret-not-used-at-runtime" {{/if}}DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres" npm run build
-{{else if (eq database 'mongoose')}}
-RUN {{#if useAuth}}BETTER_AUTH_SECRET="build-only-placeholder-secret-not-used-at-runtime" {{/if}}MONGODB_URI="mongodb://localhost:27017/build" npm run build
-{{else}}
-RUN {{#if useAuth}}BETTER_AUTH_SECRET="build-only-placeholder-secret-not-used-at-runtime" {{/if}}npm run build
-{{/if}}
-
-# Production stage
-FROM node:24-alpine AS runner
-WORKDIR /app
-ENV NODE_ENV=production
-
-RUN addgroup --system --gid 1001 nodejs && \
-    adduser --system --uid 1001 nextjs
-
-COPY --from=builder /app/public ./public
-COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
-COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
-
-USER nextjs
-EXPOSE {{port}}
-ENV PORT={{port}} HOSTNAME=0.0.0.0
-
-CMD ["node", "server.js"]
-
-{{else if (eq framework 'tanstack')}}
-# Build stage
-FROM node:24-alpine AS builder
-WORKDIR /app
-
-COPY package*.json ./
-RUN if [ -f package-lock.json ]; then npm ci; else npm install; fi
-
-COPY . .
-
-{{#if (eq database 'prisma')}}
-RUN DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres" npm run build
-{{else if (eq database 'mongoose')}}
-RUN MONGODB_URI="mongodb://localhost:27017/build" npm run build
-{{else}}
-RUN npm run build
-{{/if}}
-
-# Production stage
-FROM node:24-alpine
-WORKDIR /app
-ENV NODE_ENV=production
-
-# Create non-root user for security
-RUN addgroup --system --gid 1001 nodejs && \
-    adduser --system --uid 1001 tanstackuser
-
-COPY package*.json ./
-# Clear the npm cache in the same layer so it does not ship in the image
-RUN if [ -f package-lock.json ]; then npm ci --omit=dev; else npm install --omit=dev; fi \
-    && npm cache clean --force
-
-# Copy built output (dist/server/server.js + dist/client)
-COPY --from=builder --chown=tanstackuser:nodejs /app/dist ./dist
-
-# Include the Prisma client generated during the build stage
-{{#if (eq database 'prisma')}}
-COPY --from=builder --chown=tanstackuser:nodejs /app/generated ./generated
-{{/if}}
-
-USER tanstackuser
-EXPOSE {{port}}
-ENV PORT={{port}}
-
-CMD ["node_modules/.bin/srvx", "--prod", "-s", "../client", "dist/server/server.js"]
-
-{{else}}
-# Build stage
-FROM node:24-alpine AS builder
-WORKDIR /app
-
-COPY package*.json ./
-RUN if [ -f package-lock.json ]; then npm ci; else npm install; fi
-
-COPY . .
-
-{{#if (eq database 'prisma')}}
-RUN DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres" npm run build
-{{else if (eq database 'mongoose')}}
-RUN MONGODB_URI="mongodb://localhost:27017/build" npm run build
-{{else}}
-RUN npm run build
-{{/if}}
-
-# Production stage
-FROM node:24-alpine
-WORKDIR /app
-ENV NODE_ENV=production
-
-# Create non-root user for security
-RUN addgroup --system --gid 1001 nodejs && \
-    adduser --system --uid 1001 appuser
-
-COPY package*.json ./
-# Clear the npm cache in the same layer so it does not ship in the image
-RUN if [ -f package-lock.json ]; then npm ci --omit=dev; else npm install --omit=dev; fi \
-    && npm cache clean --force
-
-# Copy the compiled output
-COPY --from=builder --chown=appuser:nodejs /app/dist ./dist
-
-USER appuser
-EXPOSE {{port}}
-ENV PORT={{port}}
-
-{{#if (eq framework 'nestjs')}}
-CMD ["node", "dist/main.js"]
-{{else}}
-CMD ["node", "dist/index.js"]
-{{/if}}
-{{/if}}
+{{#if (eq framework 'nextjs')}}
+# Base stage
+FROM node:24-alpine AS base
+WORKDIR /app
+RUN apk add --no-cache libc6-compat
+{{#if docker.setup}}
+{{docker.setup}}
+{{/if}}
+
+# Dependencies stage
+FROM base AS deps
+COPY {{docker.manifests}} ./
+RUN {{docker.install}}
+
+# Build stage
+FROM base AS builder
+COPY --from=deps /app/node_modules ./node_modules
+COPY . .
+{{#if useAuth}}
+# next build loads the auth route, which initializes Better Auth. The build gets
+# a placeholder secret for this command only; the real one is supplied at runtime.
+{{/if}}
+{{#if (eq database 'prisma')}}
+RUN {{#if useAuth}}BETTER_AUTH_SECRET="build-only-placeholder-secret-not-used-at-runtime" {{/if}}DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres" {{docker.run}} build
+{{else if (eq database 'mongoose')}}
+RUN {{#if useAuth}}BETTER_AUTH_SECRET="build-only-placeholder-secret-not-used-at-runtime" {{/if}}MONGODB_URI="mongodb://localhost:27017/build" {{docker.run}} build
+{{else}}
+RUN {{#if useAuth}}BETTER_AUTH_SECRET="build-only-placeholder-secret-not-used-at-runtime" {{/if}}{{docker.run}} build
+{{/if}}
+
+# Production stage
+FROM node:24-alpine AS runner
+WORKDIR /app
+ENV NODE_ENV=production
+
+RUN addgroup --system --gid 1001 nodejs && \
+    adduser --system --uid 1001 nextjs
+
+COPY --from=builder /app/public ./public
+COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
+COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
+
+USER nextjs
+EXPOSE {{port}}
+ENV PORT={{port}} HOSTNAME=0.0.0.0
+
+HEALTHCHECK --interval=30s --timeout=5s --start-period=20s --retries=3 \
+    CMD wget -q -O /dev/null http://127.0.0.1:{{port}}/ || exit 1
+
+CMD ["node", "server.js"]
+
+{{else if (eq framework 'tanstack')}}
+# Build stage
+FROM node:24-alpine AS builder
+WORKDIR /app
+{{#if docker.setup}}
+{{docker.setup}}
+{{/if}}
+
+COPY {{docker.manifests}} ./
+RUN {{docker.install}}
+
+COPY . .
+
+{{#if (eq database 'prisma')}}
+RUN DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres" {{docker.run}} build
+{{else if (eq database 'mongoose')}}
+RUN MONGODB_URI="mongodb://localhost:27017/build" {{docker.run}} build
+{{else}}
+RUN {{docker.run}} build
+{{/if}}
+
+# Production stage. Nitro bundles the server and the dependencies it needs
+# into .output, so no install is needed here
+FROM node:24-alpine
+WORKDIR /app
+ENV NODE_ENV=production
+
+# Create non-root user for security
+RUN addgroup --system --gid 1001 nodejs && \
+    adduser --system --uid 1001 tanstackuser
+
+COPY --from=builder --chown=tanstackuser:nodejs /app/.output ./.output
+
+USER tanstackuser
+EXPOSE {{port}}
+ENV PORT={{port}}
+
+HEALTHCHECK --interval=30s --timeout=5s --start-period=20s --retries=3 \
+    CMD wget -q -O /dev/null http://127.0.0.1:{{port}}/ || exit 1
+
+CMD ["node", ".output/server/index.mjs"]
+
+{{else}}
+# Build stage
+FROM node:24-alpine AS builder
+WORKDIR /app
+{{#if docker.setup}}
+{{docker.setup}}
+{{/if}}
+
+COPY {{docker.manifests}} ./
+RUN {{docker.install}}
+
+COPY . .
+
+{{#if (eq database 'prisma')}}
+RUN DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres" {{docker.run}} build
+{{else if (eq database 'mongoose')}}
+RUN MONGODB_URI="mongodb://localhost:27017/build" {{docker.run}} build
+{{else}}
+RUN {{docker.run}} build
+{{/if}}
+
+# Production stage
+FROM node:24-alpine
+WORKDIR /app
+ENV NODE_ENV=production
+{{#if docker.setup}}
+{{docker.setup}}
+{{/if}}
+
+# Create non-root user for security
+RUN addgroup --system --gid 1001 nodejs && \
+    adduser --system --uid 1001 appuser
+
+COPY {{docker.manifests}} ./
+# Clear the download cache in the same layer so it does not ship in the image
+RUN {{docker.installProduction}} \
+    && {{docker.cleanCache}}
+
+# Copy the compiled output
+COPY --from=builder --chown=appuser:nodejs /app/dist ./dist
+
+USER appuser
+EXPOSE {{port}}
+ENV PORT={{port}}
+
+HEALTHCHECK --interval=30s --timeout=5s --start-period=20s --retries=3 \
+    CMD wget -q -O /dev/null http://127.0.0.1:{{port}}/health || exit 1
+
+{{#if (eq framework 'nestjs')}}
+CMD ["node", "dist/main.js"]
+{{else}}
+CMD ["node", "dist/index.js"]
+{{/if}}
+{{/if}}