create-ej-app 2.2.0 → 2.4.0

package/README.md

@@ -1,5 +1,5 @@
 # create-ej-app
 
 ```
-npx create-ej-app
+npx create-ej-app@latest
 ```

package/cli.js

@@ -1,88 +1,76 @@
 #!/usr/bin/env node
-
-const { program } = require('commander')
-const fs = require('fs')
-const path = require('path')
-const { prompt } = require('enquirer')
-const copydir = require('copy-dir')
-
-program
-  .version('2.1.0')
-  .description('CLI tool to bootstrap a Next.js App')
-  .action(async () => {
-    const response = await prompt([
-      {
-        type: 'input',
-        name: 'projectName',
-        message: 'Enter the project name:',
-        initial: 'ej-app'
-      },
-      {
-        type: 'input',
-        name: 'description',
-        message: 'Enter a description for the project:',
-        initial: 'A Legendary Next.js App'
-      },
-      {
-        type: 'select',
-        name: 'template',
-        message: 'Select a template:',
-        choices: [
-          { name: 'base', message: 'Base' },
-          {
-            name: 'advanced',
-            message:
-              'Advanced setup with User Types and ACLs (roles & permissions)'
-          }
-        ],
-        initial: 0
-      }
-    ])
-
-    const { projectName, description, template } = response
-
-    // Create a directory with the project name
-    const projectDir = path.join(process.cwd(), projectName)
-
-    if (fs.existsSync(projectDir)) {
-      console.error(`Error: Directory '${projectName}' already exists.`)
-      process.exit(1)
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+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"));
+commander_1.program.action(() => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield (0, enquirer_1.prompt)([
+        {
+            type: 'input',
+            name: 'projectName',
+            message: 'Enter the project name:',
+            initial: 'my-app'
+        },
+        {
+            type: 'input',
+            name: 'description',
+            message: 'Enter a description for the project:',
+            initial: 'A Legendary App'
+        },
+        {
+            type: 'select',
+            name: 'template',
+            message: 'Select a template:',
+            choices: [
+                {
+                    name: 'base',
+                    message: 'Base setup with ts, shadcn, prisma, auth, editor.js'
+                },
+                {
+                    name: 'advanced',
+                    message: 'Advanced setup with User Types and ACLs (roles & permissions)'
+                }
+            ]
+        }
+    ]);
+    const { projectName, description, template } = response;
+    const projectDir = path_1.default.join(process.cwd(), projectName);
+    if (fs_1.default.existsSync(projectDir)) {
+        console.error(`Error: Directory '${projectName}' already exists.`);
+        process.exit(1);
     }
-
-    fs.mkdirSync(projectDir)
-
-    // Copy all files and subdirectories from your template folder to the new project directory
-    const templateDir = path.join(__dirname, 'template', template)
-    copydir.sync(templateDir, projectDir)
-
-    // Modify package.json in the new project directory to set the project name and description
-    const packageJsonFile = path.join(projectDir, 'package.json')
-    const packageJson = JSON.parse(fs.readFileSync(packageJsonFile, 'utf-8'))
-    packageJson.name = projectName
-    packageJson.description = description
-    fs.writeFileSync(packageJsonFile, JSON.stringify(packageJson, null, 2))
-
-    // Modify src/lib/siteConfig.ts in the new project directory to set the project name and description
-    const siteConfigFile = path.join(projectDir, 'src', 'lib', 'siteConfig.ts')
-    let siteConfig = fs.readFileSync(siteConfigFile, 'utf-8')
-    siteConfig = siteConfig.replace('Project Name', projectName)
-    siteConfig = siteConfig.replace('Project Description', description)
-    fs.writeFileSync(siteConfigFile, siteConfig)
-
-    // Copy .env.example to .env
-    const envExampleFile = path.join(projectDir, '.env.example')
-    const envExample = fs.readFileSync(envExampleFile, 'utf-8')
-    fs.writeFileSync(path.join(projectDir, '.env'), envExample)
-
-    console.log(`Created a new Next.js app called '${projectName}'
-
-
-To get started, run the following commands:
-
-cd ${projectName}
-npm install
-npm run dev
-`)
-  })
-
-program.parse(process.argv)
+    fs_1.default.mkdirSync(projectDir);
+    const templateDir = path_1.default.join(__dirname, 'template', template);
+    copy_dir_1.default.sync(templateDir, projectDir);
+    const packageJsonFile = path_1.default.join(projectDir, 'package.json');
+    const packageJson = JSON.parse(fs_1.default.readFileSync(packageJsonFile, 'utf-8'));
+    packageJson.name = projectName;
+    packageJson.description = description;
+    fs_1.default.writeFileSync(packageJsonFile, JSON.stringify(packageJson, null, 2));
+    const siteConfigFile = path_1.default.join(projectDir, 'src', 'lib', 'siteConfig.ts');
+    let siteConfig = fs_1.default.readFileSync(siteConfigFile, 'utf-8');
+    siteConfig = siteConfig.replace('Project Name', projectName);
+    siteConfig = siteConfig.replace('Project Description', description);
+    fs_1.default.writeFileSync(siteConfigFile, siteConfig);
+    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`);
+}));
+commander_1.program.parse(process.argv);

package/cli.ts

@@ -0,0 +1,81 @@
+#!/usr/bin/env node
+
+import { program } from 'commander';
+import { prompt } from 'enquirer';
+import fs from 'fs';
+import path from 'path';
+//@ts-ignore
+import copydir from 'copy-dir';
+
+interface Response {
+  projectName: string;
+  description: string;
+  template: string;
+}
+
+program.action(async () => {
+  const response: Response = await prompt([
+    {
+      type: 'input',
+      name: 'projectName',
+      message: 'Enter the project name:',
+      initial: 'my-app'
+    },
+    {
+      type: 'input',
+      name: 'description',
+      message: 'Enter a description for the project:',
+      initial: 'A Legendary App'
+    },
+    {
+      type: 'select',
+      name: 'template',
+      message: 'Select a template:',
+      choices: [
+        {
+          name: 'base',
+          message: 'Base setup with ts, shadcn, prisma, auth, editor.js'
+        },
+        {
+          name: 'advanced',
+          message:
+            'Advanced setup with User Types and ACLs (roles & permissions)'
+        }
+      ]
+    }
+  ]);
+
+  const { projectName, description, template } = response;
+
+  const projectDir = path.join(process.cwd(), projectName);
+
+  if (fs.existsSync(projectDir)) {
+    console.error(`Error: Directory '${projectName}' already exists.`);
+    process.exit(1);
+  }
+
+  fs.mkdirSync(projectDir);
+
+  const templateDir = path.join(__dirname, 'template', template);
+  copydir.sync(templateDir, projectDir);
+
+  const packageJsonFile = path.join(projectDir, 'package.json');
+  const packageJson = JSON.parse(fs.readFileSync(packageJsonFile, 'utf-8'));
+  packageJson.name = projectName;
+  packageJson.description = description;
+  fs.writeFileSync(packageJsonFile, JSON.stringify(packageJson, null, 2));
+
+  const siteConfigFile = path.join(projectDir, 'src', 'lib', 'siteConfig.ts');
+  let siteConfig = fs.readFileSync(siteConfigFile, 'utf-8');
+  siteConfig = siteConfig.replace('Project Name', projectName);
+  siteConfig = siteConfig.replace('Project Description', description);
+  fs.writeFileSync(siteConfigFile, siteConfig);
+
+  const envExampleFile = path.join(projectDir, '.env.example');
+  const envExample = fs.readFileSync(envExampleFile, 'utf-8');
+  fs.writeFileSync(path.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`);
+});
+
+program.parse(process.argv);

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "create-ej-app",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "description": "Bootstrap a next.js app with my preferred setup",
   "main": "cli.js",
   "scripts": {
+    "build": "tsc",
     "start": "node ."
   },
   "bin": {
@@ -32,5 +33,9 @@
     "commander": "^11.0.0",
     "copy-dir": "^1.3.0",
     "enquirer": "^2.4.1"
+  },
+  "devDependencies": {
+    "@types/node": "^20.8.0",
+    "typescript": "^5.2.2"
   }
 }

