create-ej-app 12.0.0 → 14.0.0

package/cli.js

@@ -78,10 +78,6 @@ commander_1.program.action(() => __awaiter(void 0, void 0, void 0, function* ()
                 {
                     name: 'base',
                     message: 'Base setup with Next 16, Better Auth, shadcn and Drizzle'
-                },
-                {
-                    name: 'old',
-                    message: 'old setup with ts, shadcn, auth, drizzle'
                 }
             ]
         },
@@ -121,6 +117,11 @@ build
 next-env.d.ts
 .DS_Store
 .env
+`);
+    fs_1.default.writeFileSync(path_1.default.join(projectDir, 'terraform', '.gitignore'), `.terraform
+*.tfstate
+*.tfstate.*
+.terraform.lock.hcl
 `);
     fs_1.default.writeFileSync(path_1.default.join(projectDir, 'README.md'), `# ${projectName}
 

package/cli.ts

@@ -75,10 +75,6 @@ program.action(async () => {
         {
           name: 'base',
           message: 'Base setup with Next 16, Better Auth, shadcn and Drizzle'
-        },
-        {
-          name: 'old',
-          message: 'old setup with ts, shadcn, auth, drizzle'
         }
       ]
     },
@@ -132,6 +128,15 @@ next-env.d.ts
 `
   )
 
+  fs.writeFileSync(
+    path.join(projectDir, 'terraform', '.gitignore'),
+    `.terraform
+*.tfstate
+*.tfstate.*
+.terraform.lock.hcl
+`
+  )
+
   fs.writeFileSync(
     path.join(projectDir, 'README.md'),
     `# ${projectName}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-ej-app",
-  "version": "12.0.0",
+  "version": "14.0.0",
   "description": "Bootstrap a next.js app with my preferred setup",
   "main": "cli.js",
   "scripts": {

package/template/base/package.json

@@ -10,6 +10,7 @@
     "analyze": "ANALYZE=true bun --bun next build --webpack",
     "start": "bun --bun next start",
     "lint": "eslint",
+    "type-check": "tsc --noEmit --incremental false",
     "format": "prettier --write \"./src/**/*.{js,cjs,mjs,jsx,ts,tsx}\"",
     "db:push": "drizzle-kit push",
     "db:studio": "drizzle-kit studio",
@@ -18,13 +19,13 @@
   "dependencies": {
     "@hookform/resolvers": "5.2.2",
     "@next/third-parties": "16.1.1",
-    "@paralleldrive/cuid2": "3.0.4",
+    "@paralleldrive/cuid2": "3.0.6",
     "@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.10",
-    "@tanstack/react-query": "5.90.12",
-    "better-auth": "1.4.8",
+    "@tanstack/react-query": "5.90.16",
+    "better-auth": "1.4.10",
     "class-variance-authority": "0.7.1",
     "clsx": "2.1.1",
     "drizzle-orm": "0.45.1",
@@ -35,15 +36,15 @@
     "next-themes": "0.4.6",
     "nextjs-toploader": "3.9.17",
     "nodemailer": "7.0.12",
-    "postgres": "3.4.7",
+    "postgres": "3.4.8",
     "react": "19.2.3",
     "react-dom": "19.2.3",
-    "react-hook-form": "7.69.0",
+    "react-hook-form": "7.70.0",
     "sonner": "2.0.7",
     "tailwind-merge": "3.4.0",
     "tw-animate-css": "1.4.0",
-    "workflow": "4.0.1-beta.35",
-    "zod": "4.2.1"
+    "workflow": "4.0.1-beta.42",
+    "zod": "4.3.5"
   },
   "devDependencies": {
     "@next/bundle-analyzer": "16.1.1",
@@ -61,12 +62,5 @@
     "prettier-plugin-tailwindcss": "0.7.2",
     "tailwindcss": "4.1.18",
     "typescript": "5.9.3"
-  },
-  "trustedDependencies": [
-    "@swc/core",
-    "@tailwindcss/oxide",
-    "esbuild",
-    "sharp",
-    "unrs-resolver"
-  ]
+  }
 }

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

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

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

@@ -0,0 +1,13 @@
+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/base/terraform/cleanup.sh

