create-ej-app 26.0.0 → 27.0.0

package/template/saas-starter/tests/setup/preload.ts

@@ -0,0 +1,108 @@
+/**
+ * Bun test preload (runs before every test file and worker).
+ *
+ * - In-memory PGlite Postgres (WASM) through a `~/db` mock
+ * - R2 env cleared, so storage stays in base64 dev mode (no bucket I/O)
+ * - `react.cache` becomes identity
+ * - `getAuthSession` reads an AsyncLocalStorage (parallel-safe)
+ *
+ * Set `TEST_DATABASE=postgres` to use the real `DATABASE_URL` instead.
+ */
+import { mock } from 'bun:test'
+import { AsyncLocalStorage } from 'node:async_hooks'
+import { createRequire } from 'node:module'
+import path from 'node:path'
+
+// Bun loads `.env` before preload, so unsetting these is not enough: empty
+// strings become undefined through `emptyStringAsUndefined` in ~/env.
+for (const key of [
+  'R2_ACCOUNT_ID',
+  'R2_ACCESS_KEY_ID',
+  'R2_SECRET_ACCESS_KEY',
+  'R2_BUCKET_NAME',
+  'R2_PUBLIC_URL'
+] as const) {
+  process.env[key] = ''
+}
+
+// Bun does not set the `react-server` export condition, so the real
+// `server-only` package throws. Next.js client builds still fail on it.
+mock.module('server-only', () => ({}))
+
+// `start()` needs the Workflow runtime. Tests only need fire-and-forget
+// side effects such as emails to no-op.
+mock.module('workflow/api', () => ({
+  start: async () => ({ runId: 'test-workflow-run' })
+}))
+
+// ---------------------------------------------------------------------------
+// Database: PGlite (default) or real Postgres
+// ---------------------------------------------------------------------------
+
+process.env.TEST_DATABASE ??= 'pglite'
+
+if (process.env.TEST_DATABASE === 'pglite') {
+  // ~/env requires a URL even though PGlite never connects to it.
+  process.env.DATABASE_URL ??= 'postgres://pglite.local/test'
+
+  const { initPgliteDatabase } = await import('./pglite-db')
+  const dbModule = { db: await initPgliteDatabase() }
+
+  mock.module('~/db', () => dbModule)
+  mock.module(
+    path.resolve(import.meta.dir, '../../src/db/index.ts'),
+    () => dbModule
+  )
+}
+
+// ---------------------------------------------------------------------------
+// Auth and request headers
+// ---------------------------------------------------------------------------
+
+type MockAuthSession = {
+  user: { id: string; email: string; name: string; role?: string | null }
+  session: { id: string; userId: string; impersonatedBy?: string | null }
+  isAdmin: boolean
+  isSuperAdmin: boolean
+}
+
+const authAls = new AsyncLocalStorage<MockAuthSession | null>()
+
+/** Runs `fn` with `getAuthSession()` returning `session`. */
+export function runWithAuthSession<T>(
+  session: MockAuthSession | null,
+  fn: () => Promise<T>
+): Promise<T> {
+  return authAls.run(session, fn)
+}
+
+const require = createRequire(import.meta.url)
+const React = require('react') as typeof import('react')
+
+mock.module('react', () => ({
+  ...React,
+  default: React,
+  cache: <T extends (...args: never[]) => unknown>(fn: T) => fn
+}))
+
+const authModuleMock = {
+  getAuthSession: async () => authAls.getStore() ?? null,
+  auth: null as unknown
+}
+
+mock.module('~/lib/auth', () => authModuleMock)
+mock.module(
+  path.resolve(import.meta.dir, '../../src/lib/auth.ts'),
+  () => authModuleMock
+)
+
+mock.module('next/headers', () => ({
+  headers: async () => new Headers(),
+  cookies: async () => ({
+    get: () => undefined,
+    getAll: () => [],
+    has: () => false,
+    set: () => {},
+    delete: () => {}
+  })
+}))

package/template/saas-starter/tests/support/support-tickets.test.ts