package/template/advanced/prisma/schema.prisma

@@ -149,5 +149,6 @@ model Resource {
     createdAt DateTime @default(now()) @db.Timestamptz()
     updatedAt DateTime @default(now()) @updatedAt @db.Timestamptz()
 
+    @@index([taskId])
     @@map("Resources")
 }

package/template/advanced/src/app/(app)/tasks/[id]/actions.ts

@@ -5,8 +5,41 @@ import { revalidatePath } from 'next/cache'
 
 import { authGuard } from '@/lib/auth'
 import { prisma } from '@/lib/db'
+import { storageClient } from '@/lib/storageClient'
 import { UnwrapPromise } from '@/types/UnwrapPromise'
 
+const handleImages = async (imageIds: string[], taskId: string) => {
+  const prevImages = await prisma.resource.findMany({
+    where: {
+      taskId
+    }
+  })
+
+  for (const p of prevImages) {
+    if (imageIds.includes(p.id)) continue
+    await Promise.all([
+      storageClient.deleteFile(p.newFilename),
+      prisma.resource.delete({
+        where: {
+          id: p.id
+        }
+      })
+    ])
+  }
+
+  if (imageIds.length)
+    await prisma.resource.updateMany({
+      where: {
+        id: {
+          in: imageIds
+        }
+      },
+      data: {
+        taskId
+      }
+    })
+}
+
 export const getTask = async (id: string) => {
   const session = await authGuard(['Root', 'Normal'], 'TaskView')
   if (!session) throw new Error('Unauthorized')
@@ -57,25 +90,7 @@ export const createTask = async ({
       updatedById: session.user.id
     }
   })