@@ -0,0 +1,9 @@
+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/base/terraform/cloudbuild.tf

@@ -0,0 +1,70 @@
+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/base/terraform/cloudrun.tf

@@ -0,0 +1,68 @@
+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
+        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/base/terraform/database.tf

@@ -0,0 +1,60 @@
+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]
+}

package/template/base/terraform/forwarding-rule.tf

@@ -0,0 +1,43 @@
+resource "google_compute_global_forwarding_rule" "main_lb_https_ipv4_frontend" {
+  name                  = "main-lb-https-ipv4-frontend"
+  ip_protocol           = "TCP"
+  ip_address            = google_compute_global_address.main_lb_ipv4.address
+  load_balancing_scheme = "EXTERNAL_MANAGED"
+  port_range            = "443"
+  target                = google_compute_target_https_proxy.main_lb_target_proxy.id
+
+  depends_on = [google_compute_global_address.main_lb_ipv4, google_compute_target_https_proxy.main_lb_target_proxy]
+}
+
+resource "google_compute_global_forwarding_rule" "main_lb_https_ipv6_frontend" {
+  name                  = "main-lb-https-ipv6-frontend"
+  ip_protocol           = "TCP"
+  ip_address            = google_compute_global_address.main_lb_ipv6.address
+  load_balancing_scheme = "EXTERNAL_MANAGED"
+  port_range            = "443"
+  target                = google_compute_target_https_proxy.main_lb_target_proxy.id
+
+  depends_on = [google_compute_global_address.main_lb_ipv6, google_compute_target_https_proxy.main_lb_target_proxy]
+}
+
+resource "google_compute_global_forwarding_rule" "main_lb_ipv4_http_forwarding_rule" {
+  name                  = "main-lb-ipv4-http-forwarding-rule"
+  ip_protocol           = "TCP"
+  ip_address            = google_compute_global_address.main_lb_ipv4.address
+  load_balancing_scheme = "EXTERNAL_MANAGED"
+  port_range            = "80"
+  target                = google_compute_target_http_proxy.main_lb_http_redirect_proxy.id
+
+  depends_on = [google_compute_global_forwarding_rule.main_lb_https_ipv4_frontend]
+}
+
+resource "google_compute_global_forwarding_rule" "main_lb_ipv6_http_forwarding_rule" {
+  name                  = "main-lb-ipv6-http-forwarding-rule"
+  ip_protocol           = "TCP"
+  ip_address            = google_compute_global_address.main_lb_ipv6.address
+  load_balancing_scheme = "EXTERNAL_MANAGED"
+  port_range            = "80"
+  target                = google_compute_target_http_proxy.main_lb_http_redirect_proxy.id
+
+  depends_on = [google_compute_global_forwarding_rule.main_lb_https_ipv6_frontend]
+}

package/template/base/terraform/ip-address.tf

@@ -0,0 +1,11 @@
+resource "google_compute_global_address" "main_lb_ipv4" {
+  name         = "main-lb-ipv4"
+  ip_version   = "IPV4"
+  address_type = "EXTERNAL"
+}
+
+resource "google_compute_global_address" "main_lb_ipv6" {
+  name         = "main-lb-ipv6"
+  ip_version   = "IPV6"
+  address_type = "EXTERNAL"
+}

package/template/base/terraform/network-endpoint-group.tf

@@ -0,0 +1,11 @@
+resource "google_compute_region_network_endpoint_group" "my_app_prod_neg" {
+  name                  = "my-app-prod-neg"
+  network_endpoint_type = "SERVERLESS"
+  region                = var.region
+
+  cloud_run {
+    service = google_cloud_run_v2_service.my_app_prod.name
+  }
+
+  depends_on = [google_cloud_run_v2_service.my_app_prod]
+}

package/template/base/terraform/network.tf