@@ -0,0 +1,145 @@
+import { afterEach, describe, expect, test } from 'bun:test'
+import {
+  addSupportTicketMessageAction,
+  createSupportTicketAction,
+  getAdminSupportTicketsAction,
+  getMyAccountSupportTicketsAction,
+  getOrganizationSupportTicketsAction,
+  getSupportTicketDetailsAction,
+  updateSupportTicketStatusAction
+} from '~/app/actions/support-tickets'
+import { asUser, expectData, expectServerError, Fixtures } from '../helpers'
+
+describe('support tickets', () => {
+  const fx = new Fixtures()
+  afterEach(() => fx.cleanup())
+
+  test('organization tickets are shared by managers and hidden from members', async () => {
+    const ws = await fx.workspace()
+
+    const created = await asUser(ws.owner, () =>
+      createSupportTicketAction({
+        organizationId: ws.organization.id,
+        subject: 'Invoices are missing',
+        priority: 'high',
+        message: 'Last month has no invoice.'
+      })
+    )
+    expectData(created)
+    expect(created.data.ticketNumber).toMatch(/^TICKET-\d{6}$/)
+
+    const asAdmin = await asUser(ws.admin, () =>
+      getSupportTicketDetailsAction({ ticketId: created.data.id })
+    )
+    expectData(asAdmin)
+
+    const asMember = await asUser(ws.member, () =>
+      getSupportTicketDetailsAction({ ticketId: created.data.id })
+    )
+    expectServerError(asMember, 'permission')
+
+    const memberList = await asUser(ws.member, () =>
+      getOrganizationSupportTicketsAction({
+        organizationId: ws.organization.id,
+        page: 1,
+        limit: 10
+      })
+    )
+    expectServerError(memberList, 'permission')
+  })
+
+  test('account tickets belong to their author alone', async () => {
+    const author = await fx.user()
+    const other = await fx.user()
+
+    const created = await asUser(author, () =>
+      createSupportTicketAction({
+        subject: 'Change my email',
+        message: 'I need a new sign-in address.'
+      })
+    )
+    expectData(created)
+
+    const mine = await asUser(author, () =>
+      getMyAccountSupportTicketsAction({ page: 1, limit: 10 })
+    )
+    expectData(mine)
+    expect(mine.data[0].map(ticket => ticket.id)).toContain(created.data.id)
+
+    const theirs = await asUser(other, () =>
+      getSupportTicketDetailsAction({ ticketId: created.data.id })
+    )
+    expectServerError(theirs, 'permission')
+  })
+
+  test('an admin replying from their own ticket page counts as the customer', async () => {
+    const admin = await fx.platformUser('admin')
+
+    const created = await asUser(admin, () =>
+      createSupportTicketAction({
+        subject: 'My own account',
+        message: 'Testing the customer view.'
+      })
+    )
+    expectData(created)
+
+    const reply = await asUser(admin, () =>
+      addSupportTicketMessageAction({
+        ticketId: created.data.id,
+        message: 'Adding detail as the customer.'
+      })
+    )
+    expectData(reply)
+    expect(reply.data?.isAdmin).toBe(false)
+
+    const asSupport = await asUser(admin, () =>
+      addSupportTicketMessageAction({
+        ticketId: created.data.id,
+        message: 'Replying as support.',
+        asSupport: true
+      })
+    )
+    expectData(asSupport)
+    expect(asSupport.data?.isAdmin).toBe(true)
+  })
+
+  test('only platform admins list every ticket and change status', async () => {
+    const author = await fx.user()
+    const admin = await fx.platformUser('admin')
+
+    const created = await asUser(author, () =>
+      createSupportTicketAction({
+        subject: 'Billing question',
+        message: 'Which plan fits a team of 10?'
+      })
+    )
+    expectData(created)
+
+    const denied = await asUser(author, () =>
+      getAdminSupportTicketsAction({ page: 1, limit: 10 })
+    )
+    expectServerError(denied, 'permission')
+
+    const list = await asUser(admin, () =>
+      getAdminSupportTicketsAction({ page: 1, limit: 50 })
+    )
+    expectData(list)
+    expect(list.data[0].map(ticket => ticket.id)).toContain(created.data.id)
+
+    const closed = await asUser(admin, () =>
+      updateSupportTicketStatusAction({
+        ticketId: created.data.id,
+        status: 'closed'
+      })
+    )
+    expectData(closed)
+
+    const reply = await asUser(author, () =>
+      addSupportTicketMessageAction({
+        ticketId: created.data.id,
+        message: 'One more thing.'
+      })
+    )
+    expectServerError(reply, 'closed')
+  })
+})

package/template/saas-starter/tsconfig.json

