@rebasepro/cli 0.0.1-canary.dbf160a → 0.0.1-canary.e17585f

package/templates/template/.env.example

@@ -0,0 +1,96 @@
+# ╔══════════════════════════════════════════════════════════════════════════════╗
+# ║  Rebase Environment Configuration                                          ║
+# ║  Copy this file to .env and fill in the values                             ║
+# ╚══════════════════════════════════════════════════════════════════════════════╝
+
+# ── Database ──────────────────────────────────────────────────────────────────
+# Database connection string (required)
+# You can use PostgreSQL (postgresql://) or MongoDB (mongodb:// or mongodb+srv://).
+# The backend will automatically detect the database type.
+DATABASE_URL=postgresql://rebase:changeme@localhost:5432/rebase
+# DATABASE_URL=mongodb://localhost:27017/rebase
+
+# Separate admin connection string for migrations and schema operations (optional)
+# Falls back to DATABASE_URL if not set
+# ADMIN_CONNECTION_STRING=postgresql://postgres:your-password@localhost:5432/rebase
+
+# Connection pool tuning (optional — sensible defaults are built-in)
+# DB_POOL_MAX=20
+# DB_POOL_IDLE_TIMEOUT=30000
+# DB_POOL_CONNECT_TIMEOUT=10000
+
+# ── Server ────────────────────────────────────────────────────────────────────
+PORT=3001
+NODE_ENV=development
+
+# ── Logging ───────────────────────────────────────────────────────────────────
+# Levels: error, warn, info, debug
+LOG_LEVEL=info
+
+# ── JWT Authentication (required) ─────────────────────────────────────────────
+# Must be at least 32 characters. Generate with:
+#   node -e "console.log(require('crypto').randomBytes(48).toString('base64'))"
+JWT_SECRET=
+JWT_ACCESS_EXPIRES_IN=1h
+JWT_REFRESH_EXPIRES_IN=30d
+
+# ── Registration ──────────────────────────────────────────────────────────────
+ALLOW_REGISTRATION=true
+
+# ── Email (optional — required for password reset / verification) ─────────────
+# SMTP_HOST=smtp.example.com
+# SMTP_PORT=587
+# SMTP_SECURE=false
+# SMTP_USER=
+# SMTP_PASS=
+# SMTP_FROM=noreply@yourapp.com
+# APP_NAME=Your App Name
+
+# ── URLs ──────────────────────────────────────────────────────────────────────
+# Canonical frontend URL (used in password-reset / verification emails)
+FRONTEND_URL=http://localhost:5173
+
+# Allowed CORS origins in production (comma-separated)
+# CORS_ORIGINS=https://yourdomain.com
+
+# ── OAuth Providers (optional — uncomment to enable) ──────────────────────────
+# GOOGLE_CLIENT_ID=
+
+# ── Frontend (Vite) ──────────────────────────────────────────────────────────
+VITE_API_URL=http://localhost:3001
+# VITE_GOOGLE_CLIENT_ID=
+
+# ── Storage ───────────────────────────────────────────────────────────────────
+# Set STORAGE_TYPE to choose a storage backend. Default is "local" (filesystem).
+#
+# Supported values: local, s3
+#
+# STORAGE_TYPE=local
+
+# --- Local filesystem (default — great for dev and single-server deployments) --
+# STORAGE_PATH=./uploads
+
+# --- S3-compatible (AWS S3, Cloudflare R2, MinIO, Hetzner Object Storage, Backblaze B2) ---
+# STORAGE_TYPE=s3
+# S3_BUCKET=my-app-uploads
+# S3_REGION=us-east-1
+# S3_ACCESS_KEY_ID=
+# S3_SECRET_ACCESS_KEY=
+# S3_ENDPOINT=                  # Required for R2, MinIO, Hetzner (e.g. https://fsn1.your-objectstorage.com)
+# S3_FORCE_PATH_STYLE=          # Set to "true" for MinIO
+
+# --- GCS via S3 interop (Cloud Run, GKE, etc.) ---
+# Use GCS HMAC keys: https://cloud.google.com/storage/docs/interoperability
+# STORAGE_TYPE=s3
+# S3_BUCKET=my-gcs-bucket
+# S3_ENDPOINT=https://storage.googleapis.com
+# S3_ACCESS_KEY_ID=GOOG...      # HMAC access key
+# S3_SECRET_ACCESS_KEY=...      # HMAC secret
+#
+# For native GCS SDK or other providers (Azure Blob, etc.), implement the
+# StorageController interface and pass it directly in your backend config.
+
+# ── Admin Service Key (optional) ──────────────────────────────────────────────
+# When set, scripts authenticate with: Authorization: Bearer <key>
+# Generate with: node -e "console.log(require('crypto').randomBytes(48).toString('base64'))"
+# REBASE_SERVICE_KEY=