@@ -0,0 +1,21 @@
+resource "google_compute_network" "vpc_network" {
+  name = "terraform-network"
+}
+
+resource "google_compute_global_address" "private_ip_range" {
+  name          = "private-ip-range"
+  prefix_length = 16
+  address_type  = "INTERNAL"
+  purpose       = "VPC_PEERING"
+  network       = google_compute_network.vpc_network.self_link
+
+  depends_on = [google_compute_network.vpc_network]
+}
+
+resource "google_service_networking_connection" "private_connection" {
+  network                 = google_compute_network.vpc_network.id
+  service                 = "servicenetworking.googleapis.com"
+  reserved_peering_ranges = [google_compute_global_address.private_ip_range.name]
+
+  depends_on = [google_compute_global_address.private_ip_range]
+}

package/template/base/terraform/pre.sh

@@ -0,0 +1,3 @@
+gcloud config set project project-id
+
+gcloud auth application-default set-quota-project project-id

package/template/base/terraform/providers.tf

@@ -0,0 +1,18 @@
+terraform {
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "7.8.0"
+    }
+  }
+
+  backend "gcs" {
+    bucket = "project-id-tf-state"
+  }
+}
+
+provider "google" {
+  project = var.project
+  region  = var.region
+  zone    = var.zone
+}

package/template/base/terraform/secret.txt

@@ -0,0 +1,11 @@
+BETTER_AUTH_URL
+BETTER_AUTH_SECRET
+BETTER_AUTH_GITHUB_ID
+BETTER_AUTH_GITHUB_SECRET
+BETTER_AUTH_GOOGLE_ID
+BETTER_AUTH_GOOGLE_SECRET
+EMAIL_SERVER_USER
+EMAIL_SERVER_PASSWORD
+EMAIL_SERVER_HOST
+EMAIL_SERVER_PORT
+EMAIL_FROM

package/template/base/terraform/setup.sh

@@ -0,0 +1,25 @@
+echo "Starting pre.sh script..."
+
+gcloud config set project project-id
+
+gcloud auth application-default set-quota-project project-id
+
+echo "Setting up Google Cloud SDK and enabling required APIs..."
+
+gcloud services enable logging.googleapis.com monitoring.googleapis.com compute.googleapis.com run.googleapis.com artifactregistry.googleapis.com vpcaccess.googleapis.com cloudbuild.googleapis.com servicenetworking.googleapis.com networkconnectivity.googleapis.com certificatemanager.googleapis.com sql-component.googleapis.com storage-component.googleapis.com storage.googleapis.com cloudapis.googleapis.com secretmanager.googleapis.com
+
+echo "Enabling APIs completed."
+
+echo "Please manually create a db secret in Secret Manager with names in file secret.txt"
+
+echo "Creating storage bucket for Terraform state..."
+
+gcloud storage buckets create gs://project-id-tf-state --location=us
+
+gcloud storage buckets update gs://project-id-tf-state --versioning
+
+echo "Creating storage bucket for Terraform state completed."
+
+echo "Please manually connect github repositories on cloud build repositories from here https://console.cloud.google.com/cloud-build/repositories/1st-gen"
+
+echo "And then copy the service account (eg:- 123456-compute@developer.gserviceaccount.com) to vars terraform.tfvars file from this link https://console.cloud.google.com/iam-admin/iam"

package/template/base/terraform/ssl-certs.tf

@@ -0,0 +1,32 @@
+resource "google_certificate_manager_certificate" "my_app_cert" {
+  name = "my-app-cert"
+
+  managed {
+    domains = [
+      "myapp.com"
+    ]
+    dns_authorizations = [
+      google_certificate_manager_dns_authorization.my_app_prod_auth.id,
+    ]
+  }
+
+  depends_on = [
+    google_certificate_manager_dns_authorization.my_app_prod_auth,
+  ]
+}
+
+resource "google_certificate_manager_dns_authorization" "my_app_prod_auth" {
+  name   = "my-app-prod-auth"
+  domain = "myapp.com"
+}
+
+resource "google_certificate_manager_certificate_map" "default" {
+  name = "default-cert-map"
+}
+
+resource "google_certificate_manager_certificate_map_entry" "my_app_prod_entry" {
+  name         = "my-app-prod-entry"
+  map          = google_certificate_manager_certificate_map.default.name
+  hostname     = "myapp.com"
+  certificates = [google_certificate_manager_certificate.my_app_cert.id]
+}

package/template/base/terraform/target-https-proxy copy.tf