@@ -2,6 +2,7 @@
   "compilerOptions": {
     "target": "ES2017",
     "lib": ["DOM", "DOM.Iterable", "ESNext"],
+    "types": ["bun"],
     "allowJs": true,
     "checkJs": true,
     "skipLibCheck": true,

package/cli.js

@@ -1,147 +0,0 @@
-#!/usr/bin/env node
-import { execSync } from 'child_process';
-import { program } from 'commander';
-import enquirer from 'enquirer';
-import fs from 'fs';
-import path from 'path';
-import { fileURLToPath } from 'url';
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-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';
-    }
-};
-program.action(async () => {
-    const response = await enquirer.prompt([
-        {
-            type: 'input',
-            name: 'projectName',
-            message: 'Enter the project name:',
-            initial: 'my-project'
-        },
-        {
-            type: 'input',
-            name: 'description',
-            message: 'Enter a description for the project:',
-            initial: 'A Legendary Project'
-        },
-        {
-            type: 'select',
-            name: 'template',
-            message: 'Select a template:',
-            choices: [
-                {
-                    name: 'nextjs',
-                    message: 'Full Stack setup with Next 16, Better Auth, shadcn and Drizzle'
-                },
-                {
-                    name: 'saas-starter',
-                    message: 'SaaS Starter with Stripe, Next 16, Better Auth, shadcn and Drizzle'
-                },
-                {
-                    name: 'api',
-                    message: 'API Server setup with Elysia, Drizzle, Typescript'
-                }
-            ]
-        },
-        {
-            type: 'select',
-            name: 'git',
-            message: 'Initialize a git repository?',
-            choices: ['yes', 'no']
-        }
-    ]);
-    const { projectName, description, template, git } = 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);
-    fs.cpSync(templateDir, projectDir, { recursive: true });
-    const renameGitignore = (dir) => {
-        for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-            const fullPath = path.join(dir, entry.name);
-            if (entry.isDirectory()) {
-                renameGitignore(fullPath);
-            }
-            else if (entry.name === 'gitignore') {
-                fs.renameSync(fullPath, path.join(dir, '.gitignore'));
-            }
-        }
-    };
-    renameGitignore(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 envExampleFile = path.join(projectDir, '.env.example');
-    const envExample = fs.readFileSync(envExampleFile, 'utf-8');
-    fs.writeFileSync(path.join(projectDir, '.env'), envExample);
-    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}' 🎉
-
-To open the project in vscode run:
-
-code ${projectName}
-
-
-To get started, run the following commands:
-cd ${projectName}
-
-${installCommand}
-
-${devCommand}
-
-Happy coding! 🚀
-`);
-});
-program.parse(process.argv);

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

@@ -1,20 +0,0 @@
-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) {
-    return notFound()
-  }
-
-  return (
-    <div className="flex min-h-screen flex-col space-y-4">
-      <main className="flex-1">{children}</main>
-    </div>
-  )
-}

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

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

package/template/nextjs/terraform/artifact-registry.tf

@@ -1,5 +0,0 @@
-resource "google_artifact_registry_repository" "github" {
-  repository_id = "github"
-  location      = "us"
-  format        = "DOCKER"
-}

package/template/nextjs/terraform/backend-service.tf

@@ -1,13 +0,0 @@
-resource "google_compute_backend_service" "my_app_prod_service" {
-  name = "my-app-prod-service"
-
-  backend {
-    group = google_compute_region_network_endpoint_group.my_app_prod_neg.id
-  }
-
-  protocol              = "HTTPS"
-  locality_lb_policy    = "ROUND_ROBIN"
-  load_balancing_scheme = "EXTERNAL_MANAGED"
-
-  depends_on = [google_compute_region_network_endpoint_group.my_app_prod_neg]
-}

package/template/nextjs/terraform/cleanup.sh

@@ -1,9 +0,0 @@
-gcloud run revisions list \
-  --region=us-central1 \
-  --format=json | \
-  jq -r '.[] | select(.status.conditions[] | select(.type == "Active" and .status != "True")) | .metadata.name' | \
-  sort -u | \
-  xargs -I {} gcloud run revisions delete {} \
-  --region=us-central1 --quiet
-
-gcloud artifacts docker images list us-docker.pkg.dev/project-id/github/my-app --format=json --include-tags | jq -r '.[] | select((.tags // []) as $tags | ($tags | index("main") // -1) == -1 and ($tags | index("dev") // -1) == -1) | .version' | while read -r digest; do echo "Deleting image with digest: $digest"; gcloud artifacts docker images delete us-docker.pkg.dev/project-id/github/my-app@$digest --delete-tags --quiet || true; done

package/template/nextjs/terraform/cloudbuild.tf

@@ -1,70 +0,0 @@
-resource "google_cloudbuild_trigger" "my_app_main_build_trigger" {
-  name               = "my-app-main-build-trigger"
-  description        = "Build trigger for My App"
-  location           = "global"
-  include_build_logs = "INCLUDE_BUILD_LOGS_WITH_STATUS"
-  disabled           = false
-
-  github {
-    owner = "github-username"
-    name  = "my-app"
-    push {
-      branch       = "^main$"
-      invert_regex = false
-    }
-  }
-
-  substitutions = {
-    _IMAGE_REGION = "us-docker.pkg.dev"
-  }
-
-  service_account = "projects/${var.project}/serviceAccounts/${var.compute_service_account}"
-
-  build {
-    timeout = "600s"
-    step {
-      name = "gcr.io/cloud-builders/docker"
-      args = [
-        "build",
-        "-t",
-        "$${_IMAGE_REGION}/$${PROJECT_ID}/github/my-app:$${COMMIT_SHA}",
-        "-t",
-        "$${_IMAGE_REGION}/$${PROJECT_ID}/github/my-app:main",
-        "."
-      ]
-    }
-
-    step {
-      name = "gcr.io/cloud-builders/docker"
-      args = [
-        "push",
-        "$${_IMAGE_REGION}/$${PROJECT_ID}/github/my-app:$${COMMIT_SHA}"
-      ]
-    }
-
-    step {
-      name = "gcr.io/cloud-builders/docker"
-      args = [
-        "push",
-        "$${_IMAGE_REGION}/$${PROJECT_ID}/github/my-app:main"
-      ]
-    }
-
-    step {
-      name = "gcr.io/cloud-builders/gcloud"
-      args = [
-        "run",
-        "deploy",
-        "my-app-prod",
-        "--image",
-        "$${_IMAGE_REGION}/$${PROJECT_ID}/github/my-app:$${COMMIT_SHA}",
-        "--region",
-        var.region
-      ]
-    }
-
-    options {
-      logging = "CLOUD_LOGGING_ONLY"
-    }
-  }
-}

package/template/nextjs/terraform/cloudrun.tf

@@ -1,68 +0,0 @@
-resource "google_cloud_run_v2_service" "my_app_prod" {
-  name     = "my-app-prod"
-  location = var.region
-  ingress  = "INGRESS_TRAFFIC_INTERNAL_LOAD_BALANCER"
-
-  scaling {
-    max_instance_count = 1
-  }
-
-  template {
-    execution_environment            = "EXECUTION_ENVIRONMENT_GEN2"
-    service_account                  = var.compute_service_account
-    max_instance_request_concurrency = 80
-
-    vpc_access {
-      network_interfaces {
-        network    = google_compute_network.vpc_network.name
-        subnetwork = google_compute_network.vpc_network.name
-      }
-      egress = "PRIVATE_RANGES_ONLY"
-    }
-
-    containers {
-      name  = "my-app-prod-1"
-      image = "us-docker.pkg.dev/${var.project}/github/my-app:main"
-
-      ports {
-        container_port = 3000
-      }
-
-      resources {
-        limits = {
-          cpu    = "1000m"
-          memory = "1Gi"
-        }
-        cpu_idle          = true # Set to false when using workflow
-        startup_cpu_boost = true
-      }
-
-      env {
-        name  = "APP_ENV"
-        value = "production"
-      }
-      env {
-        name = "DATABASE_URL"
-        value_source {
-          secret_key_ref {
-            secret  = "PROD_DATABASE_URL"
-            version = "latest"
-          }
-        }
-      }
-
-      # Add rest of env variables as needed
-    }
-  }
-
-  depends_on = [google_sql_database.prod_db]
-}
-
-resource "google_cloud_run_service_iam_member" "my_app_prod_unauthenticated" {
-  location = google_cloud_run_v2_service.my_app_prod.location
-  service  = google_cloud_run_v2_service.my_app_prod.name
-  role     = "roles/run.invoker"
-  member   = "allUsers"
-
-  depends_on = [google_cloud_run_v2_service.my_app_prod]
-}

package/template/nextjs/terraform/database.tf

@@ -1,60 +0,0 @@
-resource "google_sql_database_instance" "prod_postgres_instance" {
-  name             = "prod-db"
-  database_version = "POSTGRES_17"
-
-  settings {
-    location_preference {
-      zone = var.zone
-    }
-
-    edition                     = "ENTERPRISE"
-    tier                        = "db-f1-micro"
-    deletion_protection_enabled = true
-
-    disk_size                = 10
-    disk_autoresize          = true
-    retain_backups_on_delete = true
-
-    backup_configuration {
-      enabled                        = true
-      start_time                     = "00:00"
-      point_in_time_recovery_enabled = true
-      backup_retention_settings {
-        retained_backups = 30
-      }
-      transaction_log_retention_days = 7
-    }
-
-    ip_configuration {
-      private_network = google_compute_network.vpc_network.self_link
-      ipv4_enabled    = true
-      authorized_networks {
-        value = "103.53.75.58"
-      }
-    }
-
-    insights_config {
-      query_insights_enabled  = true
-      record_client_address   = true
-      record_application_tags = true
-      query_string_length     = 4096
-    }
-  }
-
-  lifecycle {
-    prevent_destroy = true
-  }
-
-  depends_on = [google_service_networking_connection.private_connection]
-}
-
-resource "google_sql_database" "prod_db" {
-  name     = "prod_database"
-  instance = google_sql_database_instance.prod_postgres_instance.name
-
-  lifecycle {
-    prevent_destroy = true
-  }
-
-  depends_on = [google_sql_database_instance.prod_postgres_instance]
-}