-  await prisma.resource.updateMany({
-    where: {
-      taskId: id
-    },
-    data: {
-      taskId: null
-    }
-  })
-  if (imageIds.length)
-    await prisma.resource.updateMany({
-      where: {
-        id: {
-          in: imageIds
-        }
-      },
-      data: {
-        taskId: id
-      }
-    })
+  await handleImages(imageIds, id)
 
   revalidatePath('/tasks')
   revalidatePath(`/tasks/${id}`)
@@ -110,25 +125,7 @@ export const updateTask = async ({
       updatedById: session.user.id
     }
   })
-  await prisma.resource.updateMany({
-    where: {
-      taskId: id
-    },
-    data: {
-      taskId: null
-    }
-  })
-  if (imageIds.length)
-    await prisma.resource.updateMany({
-      where: {
-        id: {
-          in: imageIds
-        }
-      },
-      data: {
-        taskId: id
-      }
-    })
+  await handleImages(imageIds, id)
 
   revalidatePath('/tasks')
   revalidatePath(`/tasks/${id}`)
@@ -138,6 +135,7 @@ export const deleteTask = async (id: string) => {
   const session = await authGuard(['Root', 'Normal'], 'TaskDelete')
   if (!session) throw new Error('Unauthorized')
 
+  await handleImages([], id)
   await prisma.task.delete({
     where: {
       id

package/template/advanced/src/app/api/upload/route.ts

@@ -1,17 +1,8 @@
-import { GCPStorageClient } from '@ejekanshjain/cloud-storage'
 import { NextRequest, NextResponse } from 'next/server'
 
-import { env } from '@/env.mjs'
 import { getAuthSession } from '@/lib/auth'
 import { prisma } from '@/lib/db'
-
-const storageClient = GCPStorageClient({
-  projectId: env.FIREBASE_PROJECT_ID!,
-  privateKey: env.FIREBASE_PRIVATE_KEY!,
-  clientEmail: env.FIREBASE_CLIENT_EMAIL!,
-  bucket: env.FIREBASE_STORAGE_BUCKET!,
-  defaultMediaPublic: true
-})
+import { storageClient } from '@/lib/storageClient'
 
 export async function POST(request: NextRequest) {
   const session = await getAuthSession()

package/template/advanced/src/lib/storageClient.ts

@@ -0,0 +1,11 @@
+import { GCPStorageClient } from '@ejekanshjain/cloud-storage'
+
+import { env } from '@/env.mjs'
+
+export const storageClient = GCPStorageClient({
+  projectId: env.FIREBASE_PROJECT_ID!,
+  privateKey: env.FIREBASE_PRIVATE_KEY!,
+  clientEmail: env.FIREBASE_CLIENT_EMAIL!,
+  bucket: env.FIREBASE_STORAGE_BUCKET!,
+  defaultMediaPublic: true
+})

package/template/base/prisma/schema.prisma

@@ -111,5 +111,6 @@ model Resource {
     createdAt DateTime @default(now()) @db.Timestamptz()
     updatedAt DateTime @default(now()) @updatedAt @db.Timestamptz()
 
+    @@index([taskId])
     @@map("Resources")
 }

package/template/base/src/app/(app)/tasks/[id]/actions.ts

@@ -5,8 +5,41 @@ import { revalidatePath } from 'next/cache'
 
 import { getAuthSession } from '@/lib/auth'
 import { prisma } from '@/lib/db'
+import { storageClient } from '@/lib/storageClient'
 import { UnwrapPromise } from '@/types/UnwrapPromise'
 
+const handleImages = async (imageIds: string[], taskId: string) => {
+  const prevImages = await prisma.resource.findMany({
+    where: {
+      taskId
+    }
+  })
+
+  for (const p of prevImages) {
+    if (imageIds.includes(p.id)) continue
+    await Promise.all([
+      storageClient.deleteFile(p.newFilename),
+      prisma.resource.delete({
+        where: {
+          id: p.id
+        }
+      })
+    ])
+  }
+
+  if (imageIds.length)
+    await prisma.resource.updateMany({
+      where: {
+        id: {
+          in: imageIds
+        }
+      },
+      data: {
+        taskId
+      }
+    })
+}
+
 export const getTask = async (id: string) => {
   const session = await getAuthSession()
   if (!session) throw new Error('Unauthorized')
@@ -57,25 +90,7 @@ export const createTask = async ({
       updatedById: session.user.id
     }
   })
-  await prisma.resource.updateMany({
-    where: {
-      taskId: id
-    },
-    data: {
-      taskId: null
-    }
-  })
-  if (imageIds.length)
-    await prisma.resource.updateMany({
-      where: {
-        id: {
-          in: imageIds
-        }
-      },
-      data: {
-        taskId: id
-      }
-    })
+  await handleImages(imageIds, id)
 
   revalidatePath('/tasks')
   revalidatePath(`/tasks/${id}`)
@@ -110,25 +125,7 @@ export const updateTask = async ({
       updatedById: session.user.id
     }
   })
-  await prisma.resource.updateMany({
-    where: {
-      taskId: id
-    },
-    data: {
-      taskId: null
-    }
-  })
-  if (imageIds.length)
-    await prisma.resource.updateMany({
-      where: {
-        id: {
-          in: imageIds
-        }
-      },
-      data: {
-        taskId: id
-      }
-    })
+  await handleImages(imageIds, id)
 
   revalidatePath('/tasks')
   revalidatePath(`/tasks/${id}`)
@@ -138,6 +135,7 @@ export const deleteTask = async (id: string) => {
   const session = await getAuthSession()
   if (!session) throw new Error('Unauthorized')
 
+  await handleImages([], id)
   await prisma.task.delete({
     where: {
       id

package/template/base/src/app/api/upload/route.ts

@@ -1,17 +1,8 @@
-import { GCPStorageClient } from '@ejekanshjain/cloud-storage'
 import { NextRequest, NextResponse } from 'next/server'
 
-import { env } from '@/env.mjs'
 import { getAuthSession } from '@/lib/auth'
 import { prisma } from '@/lib/db'
-
-const storageClient = GCPStorageClient({
-  projectId: env.FIREBASE_PROJECT_ID!,
-  privateKey: env.FIREBASE_PRIVATE_KEY!,
-  clientEmail: env.FIREBASE_CLIENT_EMAIL!,
-  bucket: env.FIREBASE_STORAGE_BUCKET!,
-  defaultMediaPublic: true
-})
+import { storageClient } from '@/lib/storageClient'
 
 export async function POST(request: NextRequest) {
   const session = await getAuthSession()

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

@@ -0,0 +1,11 @@
+import { GCPStorageClient } from '@ejekanshjain/cloud-storage'
+
+import { env } from '@/env.mjs'
+
+export const storageClient = GCPStorageClient({
+  projectId: env.FIREBASE_PROJECT_ID!,
+  privateKey: env.FIREBASE_PRIVATE_KEY!,
+  clientEmail: env.FIREBASE_CLIENT_EMAIL!,
+  bucket: env.FIREBASE_STORAGE_BUCKET!,
+  defaultMediaPublic: true
+})

package/tsconfig.json

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "outDir": "./",
+    "lib": ["ESNext", "DOM"],
+    "target": "es2016",
+    "module": "commonjs",
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true
+  },
+  "include": ["**/*.ts"],
+  "exclude": ["node_modules", "template"]
+}