@@ -0,0 +1,14 @@
+resource "google_compute_target_https_proxy" "main_lb_target_proxy" {
+  name            = "main-lb-target-proxy"
+  url_map         = google_compute_url_map.main_lb.id
+  certificate_map = "//certificatemanager.googleapis.com/projects/${var.project}/locations/global/certificateMaps/${google_certificate_manager_certificate_map.default.name}"
+
+  depends_on = [google_compute_url_map.main_lb]
+}
+
+resource "google_compute_target_http_proxy" "main_lb_http_redirect_proxy" {
+  name    = "main-lb-http-redirect-proxy"
+  url_map = google_compute_url_map.main_lb_http_redirect.id
+
+  depends_on = [google_compute_url_map.main_lb_http_redirect]
+}

package/template/base/terraform/target-https-proxy.tf

@@ -0,0 +1,14 @@
+resource "google_compute_target_https_proxy" "main_lb_target_proxy" {
+  name            = "main-lb-target-proxy"
+  url_map         = google_compute_url_map.main_lb.id
+  certificate_map = "//certificatemanager.googleapis.com/projects/${var.project}/locations/global/certificateMaps/${google_certificate_manager_certificate_map.default.name}"
+
+  depends_on = [google_compute_url_map.main_lb]
+}
+
+resource "google_compute_target_http_proxy" "main_lb_http_redirect_proxy" {
+  name    = "main-lb-http-redirect-proxy"
+  url_map = google_compute_url_map.main_lb_http_redirect.id
+
+  depends_on = [google_compute_url_map.main_lb_http_redirect]
+}

package/template/base/terraform/terraform.tfvars

@@ -0,0 +1,4 @@
+project                 = "project-id"
+region                  = "us-central1"
+zone                    = "us-central1-a"
+compute_service_account = "123456-compute@developer.gserviceaccount.com"

package/template/base/terraform/url-map.tf

@@ -0,0 +1,23 @@
+resource "google_compute_url_map" "main_lb" {
+  name            = "main-lb"
+  default_service = google_compute_backend_service.my_app_prod_service.id
+
+  host_rule {
+    path_matcher = "path-matcher-my-app-prod"
+    hosts        = ["myapp.com"]
+  }
+  path_matcher {
+    name            = "path-matcher-my-app-prod"
+    default_service = google_compute_backend_service.my_app_prod_service.id
+  }
+}
+
+resource "google_compute_url_map" "main_lb_http_redirect" {
+  name = "main-lb-http-to-https-redirect"
+
+  default_url_redirect {
+    https_redirect         = true
+    strip_query            = false
+    redirect_response_code = "MOVED_PERMANENTLY_DEFAULT"
+  }
+}

package/template/base/terraform/variables.tf

@@ -0,0 +1,21 @@
+variable "project" {
+  description = "Google Cloud Project ID"
+  type        = string
+}
+
+variable "region" {
+  description = "Google Cloud Region"
+  type        = string
+  default     = "us-central1"
+}
+
+variable "zone" {
+  description = "Google Cloud Zone"
+  type        = string
+  default     = "us-central1-a"
+}
+
+variable "compute_service_account" {
+  description = "Default compiute Service account"
+  type        = string
+}

package/template/old/.env.example

@@ -1,17 +0,0 @@
-NODE_ENV="development"
-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"
-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"

package/template/old/.eslintrc.cjs

@@ -1,26 +0,0 @@
-/** @type {import("eslint").Linter.Config} */
-const eslintConfig = {
-  parser: '@typescript-eslint/parser',
-  parserOptions: {
-    project: true
-  },
-  plugins: ['@typescript-eslint', 'drizzle'],
-  extends: ['next/core-web-vitals'],
-  rules: {
-    '@typescript-eslint/array-type': 'off',
-    'drizzle/enforce-delete-with-where': [
-      'error',
-      {
-        drizzleObjectName: ['db', 'ctx.db']
-      }
-    ],
-    'drizzle/enforce-update-with-where': [
-      'error',
-      {
-        drizzleObjectName: ['db', 'ctx.db']
-      }
-    ]
-  }
-}
-
-module.exports = eslintConfig