create-ej-app 6.0.0 → 7.0.0

package/cli.js

@@ -13,12 +13,49 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const child_process_1 = require("child_process");
 const commander_1 = require("commander");
 const enquirer_1 = require("enquirer");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 //@ts-ignore
 const copy_dir_1 = __importDefault(require("copy-dir"));
+const detectPackageManager = () => {
+    const userAgent = process.env.npm_config_user_agent;
+    if (userAgent) {
+        if (userAgent.startsWith('pnpm'))
+            return 'pnpm';
+        if (userAgent.startsWith('yarn'))
+            return 'yarn';
+        if (userAgent.startsWith('bun'))
+            return 'bun';
+    }
+    return 'npm';
+};
+const getInstallCommand = (packageManager) => {
+    switch (packageManager) {
+        case 'pnpm':
+            return 'pnpm i';
+        case 'yarn':
+            return 'yarn';
+        case 'bun':
+            return 'bun i';
+        default:
+            return 'npm i';
+    }
+};
+const getDevCommand = (packageManager) => {
+    switch (packageManager) {
+        case 'pnpm':
+            return 'pnpm dev';
+        case 'yarn':
+            return 'yarn dev';
+        case 'bun':
+            return 'bun dev';
+        default:
+            return 'npm run dev';
+    }
+};
 commander_1.program.action(() => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield (0, enquirer_1.prompt)([
         {
@@ -31,7 +68,7 @@ commander_1.program.action(() => __awaiter(void 0, void 0, void 0, function* ()
             type: 'input',
             name: 'description',
             message: 'Enter a description for the project:',
-            initial: 'A Legendary App'
+            initial: 'A Legendary Next.js App'
         },
         {
             type: 'select',
@@ -40,24 +77,22 @@ commander_1.program.action(() => __awaiter(void 0, void 0, void 0, function* ()
             choices: [
                 {
                     name: 'base',
-                    message: 'Base setup with ts, shadcn, auth, drizzle, User Types and ACLs (roles & permissions)'
-                },
-                {
-                    name: 'prisma',
-                    message: 'Base setup with ts, shadcn, prisma, auth, editor.js'
+                    message: 'Base setup with Next 16, Better Auth, shadcn and Drizzle'
                 },
                 {
-                    name: 'prisma-advanced',
-                    message: 'Advanced setup with User Types and ACLs (roles & permissions)'
-                },
-                {
-                    name: 'new',
-                    message: 'Advanced new setup with next 16, Better Auth and Drizzle ORM'
+                    name: 'old',
+                    message: 'old setup with ts, shadcn, auth, drizzle'
                 }
             ]
+        },
+        {
+            type: 'select',
+            name: 'git',
+            message: 'Initialize a git repository?',
+            choices: ['yes', 'no']
         }
     ]);
-    const { projectName, description, template } = response;
+    const { projectName, description, template, git } = response;
     const projectDir = path_1.default.join(process.cwd(), projectName);
     if (fs_1.default.existsSync(projectDir)) {
         console.error(`Error: Directory '${projectName}' already exists.`);
@@ -79,6 +114,45 @@ commander_1.program.action(() => __awaiter(void 0, void 0, void 0, function* ()
     const envExampleFile = path_1.default.join(projectDir, '.env.example');
     const envExample = fs_1.default.readFileSync(envExampleFile, 'utf-8');
     fs_1.default.writeFileSync(path_1.default.join(projectDir, '.env'), envExample);
-    console.log(`Created a new app called '${projectName}' 🎉\n\nTo get started, run the following commands:\n\ncd ${projectName}\nnpm install\nnpm run dev\n`);
+    fs_1.default.writeFileSync(path_1.default.join(projectDir, '.gitignore'), `node_modules
+.next
+out
+build
+next-env.d.ts
+.DS_Store
+.env
+`);
+    fs_1.default.writeFileSync(path_1.default.join(projectDir, 'README.md'), `# ${projectName}
+
+${description}
+`);
+    if (git === 'yes') {
+        try {
+            (0, child_process_1.execSync)('git init', { cwd: projectDir, stdio: 'inherit' });
+        }
+        catch (err) {
+            console.error('Error initializing git repository:', err);
+        }
+    }
+    const pm = detectPackageManager();
+    const installCommand = getInstallCommand(pm);
+    const devCommand = getDevCommand(pm);
+    console.log(`
+Created a new app called '${projectName}' 🎉
+
+To open the project in vscode run:
+
+code ${projectName}
+
+
+To get started, run the following commands:
+cd ${projectName}
+
+${installCommand}
+
+${devCommand}
+
+Happy coding! 🚀
+`);
 }));
 commander_1.program.parse(process.argv);

package/cli.ts

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+import { execSync } from 'child_process'
 import { program } from 'commander'
 import { prompt } from 'enquirer'
 import fs from 'fs'
@@ -11,6 +12,45 @@ interface Response {
   projectName: string
   description: string
   template: string
+  git: string
+}
+
+const detectPackageManager = () => {
+  const userAgent = process.env.npm_config_user_agent
+
+  if (userAgent) {
+    if (userAgent.startsWith('pnpm')) return 'pnpm'
+    if (userAgent.startsWith('yarn')) return 'yarn'
+    if (userAgent.startsWith('bun')) return 'bun'
+  }
+
+  return 'npm'
+}
+
+const getInstallCommand = (packageManager: string) => {
+  switch (packageManager) {
+    case 'pnpm':
+      return 'pnpm i'
+    case 'yarn':
+      return 'yarn'
+    case 'bun':
+      return 'bun i'
+    default:
+      return 'npm i'
+  }
+}
+
+const getDevCommand = (packageManager: string) => {
+  switch (packageManager) {
+    case 'pnpm':
+      return 'pnpm dev'
+    case 'yarn':
+      return 'yarn dev'
+    case 'bun':
+      return 'bun dev'
+    default:
+      return 'npm run dev'
+  }
 }
 
 program.action(async () => {
@@ -25,7 +65,7 @@ program.action(async () => {
       type: 'input',
       name: 'description',
       message: 'Enter a description for the project:',
-      initial: 'A Legendary App'
+      initial: 'A Legendary Next.js App'
     },
     {
       type: 'select',
@@ -34,28 +74,23 @@ program.action(async () => {
       choices: [
         {
           name: 'base',
-          message:
-            'Base setup with ts, shadcn, auth, drizzle, User Types and ACLs (roles & permissions)'
-        },
-        {
-          name: 'prisma',
-          message: 'Base setup with ts, shadcn, prisma, auth, editor.js'
+          message: 'Base setup with Next 16, Better Auth, shadcn and Drizzle'
         },
         {
-          name: 'prisma-advanced',
-          message:
-            'Advanced setup with User Types and ACLs (roles & permissions)'
-        },
-        {
-          name: 'new',
-          message:
-            'Advanced new setup with next 16, Better Auth and Drizzle ORM'
+          name: 'old',
+          message: 'old setup with ts, shadcn, auth, drizzle'
         }
       ]
+    },
+    {
+      type: 'select',
+      name: 'git',
+      message: 'Initialize a git repository?',
+      choices: ['yes', 'no']
     }
   ])
 
-  const { projectName, description, template } = response
+  const { projectName, description, template, git } = response
 
   const projectDir = path.join(process.cwd(), projectName)
 
@@ -85,8 +120,56 @@ program.action(async () => {
   const envExample = fs.readFileSync(envExampleFile, 'utf-8')
   fs.writeFileSync(path.join(projectDir, '.env'), envExample)
 
+  fs.writeFileSync(
+    path.join(projectDir, '.gitignore'),
+    `node_modules
+.next
+out
+build
+next-env.d.ts
+.DS_Store
+.env
+`
+  )
+
+  fs.writeFileSync(
+    path.join(projectDir, 'README.md'),
+    `# ${projectName}
+
+${description}
+`
+  )
+
+  if (git === 'yes') {
+    try {
+      execSync('git init', { cwd: projectDir, stdio: 'inherit' })
+    } catch (err) {
+      console.error('Error initializing git repository:', err)
+    }
+  }
+
+  const pm = detectPackageManager()
+  const installCommand = getInstallCommand(pm)
+  const devCommand = getDevCommand(pm)
+
   console.log(
-    `Created a new app called '${projectName}' 🎉\n\nTo get started, run the following commands:\n\ncd ${projectName}\nnpm install\nnpm run dev\n`
+    `
+Created a new app called '${projectName}' 🎉
+
+To open the project in vscode run:
+
+code ${projectName}
+
+
+To get started, run the following commands:
+cd ${projectName}
+
+${installCommand}
+
+${devCommand}
+
+Happy coding! 🚀
+`
   )
 })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-ej-app",
-  "version": "6.0.0",
+  "version": "7.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": "^24.10.0",
+    "@types/node": "^24.10.1",
     "typescript": "^5.9.3"
   }
 }

package/template/base/.env.example

@@ -1,17 +1,13 @@
-NODE_ENV="development"
+APP_ENV="production"
 DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres"
-NEXTAUTH_SECRET="secret"
-NEXTAUTH_URL="http://localhost:3000"
-EMAIL_SERVER_HOST="example.com"
-EMAIL_SERVER_PORT="123"
-EMAIL_SERVER_USER="example@example.com"
+BETTER_AUTH_URL="http://localhost:3000"
+BETTER_AUTH_SECRET="secret"
+BETTER_AUTH_GITHUB_ID="github_id"
+BETTER_AUTH_GITHUB_SECRET="github_secret"
+BETTER_AUTH_GOOGLE_ID="google_id"
+BETTER_AUTH_GOOGLE_SECRET="google_secret"
+EMAIL_SERVER_USER="username"
 EMAIL_SERVER_PASSWORD="password"
-EMAIL_FROM="example@example.com"
-GOOGLE_ID="id"
-GOOGLE_SECRET="secret"
-GITHUB_ID="id"
-GITHUB_SECRET="secret"
-S3_REGION="ap-south-1"
-S3_BUCKET="bucket"
-S3_ACCESS_KEY="key"
-S3_SECRET_KEY="secret"
+EMAIL_SERVER_HOST="smtp.example.com"
+EMAIL_SERVER_PORT="465"
+EMAIL_FROM="no-reply@example.com"

package/template/base/Dockerfile

@@ -0,0 +1,15 @@
+FROM oven/bun:latest
+
+WORKDIR /app
+
+COPY package.json bun.lock ./
+
+RUN bun install --frozen-lockfile
+
+COPY . .
+
+COPY .env.example .env
+
+RUN bun run build
+
+ENTRYPOINT ["bun", "start"]

package/template/base/components.json

@@ -1,17 +1,22 @@
 {
   "$schema": "https://ui.shadcn.com/schema.json",
-  "style": "default",
+  "style": "new-york",
   "rsc": true,
   "tsx": true,
   "tailwind": {
-    "config": "tailwind.config.ts",
+    "config": "",
     "css": "src/app/globals.css",
     "baseColor": "neutral",
     "cssVariables": true,
     "prefix": ""
   },
+  "iconLibrary": "lucide",
   "aliases": {
-    "components": "@/components",
-    "utils": "@/lib/cn"
-  }
+    "components": "~/components",
+    "utils": "~/lib/cn",
+    "ui": "~/components/ui",
+    "lib": "~/lib",
+    "hooks": "~/hooks"
+  },
+  "registries": {}
 }

package/template/base/drizzle.config.ts

@@ -1,11 +1,10 @@
-import { type Config } from 'drizzle-kit'
+import { defineConfig } from 'drizzle-kit'
+import { env } from '~/env'
 
-import { env } from '@/env.mjs'
-
-export default {
+export default defineConfig({
   schema: './src/db/schema.ts',
   dialect: 'postgresql',
   dbCredentials: {
     url: env.DATABASE_URL
   }
-} satisfies Config
+})

package/template/{new → base}/eslint.config.mjs

@@ -12,7 +12,12 @@ const eslintConfig = defineConfig([
     'out/**',
     'build/**',
     'next-env.d.ts'
-  ])
+  ]),
+  {
+    rules: {
+      'react/no-unescaped-entities': 'off'
+    }
+  }
 ])
 
 export default eslintConfig

package/template/base/package.json

@@ -1,87 +1,70 @@
 {
   "name": "my-app",
-  "version": "1.0.0",
   "description": "A Legendary Next.js App",
+  "version": "1.0.0",
   "private": true,
   "scripts": {
-    "format": "prettier --write \"src/**/*.{js,cjs,mjs,jsx,ts,tsx}\"",
-    "lint": "next lint",
     "dev": "next dev",
     "build": "next build",
+    "analyze": "ANALYZE=true next build --webpack",
     "start": "next start",
-    "db:generate": "drizzle-kit generate",
+    "lint": "eslint",
+    "format": "prettier --write \"./src/**/*.{js,cjs,mjs,jsx,ts,tsx}\"",
     "db:push": "drizzle-kit push",
-    "db:studio": "drizzle-kit studio"
+    "db:studio": "drizzle-kit studio",
+    "gen:auth": "bunx @better-auth/cli generate"
   },
   "dependencies": {
-    "@auth/drizzle-adapter": "^1.4.1",
-    "@aws-sdk/client-s3": "^3.600.0",
-    "@aws-sdk/s3-presigned-post": "^3.600.0",
-    "@editorjs/checklist": "^1.6.0",
-    "@editorjs/code": "^2.9.0",
-    "@editorjs/delimiter": "^1.4.0",
-    "@editorjs/editorjs": "^2.29.1",
-    "@editorjs/header": "^2.8.1",
-    "@editorjs/image": "^2.9.0",
-    "@editorjs/inline-code": "^1.5.0",
-    "@editorjs/list": "^1.9.0",
-    "@editorjs/nested-list": "^1.4.2",
-    "@editorjs/quote": "^2.6.0",
-    "@editorjs/table": "^2.3.0",
-    "@hookform/resolvers": "^3.6.0",
-    "@paralleldrive/cuid2": "^2.2.2",
-    "@radix-ui/react-alert-dialog": "^1.1.1",
-    "@radix-ui/react-avatar": "^1.1.0",
-    "@radix-ui/react-checkbox": "^1.1.0",
-    "@radix-ui/react-dialog": "^1.1.1",
-    "@radix-ui/react-dropdown-menu": "^2.1.1",
-    "@radix-ui/react-label": "^2.1.0",
-    "@radix-ui/react-popover": "^1.1.1",
-    "@radix-ui/react-select": "^2.1.1",
-    "@radix-ui/react-separator": "^1.1.0",
-    "@radix-ui/react-slot": "^1.1.0",
-    "@t3-oss/env-nextjs": "^0.10.1",
-    "@tailwindcss/typography": "^0.5.13",
-    "@tanstack/react-table": "^8.17.3",
-    "@types/eslint": "^8.56.10",
-    "@types/node": "^20.14.9",
-    "@types/nodemailer": "^6.4.15",
-    "@types/react": "^18.3.3",
-    "@types/react-dom": "^18.3.0",
-    "@typescript-eslint/eslint-plugin": "^7.14.1",
-    "@typescript-eslint/parser": "^7.14.1",
-    "class-variance-authority": "^0.7.0",
-    "clsx": "^2.1.1",
-    "cmdk": "^1.0.0",
-    "dayjs": "^1.11.11",
-    "drizzle-kit": "^0.22.7",
-    "drizzle-orm": "^0.31.2",
-    "editorjs-html": "^3.4.3",
-    "eslint": "^8.57.0",
-    "eslint-config-next": "^14.2.4",
-    "eslint-plugin-drizzle": "^0.2.3",
-    "geist": "^1.3.0",
-    "lucide-react": "^0.397.0",
-    "next": "^14.2.4",
-    "next-auth": "^4.24.7",
-    "next-safe-action": "^7.1.3",
-    "next-themes": "^0.3.0",
-    "nextjs-toploader": "^1.6.12",
-    "nodemailer": "^6.9.14",
-    "postcss": "^8.4.38",
-    "postcss-load-config": "^6.0.1",
-    "postgres": "^3.4.4",
-    "prettier": "^3.3.2",
-    "prettier-plugin-organize-imports": "^3.2.4",
-    "prettier-plugin-tailwindcss": "^0.6.5",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "react-hook-form": "^7.52.0",
-    "sonner": "^1.5.0",
-    "tailwind-merge": "^2.3.0",
-    "tailwindcss": "^3.4.4",
-    "tailwindcss-animate": "^1.0.7",
-    "typescript": "^5.5.2",
-    "zod": "^3.23.8"
-  }
+    "@hookform/resolvers": "5.2.2",
+    "@next/third-parties": "16.0.5",
+    "@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",
+    "@tanstack/react-query": "5.90.11",
+    "better-auth": "1.4.3",
+    "class-variance-authority": "0.7.1",
+    "clsx": "2.1.1",
+    "drizzle-orm": "0.44.7",
+    "lucide-react": "0.555.0",
+    "next": "16.0.5",
+    "next-safe-action": "8.0.11",
+    "next-themes": "0.4.6",
+    "nextjs-toploader": "3.9.17",
+    "nodemailer": "7.0.11",
+    "postgres": "3.4.7",
+    "react": "19.2.0",
+    "react-dom": "19.2.0",
+    "react-hook-form": "7.67.0",
+    "sonner": "2.0.7",
+    "tailwind-merge": "3.4.0",
+    "tw-animate-css": "1.4.0",
+    "workflow": "4.0.1-beta.22",
+    "zod": "4.1.13"
+  },
+  "devDependencies": {
+    "@next/bundle-analyzer": "16.0.5",
+    "@tailwindcss/postcss": "4.1.17",
+    "@types/bun": "1.3.3",
+    "@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.7",
+    "eslint": "9.39.1",
+    "eslint-config-next": "16.0.5",
+    "prettier": "3.7.2",
+    "prettier-plugin-organize-imports": "4.3.0",
+    "prettier-plugin-tailwindcss": "0.7.1",
+    "tailwindcss": "4.1.17",
+    "typescript": "5.9.3"
+  },
+  "trustedDependencies": [
+    "@swc/core",
+    "@tailwindcss/oxide",
+    "esbuild",
+    "sharp",
+    "unrs-resolver"
+  ]
 }

package/template/base/postcss.config.mjs

@@ -1,8 +1,5 @@
-/** @type {import('postcss-load-config').Config} */
 const config = {
-  plugins: {
-    tailwindcss: {}
-  }
+  plugins: ['@tailwindcss/postcss']
 }
 
 export default config

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

@@ -0,0 +1,20 @@
+import { notFound } from 'next/navigation'
+import { getAuthSession } from '~/lib/auth'
+
+export default async function Layout({
+  children
+}: Readonly<{
+  children: React.ReactNode
+}>) {
+  const authSession = await getAuthSession()
+
+  if (!authSession?.isAdmin) {
+    notFound()
+  }
+
+  return (
+    <div className="flex min-h-screen flex-col">
+      <main className="flex-1">{children}</main>
+    </div>
+  )
+}