@thinhnguyencth1204/nextcli 0.6.1 → 0.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thinhnguyencth1204/nextcli",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "CLI scaffolder for outsourced Next.js projects",
   "type": "module",
   "bin": {
@@ -15,8 +15,10 @@
     "build": "tsup",
     "dev": "tsup --watch",
     "typecheck": "tsc --noEmit",
+    "test": "bun test src/core/add-feature.test.ts",
+    "test:add-feature": "bun run build && bun test src/core/add-feature.test.ts",
     "smoke": "node dist/cli.js --help",
-    "smoke:full": "bun run scripts/pre-publish-smoke.ts",
+    "smoke:full": "bun run build && bun run test && bun run scripts/pre-publish-smoke.ts",
     "prepublishOnly": "npm run build"
   },
   "keywords": [

package/templates/{next-base/src/lib/axios-instance.ts → features/api/src/lib/api/axios.ts}

@@ -1,5 +1,9 @@
 import axios from "axios";
-import { clearAccessToken, getAccessToken, setAccessToken } from "@/lib/token-store";
+import {
+  clearAccessToken,
+  getAccessToken,
+  setAccessToken,
+} from "@/lib/api/token-store";
 import type { ApiErrorResponse, ApiSuccess } from "@/types";
 
 const baseURL = process.env.NEXT_PUBLIC_APP_URL ?? "http://localhost:3000";
@@ -48,7 +52,8 @@ async function refreshAccessToken(): Promise<string | null> {
     const response = await publicApi.post("/api/v1/auth/refresh", null, {
       withCredentials: true,
     });
-    const token = (response.data as ApiSuccess<{ accessToken: string }>).data?.accessToken;
+    const token = (response.data as ApiSuccess<{ accessToken: string }>).data
+      ?.accessToken;
     if (!token) {
       clearAccessToken();
       return null;

package/templates/{next-base/src/lib/api-response.ts → features/api/src/lib/api/response.ts}

@@ -30,11 +30,7 @@ export function ok<T>(data: T, init: SuccessInit = {}) {
   return NextResponse.json(payload, { status: init.status ?? 200 });
 }
 
-export function fail(
-  code: ErrorCode,
-  message: string,
-  init: FailInit = {},
-) {
+export function fail(code: ErrorCode, message: string, init: FailInit = {}) {
   const payload: ApiErrorResponse = {
     success: false,
     error: {

package/templates/{next-base → features/auth}/src/app/(auth)/change-password/layout.tsx

@@ -1,6 +1,6 @@
 import type { ReactNode } from "react";
 import { redirect } from "next/navigation";
-import { getSessionUser } from "@/lib/rbac";
+import { getSessionUser } from "@/lib/auth/rbac";
 
 export default async function ChangePasswordLayout({
   children,

package/templates/{next-base → features/auth}/src/app/(auth)/sign-in/layout.tsx

@@ -1,6 +1,6 @@
 import type { ReactNode } from "react";
 import { redirect } from "next/navigation";
-import { getSessionUser } from "@/lib/rbac";
+import { getSessionUser } from "@/lib/auth/rbac";
 
 export default async function SignInLayout({ children }: { children: ReactNode }) {
   const user = await getSessionUser();

package/templates/{next-base → features/auth}/src/app/api/v1/auth/change-password/route.ts

@@ -1,8 +1,8 @@
 import { changePasswordSchema } from "@/features/auth/validations";
-import { fail, ok } from "@/lib/api-response";
+import { fail, ok } from "@/lib/api/response";
 import { auth } from "@/lib/auth";
-import { getSessionUser } from "@/lib/rbac";
-import prisma from "@/lib/prisma";
+import { getSessionUser } from "@/lib/auth/rbac";
+import prisma from "@/lib/db/prisma";
 
 const authBaseUrl =
   process.env.BETTER_AUTH_URL ??

package/templates/{next-base → features/auth}/src/app/api/v1/auth/login/route.ts

@@ -1,6 +1,6 @@
-import { getRefreshCookieName, refreshCookieOptions } from "@/lib/auth-cookies";
-import { fail, ok } from "@/lib/api-response";
-import prisma from "@/lib/prisma";
+import { getRefreshCookieName, refreshCookieOptions } from "@/lib/auth/cookies";
+import { fail, ok } from "@/lib/api/response";
+import prisma from "@/lib/db/prisma";
 
 const authBaseUrl =
   process.env.BETTER_AUTH_URL ??

package/templates/{next-base → features/auth}/src/app/api/v1/auth/logout/route.ts

@@ -1,5 +1,5 @@
-import { getRefreshCookieName, refreshCookieOptions } from "@/lib/auth-cookies";
-import { fail, ok } from "@/lib/api-response";
+import { getRefreshCookieName, refreshCookieOptions } from "@/lib/auth/cookies";
+import { fail, ok } from "@/lib/api/response";
 
 const authBaseUrl =
   process.env.BETTER_AUTH_URL ??

package/templates/{next-base → features/auth}/src/app/api/v1/auth/me/route.ts

@@ -1,5 +1,5 @@
-import { fail, ok } from "@/lib/api-response";
-import { getSessionUser } from "@/lib/rbac";
+import { fail, ok } from "@/lib/api/response";
+import { getSessionUser } from "@/lib/auth/rbac";
 
 export async function GET(request: Request) {
   const user = await getSessionUser(request.headers);

package/templates/{next-base → features/auth}/src/app/api/v1/auth/refresh/route.ts

@@ -1,5 +1,5 @@
-import { getRefreshCookieName } from "@/lib/auth-cookies";
-import { fail, ok } from "@/lib/api-response";
+import { getRefreshCookieName } from "@/lib/auth/cookies";
+import { fail, ok } from "@/lib/api/response";
 
 const authBaseUrl =
   process.env.BETTER_AUTH_URL ??

package/templates/{next-base → features/auth}/src/app/api/v1/users/[id]/route.ts

@@ -4,14 +4,14 @@ import {
   getUserByIdForActor,
   updateUserRecord,
 } from "@/features/users/services";
-import { fail, ok } from "@/lib/api-response";
+import { fail, ok } from "@/lib/api/response";
 import {
   canActOnUser,
   canAssignRole,
   getSessionUser,
   isSuperAdmin,
-} from "@/lib/rbac";
-import prisma from "@/lib/prisma";
+} from "@/lib/auth/rbac";
+import prisma from "@/lib/db/prisma";
 
 type RouteContext = {
   params: Promise<{ id: string }>;

package/templates/{next-base → features/auth}/src/app/api/v1/users/route.ts

@@ -3,9 +3,9 @@ import {
   createUserRecord,
   listUsersForActor,
 } from "@/features/users/services";
-import { fail, ok } from "@/lib/api-response";
-import { canAssignRole, getSessionUser } from "@/lib/rbac";
-import prisma from "@/lib/prisma";
+import { fail, ok } from "@/lib/api/response";
+import { canAssignRole, getSessionUser } from "@/lib/auth/rbac";
+import prisma from "@/lib/db/prisma";
 
 export async function GET(request: Request) {
   const actor = await getSessionUser(request.headers);

package/templates/{next-base → features/auth}/src/features/auth/components/account-panel.tsx

@@ -2,7 +2,7 @@
 
 import { useEffect, useState } from "react";
 import { useTranslations } from "next-intl";
-import { protectedApi } from "@/lib/axios-instance";
+import { protectedApi } from "@/lib/api/axios";
 import type { ApiSuccess } from "@/types";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 

package/templates/{next-base → features/auth}/src/features/auth/components/change-password-form.tsx

@@ -5,7 +5,7 @@ import type { FormEvent } from "react";
 import { useRouter } from "next/navigation";
 import { useTranslations } from "next-intl";
 import { toast } from "sonner";
-import { protectedApi } from "@/lib/axios-instance";
+import { protectedApi } from "@/lib/api/axios";
 import { changePasswordSchema } from "@/features/auth/validations";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";

package/templates/{next-base → features/auth}/src/features/auth/components/sign-in-form.tsx

@@ -5,8 +5,8 @@ import type { FormEvent } from "react";
 import { useRouter } from "next/navigation";
 import { useTranslations } from "next-intl";
 import { toast } from "sonner";
-import { publicApi } from "@/lib/axios-instance";
-import { setAccessToken } from "@/lib/token-store";
+import { publicApi } from "@/lib/api/axios";
+import { setAccessToken } from "@/lib/api/token-store";
 import { signInSchema } from "@/features/auth/validations";
 import type { ApiSuccess } from "@/types";
 import { Button } from "@/components/ui/button";

package/templates/{next-base → features/auth}/src/features/users/services.ts

@@ -1,7 +1,7 @@
 import type { Role, User } from "@prisma/client";
 import { INTERNAL_EMAIL_DOMAIN, SUPER_ADMIN_USERNAME } from "@/lib/constants";
 import { auth } from "@/lib/auth";
-import prisma from "@/lib/prisma";
+import prisma from "@/lib/db/prisma";
 import type { CreateUserInput, UpdateUserInput } from "@/features/users/validations";
 
 export type UserWithRole = User & { role: Role | null };

package/templates/{next-base → features/auth}/src/instrumentation.ts

@@ -4,7 +4,7 @@ export async function register() {
   }
 
   try {
-    const { runBootstrap } = await import("@/lib/bootstrap");
+    const { runBootstrap } = await import("@/lib/auth/bootstrap");
     await runBootstrap();
   } catch (error) {
     const message =

package/templates/{next-base/src/lib → features/auth/src/lib/auth}/bootstrap.ts

@@ -2,13 +2,12 @@ import type { PrismaClient } from "@prisma/client";
 import {
   ADMIN_ROLE_LEVEL,
   ADMIN_ROLE_NAME,
+  DEFAULT_ADMIN_PASSWORD,
   INTERNAL_EMAIL_DOMAIN,
   SUPER_ADMIN_USERNAME,
 } from "@/lib/constants";
 import { auth } from "@/lib/auth";
-import prisma from "@/lib/prisma";
-
-const DEFAULT_ADMIN_PASSWORD = "admin";
+import prisma from "@/lib/db/prisma";
 
 function hasRoleModel(client: PrismaClient): boolean {
   const delegate = (

package/templates/features/auth/src/lib/auth/index.ts

@@ -0,0 +1 @@
+export { auth } from "./server";

package/templates/{next-base/src/lib → features/auth/src/lib/auth}/rbac.ts

@@ -1,7 +1,7 @@
 import { headers } from "next/headers";
 import type { Role, User } from "@prisma/client";
 import { auth } from "@/lib/auth";
-import prisma from "@/lib/prisma";
+import prisma from "@/lib/db/prisma";
 import { SUPER_ADMIN_USERNAME } from "@/lib/constants";
 
 export type SessionUser = User & { role: Role | null };
@@ -27,10 +27,7 @@ export function isSuperAdmin(user: Pick<User, "username">): boolean {
   return user.username === SUPER_ADMIN_USERNAME;
 }
 
-export function canActOnUser(
-  actor: SessionUser,
-  target: SessionUser,
-): boolean {
+export function canActOnUser(actor: SessionUser, target: SessionUser): boolean {
   if (isSuperAdmin(target)) {
     return false;
   }

package/templates/{next-base/src/lib/auth.ts → features/auth/src/lib/auth/server.ts}

@@ -1,7 +1,7 @@
 import { betterAuth } from "better-auth/minimal";
 import { prismaAdapter } from "better-auth/adapters/prisma";
 import { jwt, username } from "better-auth/plugins";
-import prisma from "@/lib/prisma";
+import prisma from "@/lib/db/prisma";
 
 const socialProviders = {
   // AUTO_GENERATED_AUTH_PROVIDERS_START
@@ -15,6 +15,7 @@ export const auth = betterAuth({
   plugins: [jwt(), username()],
   emailAndPassword: {
     enabled: true,
+    minPasswordLength: 8,
   },
   socialProviders,
 });

package/templates/{next-base → features/auth}/src/lib/constants.ts

@@ -1,6 +1,9 @@
 /** Built-in super-admin account username — protected from RBAC mutations. */
 export const SUPER_ADMIN_USERNAME = "admin";
 
+/** Dev-only bootstrap password (≥8 chars for Better Auth). Change on first login. */
+export const DEFAULT_ADMIN_PASSWORD = "admin1234";
+
 export const ADMIN_ROLE_NAME = "admin";
 export const ADMIN_ROLE_LEVEL = 100;
 

package/templates/features/chat/src/app/api/v1/chat/route.ts

@@ -1,4 +1,4 @@
-import { fail, ok } from "@/lib/api-response";
+import { fail, ok } from "@/lib/api/response";
 
 export async function GET(request: Request) {
   const { searchParams } = new URL(request.url);

package/templates/features/chat/src/features/chat/api/use-chat-history.ts

@@ -1,7 +1,7 @@
 "use client";
 
 import { useQuery } from "@tanstack/react-query";
-import { api } from "@/lib/axios-instance";
+import { api } from "@/lib/api/axios";
 import type { ApiSuccess } from "@/types";
 
 export function useChatHistory(conversationId: string) {

package/templates/features/chat/src/features/chat/api/use-send-message.ts

@@ -1,7 +1,7 @@
 "use client";
 
 import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { api } from "@/lib/axios-instance";
+import { api } from "@/lib/api/axios";
 import type { ApiSuccess } from "@/types";
 
 type SendMessageInput = {

package/templates/{next-base → features/dashboard}/src/app/(dashboard)/layout.tsx

@@ -1,7 +1,7 @@
 import type { ReactNode } from "react";
 import { redirect } from "next/navigation";
 import { DashboardLayout } from "@/components/layout/private/dashboard-layout";
-import { getSessionUser } from "@/lib/rbac";
+import { getSessionUser } from "@/lib/auth/rbac";
 
 export default async function DashboardRouteLayout({
   children,

package/templates/features/dashboard/src/app/page.tsx

@@ -0,0 +1,5 @@
+import { redirect } from "next/navigation";
+
+export default function HomePage() {
+  redirect("/dashboard");
+}

package/templates/{next-base → features/dashboard}/src/components/layout/private/nav-user.tsx

@@ -3,7 +3,7 @@
 import { LogOut, Monitor, Moon, Sun } from "lucide-react";
 import { useTheme } from "next-themes";
 import { useTranslations } from "next-intl";
-import { authClient } from "@/lib/auth-client";
+import { authClient } from "@/lib/auth/client";
 import { Avatar, AvatarFallback } from "@/components/ui/avatar";
 import { Button } from "@/components/ui/button";
 import { ScrollArea } from "@/components/ui/scroll-area";

package/templates/{next-base → features/database}/prisma/schema.prisma

@@ -31,18 +31,6 @@ model User {
   sessions              Session[]
   accounts              Account[]
 }
-
-// Starter demo table for template onboarding only.
-// Rename/remove this `Example` model before production migration.
-// Keep this block under review to avoid creating unwanted prod tables.
-model Example {
-  id          String   @id @default(cuid())
-  name        String
-  description String?
-  createdAt   DateTime @default(now())
-  updatedAt   DateTime @updatedAt
-}
-
 model Session {
   id        String   @id @default(cuid())
   token     String   @unique

package/templates/{next-base → features/database}/prisma.config.ts

@@ -2,7 +2,7 @@ import "dotenv/config";
 import { defineConfig, env } from "prisma/config";
 
 type Env = {
-  DATABASE_URL: string;
+  DIRECT_URL: string;
 };
 
 export default defineConfig({
@@ -11,6 +11,6 @@ export default defineConfig({
     path: "prisma/migrations",
   },
   datasource: {
-    url: env<Env>("DATABASE_URL"),
+    url: env<Env>("DIRECT_URL"),
   },
 });

package/templates/features/database/src/lib/prisma.ts

@@ -0,0 +1,23 @@
+import { PrismaPg } from "@prisma/adapter-pg";
+import { PrismaClient } from "@prisma/client";
+import { Pool } from "pg";
+
+declare global {
+  var prisma: PrismaClient | undefined;
+}
+
+const connectionString = process.env.DATABASE_URL;
+if (!connectionString) {
+  throw new Error(
+    "DATABASE_URL is missing. Please set it in your environment.",
+  );
+}
+
+const adapter = new PrismaPg(new Pool({ connectionString }));
+const prisma = global.prisma ?? new PrismaClient({ adapter });
+
+if (process.env.NODE_ENV !== "production") {
+  global.prisma = prisma;
+}
+
+export default prisma;

package/templates/{next-base → features/example}/src/app/api/v1/example/route.ts

@@ -1,7 +1,7 @@
 import { createExampleSchema } from "@/example/validations";
 import { listExamples } from "@/example/services";
-import { fail, ok } from "@/lib/api-response";
-import prisma from "@/lib/prisma";
+import { fail, ok } from "@/lib/api/response";
+import prisma from "@/lib/db/prisma";
 
 export async function GET() {
   try {

package/templates/{next-base → features/example}/src/example/api/use-example.ts

@@ -1,7 +1,7 @@
 "use client";
 
 import { useQuery } from "@tanstack/react-query";
-import { api } from "@/lib/axios-instance";
+import { api } from "@/lib/api/axios";
 import type { ApiSuccess } from "@/types";
 
 type ExampleItem = {

package/templates/{next-base → features/example}/src/example/api/use-mutations.ts

@@ -1,7 +1,7 @@
 "use client";
 
 import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { api } from "@/lib/axios-instance";
+import { api } from "@/lib/api/axios";
 import type { CreateExampleInput } from "@/example/validations";
 import type { ApiSuccess } from "@/types";
 

package/templates/{next-base → features/example}/src/example/services.ts

@@ -1,4 +1,4 @@
-import prisma from "@/lib/prisma";
+import prisma from "@/lib/db/prisma";
 
 export async function listExamples() {
   return prisma.example.findMany({

package/templates/features/i18n/next.config.ts

@@ -0,0 +1,17 @@
+import type { NextConfig } from "next";
+import createNextIntlPlugin from "next-intl/plugin";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const rootDir = path.dirname(fileURLToPath(import.meta.url));
+
+const nextConfig: NextConfig = {
+  reactStrictMode: true,
+  turbopack: {
+    root: rootDir,
+  },
+};
+
+const withNextIntl = createNextIntlPlugin("./src/i18n/request.ts");
+
+export default withNextIntl(nextConfig);

package/templates/features/i18n/src/app/layout.tsx

@@ -0,0 +1,42 @@
+import type { Metadata } from "next";
+import { Be_Vietnam_Pro } from "next/font/google";
+import { getLocale, getMessages } from "next-intl/server";
+import { NextIntlClientProvider } from "next-intl";
+import { Toaster } from "sonner";
+import type { ReactNode } from "react";
+import { QueryProvider } from "@/components/providers/query-provider";
+import { ThemeProvider } from "@/components/providers/theme-provider";
+import { branding } from "@/config/branding";
+import "@/app/globals.css";
+
+const beVietnamPro = Be_Vietnam_Pro({
+  subsets: ["latin", "vietnamese"],
+  weight: ["400", "500", "600", "700"],
+});
+
+export const metadata: Metadata = {
+  title: branding.projectName,
+  description: branding.description,
+};
+
+export default async function RootLayout({
+  children,
+}: Readonly<{
+  children: ReactNode;
+}>) {
+  const locale = await getLocale();
+  const messages = await getMessages();
+
+  return (
+    <html lang={locale} suppressHydrationWarning>
+      <body className={beVietnamPro.className}>
+        <NextIntlClientProvider locale={locale} messages={messages}>
+          <ThemeProvider attribute="class" defaultTheme="light" enableSystem>
+            <QueryProvider>{children}</QueryProvider>
+            <Toaster richColors position="top-right" />
+          </ThemeProvider>
+        </NextIntlClientProvider>
+      </body>
+    </html>
+  );
+}

package/templates/next-base/.env

@@ -1,16 +1,2 @@
-# --- Database (Supabase) ---
-DATABASE_URL="postgresql://postgres.your-project-ref:your-supabase-db-password@aws-0-us-east-1.pooler.supabase.com:6543/postgres?pgbouncer=true"
-DIRECT_URL="postgresql://postgres.your-project-ref:your-supabase-db-password@aws-0-us-east-1.pooler.supabase.com:5432/postgres"
-NEXT_PUBLIC_SUPABASE_URL=""
-# Public/browser-safe anon key from Supabase Project Settings -> API -> anon public
-NEXT_PUBLIC_SUPABASE_ANON_KEY=""
-# Storage bucket name used by the app (default scaffold bucket name: public)
-NEXT_PUBLIC_SUPABASE_STORAGE_BUCKET="public"
-
-# --- Auth ---
-BETTER_AUTH_SECRET="__BETTER_AUTH_SECRET__"
-BETTER_AUTH_URL="http://localhost:3000"
-
 # --- App ---
 NEXT_PUBLIC_APP_URL="http://localhost:3000"
-NEXT_PUBLIC_DEFAULT_LOCALE="vi"

package/templates/next-base/.env.development

@@ -1,16 +1,2 @@
-# --- Database (Supabase) ---
-DATABASE_URL="postgresql://postgres.your-project-ref:your-supabase-db-password@aws-0-us-east-1.pooler.supabase.com:6543/postgres?pgbouncer=true"
-DIRECT_URL="postgresql://postgres.your-project-ref:your-supabase-db-password@aws-0-us-east-1.pooler.supabase.com:5432/postgres"
-NEXT_PUBLIC_SUPABASE_URL=""
-# Public/browser-safe anon key from Supabase Project Settings -> API -> anon public
-NEXT_PUBLIC_SUPABASE_ANON_KEY=""
-# Storage bucket name used by the app (default scaffold bucket name: public)
-NEXT_PUBLIC_SUPABASE_STORAGE_BUCKET="public"
-
-# --- Auth ---
-BETTER_AUTH_SECRET="__BETTER_AUTH_SECRET__"
-BETTER_AUTH_URL="http://localhost:3000"
-
 # --- App ---
 NEXT_PUBLIC_APP_URL="http://localhost:3000"
-NEXT_PUBLIC_DEFAULT_LOCALE="vi"

package/templates/next-base/.env.example

@@ -1,16 +1,2 @@
-# --- Database (Supabase) ---
-DATABASE_URL="postgresql://postgres.your-project-ref:your-supabase-db-password@aws-0-us-east-1.pooler.supabase.com:6543/postgres?pgbouncer=true"
-DIRECT_URL="postgresql://postgres.your-project-ref:your-supabase-db-password@aws-0-us-east-1.pooler.supabase.com:5432/postgres"
-NEXT_PUBLIC_SUPABASE_URL=""
-# Public/browser-safe anon key from Supabase Project Settings -> API -> anon public
-NEXT_PUBLIC_SUPABASE_ANON_KEY=""
-# Storage bucket name used by the app (default scaffold bucket name: public)
-NEXT_PUBLIC_SUPABASE_STORAGE_BUCKET="public"
-
-# --- Auth ---
-BETTER_AUTH_SECRET="your-32-plus-char-random-secret"
-BETTER_AUTH_URL="http://localhost:3000"
-
 # --- App ---
 NEXT_PUBLIC_APP_URL="http://localhost:3000"
-NEXT_PUBLIC_DEFAULT_LOCALE="vi"