package/templates/template/README.md

@@ -7,8 +7,8 @@ A [Rebase](https://rebase.pro) project with a PostgreSQL backend.
 ### Option 1: Docker (recommended for production)
 
 ```bash
-cp .env.template .env
-# Edit .env — set POSTGRES_PASSWORD and JWT_SECRET (see comments for generators)
+cp .env.example .env
+# Edit .env — set JWT_SECRET and DATABASE_URL (see comments for generators)
 
 docker compose up -d
 ```
@@ -23,7 +23,7 @@ That's it. Your app is running:
 #### Prerequisites
 
 - [Node.js](https://nodejs.org) >= 18
-- [pnpm](https://pnpm.io)
+- [pnpm](https://pnpm.io) or [npm](https://www.npmjs.com) (v7+)
 - A PostgreSQL database
 
 #### Setup
@@ -31,13 +31,13 @@ That's it. Your app is running:
 1. Install dependencies:
 
 ```bash
-pnpm install
+pnpm install   # or: npm install
 ```
 
 2. Configure environment:
 
 ```bash
-cp .env.template .env
+cp .env.example .env
 # Edit .env — set DATABASE_URL, JWT_SECRET
 ```
 
@@ -51,7 +51,7 @@ rebase db push
 4. Start the dev server:
 
 ```bash
-pnpm dev
+pnpm dev   # or: npm run dev
 ```
 
 Backend (Hono + PostgreSQL) on port 3001, frontend (Vite + React) on port 5173.
@@ -69,7 +69,7 @@ Backend (Hono + PostgreSQL) on port 3001, frontend (Vite + React) on port 5173.
 ├── config/             # Shared collection definitions
 │   └── collections/    # Schema-as-Code TypeScript files
 ├── docker-compose.yml  # Production stack (Postgres + Backend + Frontend)
-├── .env.template       # Environment variable template
+├── .env.example        # Environment variable reference
 └── package.json        # Root workspace config
 ```
 
@@ -94,6 +94,16 @@ Call from the client SDK: `client.call("functions/hello", { name: "World" })`
 
 Collections are defined once in `config/collections/` and used by both the frontend and backend. This ensures your schema stays in sync across the stack.
 
+## Environment Configuration
+
+All configuration is managed through a single `.env` file in the project root. Both the backend and frontend read from this file:
+
+- **Backend**: loads via `dotenv` from `../../.env` (relative to `backend/src/`)
+- **Frontend**: Vite reads `VITE_*` variables via `envDir` pointing to the project root
+- **Scripts**: load via `dotenv` from the project root
+
+Copy `.env.example` to `.env` to get started. See the comments in `.env.example` for details on each variable.
+
 ## Production Deployment
 
 ```bash

package/templates/template/backend/drizzle.config.ts

@@ -1,8 +1,16 @@
-import "dotenv/config";
+import * as dotenv from "dotenv";
+import path from "path";
+import { fileURLToPath } from "url";
 import { defineConfig } from "drizzle-kit";
 import { tables } from "./src/schema.generated";
 import { getTableName, Table } from "drizzle-orm";
 
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+// Load .env from the project root (single file for the entire project)
+dotenv.config({ path: path.resolve(__dirname, "../.env") });
+
 if (!process.env.DATABASE_URL) {
     throw new Error("DATABASE_URL is not set. Make sure .env file exists in the project root and contains DATABASE_URL");
 }

package/templates/template/backend/package.json

@@ -10,7 +10,7 @@
         "start": "tsx src/index.ts"
     },
     "dependencies": {
-        "{{PROJECT_NAME}}-config": "workspace:*",
+        "{{PROJECT_NAME}}-config": "*",
         "@rebasepro/server-core": "workspace:*",
         "@rebasepro/server-postgresql": "workspace:*",
         "drizzle-orm": "^0.44.4",

package/templates/template/backend/src/index.ts

@@ -13,7 +13,7 @@ import {
     cleanupDevPortFile,
     logger
 } from "@rebasepro/server-core";
-import { createPostgresDatabaseConnection, createPostgresBootstrapper } from "@rebasepro/server-postgresql";
+import { createPostgresDatabaseConnection, createPostgresAdapter } from "@rebasepro/server-postgresql";
 import { enums, relations, tables } from "./schema.generated";
 import { env } from "./env";
 
@@ -54,16 +54,14 @@ async function startServer() {
         functionsDir: path.resolve(__dirname, "../functions"),
         server,
         app,
-        bootstrappers: [
-            createPostgresBootstrapper({
-                connection: db,
-                schema: { tables,
+        database: createPostgresAdapter({
+            connection: db,
+            schema: { tables,
 enums,
 relations },
-                adminConnectionString: env.ADMIN_CONNECTION_STRING || databaseUrl,
-                connectionString
-            })
-        ],
+            adminConnectionString: env.ADMIN_CONNECTION_STRING || databaseUrl,
+            connectionString
+        }),
         auth: {
             jwtSecret,
             accessExpiresIn: env.JWT_ACCESS_EXPIRES_IN,

package/templates/template/docker-compose.yml

@@ -1,15 +1,15 @@
 # ─── Rebase — Production Docker Compose ──────────────────────────────
 #
 # Quick start:
-#   cp .env.template .env    # Edit with your secrets
-#   docker compose up -d     # Start everything
+#   cp .env.example .env    # Edit with your secrets
+#   docker compose up -d    # Start everything
 #
 # This runs:
 #   1. PostgreSQL 18 with persistent data
 #   2. Backend (Node.js / Hono) with health checks
 #   3. Frontend (nginx) serving the Vite build
 #
-# For development, use `pnpm dev` instead.
+# For development, use `rebase dev` instead.
 # ─────────────────────────────────────────────────────────────────────
 
 services:
@@ -18,15 +18,15 @@ services:
     image: postgres:18-alpine
     restart: unless-stopped
     environment:
-      POSTGRES_USER: ${POSTGRES_USER:-rebase}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?Set POSTGRES_PASSWORD in .env}
-      POSTGRES_DB: ${POSTGRES_DB:-rebase}
+      POSTGRES_USER: rebase
+      POSTGRES_PASSWORD: ${DATABASE_PASSWORD:-changeme}
+      POSTGRES_DB: rebase
     ports:
-      - "${POSTGRES_PORT:-5432}:5432"
+      - "5432:5432"
     volumes:
       - postgres_data:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-rebase} -d ${POSTGRES_DB:-rebase}"]
+      test: ["CMD-SHELL", "pg_isready -U rebase -d rebase"]
       interval: 5s
       timeout: 5s
       retries: 10
@@ -53,38 +53,13 @@ services:
     restart: unless-stopped
     ports:
       - "${PORT:-3001}:3001"
+    env_file: .env
     environment:
-      DATABASE_URL: postgresql://${POSTGRES_USER:-rebase}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB:-rebase}
-      ADMIN_CONNECTION_STRING: postgresql://${POSTGRES_USER:-rebase}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB:-rebase}
-      JWT_SECRET: ${JWT_SECRET:?Set JWT_SECRET in .env}
-      JWT_ACCESS_EXPIRES_IN: ${JWT_ACCESS_EXPIRES_IN:-1h}
-      JWT_REFRESH_EXPIRES_IN: ${JWT_REFRESH_EXPIRES_IN:-30d}
+      # Override DATABASE_URL to point to the Docker network service
+      DATABASE_URL: postgresql://rebase:${DATABASE_PASSWORD:-changeme}@db:5432/rebase
+      ADMIN_CONNECTION_STRING: postgresql://rebase:${DATABASE_PASSWORD:-changeme}@db:5432/rebase
       NODE_ENV: production
       PORT: "3001"
-      ALLOW_REGISTRATION: ${ALLOW_REGISTRATION:-false}
-      FRONTEND_URL: ${FRONTEND_URL:-http://localhost}
-      CORS_ORIGINS: ${CORS_ORIGINS:-}
-      # Optional Google OAuth
-      GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID:-}
-      # Optional SMTP
-      SMTP_HOST: ${SMTP_HOST:-}
-      SMTP_PORT: ${SMTP_PORT:-}
-      SMTP_SECURE: ${SMTP_SECURE:-}
-      SMTP_USER: ${SMTP_USER:-}
-      SMTP_PASS: ${SMTP_PASS:-}
-      SMTP_FROM: ${SMTP_FROM:-}
-      APP_NAME: ${APP_NAME:-Rebase}
-      # Storage
-      STORAGE_TYPE: ${STORAGE_TYPE:-local}
-      STORAGE_PATH: ${STORAGE_PATH:-/app/backend/uploads}
-      S3_BUCKET: ${S3_BUCKET:-}
-      S3_REGION: ${S3_REGION:-}
-      S3_ACCESS_KEY_ID: ${S3_ACCESS_KEY_ID:-}
-      S3_SECRET_ACCESS_KEY: ${S3_SECRET_ACCESS_KEY:-}
-      S3_ENDPOINT: ${S3_ENDPOINT:-}
-      S3_FORCE_PATH_STYLE: ${S3_FORCE_PATH_STYLE:-}
-      # Service key for scripts & server-to-server admin access
-      REBASE_SERVICE_KEY: ${REBASE_SERVICE_KEY:-}
     depends_on:
       db:
         condition: service_healthy
@@ -98,7 +73,7 @@ services:
       dockerfile: frontend/Dockerfile
     restart: unless-stopped
     ports:
-      - "${FRONTEND_PORT:-80}:80"
+      - "80:80"
     depends_on:
       - backend
 

package/templates/template/frontend/package.json

@@ -13,7 +13,7 @@
         "@rebasepro/types": "workspace:*",
         "@rebasepro/ui": "workspace:*",
         "@fontsource/jetbrains-mono": "^5.2.5",
-        "{{PROJECT_NAME}}-config": "workspace:*",
+        "{{PROJECT_NAME}}-config": "*",
         "react": "^19.0.0",
         "react-dom": "^19.0.0",
         "react-router": "^7.0.0",

package/templates/template/frontend/vite.config.ts

@@ -7,6 +7,7 @@ import tailwindcss from "@tailwindcss/vite";
 import { rebaseCollectionsPlugin } from "@rebasepro/core/vitePlugin";
 
 export default defineConfig({
+    envDir: path.resolve(__dirname, ".."),
     esbuild: {
         logOverride: { "this-is-undefined-in-esm": "silent" }
     },

package/templates/template/package.json

@@ -4,18 +4,23 @@
     "description": "Rebase application with PostgreSQL backend",
     "private": true,
     "type": "module",
+    "workspaces": [
+        "frontend",
+        "backend",
+        "config"
+    ],
     "scripts": {
         "dev": "rebase dev",
-        "build": "pnpm -r run build",
-        "start": "pnpm --filter \"*-backend\" start",
+        "build": "rebase build",
+        "start": "rebase start",
         "db:generate": "rebase db generate --collections ../config/collections",
         "db:migrate": "rebase db migrate",
-        "db:pull": "rebase db pull",
+        "schema:introspect": "rebase schema introspect",
         "db:push": "rebase db push --collections ../config/collections",
         "db:studio": "rebase db studio",
         "schema:generate": "rebase schema generate --collections ../config/collections",
         "generate:sdk": "rebase generate-sdk",
-        "deploy": "pnpm run build && pnpm run start"
+        "deploy": "rebase build && rebase start"
     },
     "devDependencies": {
         "@rebasepro/cli": "workspace:*",

package/templates/template/.env.template

@@ -1,62 +0,0 @@
-# ─── Rebase Environment Configuration ────────────────────────────────
-# Copy this file to .env and fill in your values:
-#   cp .env.template .env
-
-# ── Database ─────────────────────────────────────────────────────────
-# Used by Docker Compose AND the backend
-POSTGRES_USER=rebase
-POSTGRES_PASSWORD=          # REQUIRED — generate with: openssl rand -base64 32
-POSTGRES_DB=rebase
-POSTGRES_PORT=5432
-
-# For local dev (without Docker):
-DATABASE_URL=postgresql://rebase:${POSTGRES_PASSWORD}@localhost:5432/rebase
-
-# ── Server ───────────────────────────────────────────────────────────
-PORT=3001
-NODE_ENV=development
-
-# ── Authentication ───────────────────────────────────────────────────
-JWT_SECRET=                 # REQUIRED — generate with: openssl rand -base64 64
-JWT_ACCESS_EXPIRES_IN=1h
-JWT_REFRESH_EXPIRES_IN=30d
-ALLOW_REGISTRATION=true
-
-# Admin service key for scripts & server-to-server calls (optional).
-# When set, scripts authenticate with: Authorization: Bearer <key>
-# REBASE_SERVICE_KEY=         # generate with: node -e "console.log(require('crypto').randomBytes(48).toString('base64'))"
-
-# ── Frontend ─────────────────────────────────────────────────────────
-FRONTEND_PORT=80
-VITE_API_URL=http://localhost:3001
-
-# Canonical frontend URL (used in password-reset / verification emails)
-FRONTEND_URL=http://localhost
-
-# Allowed CORS origins in production (comma-separated)
-# CORS_ORIGINS=https://yourdomain.com,https://app.yourdomain.com
-
-# ── Google OAuth (optional) ──────────────────────────────────────────
-# GOOGLE_CLIENT_ID=your-google-client-id
-# VITE_GOOGLE_CLIENT_ID=your-google-client-id
-
-# ── Email / SMTP (optional — enables password reset emails) ──────────
-# SMTP_HOST=smtp.example.com
-# SMTP_PORT=587
-# SMTP_SECURE=false
-# SMTP_USER=your-smtp-username
-# SMTP_PASS=your-smtp-password
-# SMTP_FROM=noreply@yourapp.com
-# APP_NAME=My Rebase App
-
-# ── Storage ──────────────────────────────────────────────────────────
-# STORAGE_TYPE=local          # Options: "local" or "s3"
-# STORAGE_PATH=./uploads      # Path for "local" storage
-
-# S3 Configuration (Required if STORAGE_TYPE=s3)
-# S3_BUCKET=my-rebase-bucket
-# S3_REGION=us-east-1
-# S3_ACCESS_KEY_ID=your-access-key
-# S3_SECRET_ACCESS_KEY=your-secret-key
-# S3_ENDPOINT=https://s3.us-east-1.amazonaws.com # Optional, used for MinIO or Cloudflare R2
-# S3_FORCE_PATH_STYLE=false # Set to true for MinIO