@rebasepro/cli 0.1.0 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rebasepro/cli",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "Developer tools for Rebase projects",
   "main": "./dist/index.cjs",
   "module": "./dist/index.es.js",
@@ -26,20 +26,21 @@
   "license": "MIT",
   "dependencies": {
     "arg": "^5.0.2",
-    "chalk": "^4.1.2",
-    "dotenv": "^16.0.0",
-    "execa": "^4.1.0",
+    "chalk": "^5.6.2",
+    "dotenv": "^16.6.1",
+    "execa": "^9.6.1",
     "inquirer": "12.11.1",
-    "ncp": "^2.0.0",
-    "pnpm": "^9.0.0",
-    "@rebasepro/sdk-generator": "0.1.0",
-    "@rebasepro/types": "0.1.0",
-    "@rebasepro/server-core": "0.1.0"
+    "jiti": "^2.7.0",
+    "@rebasepro/sdk-generator": "0.2.1",
+    "@rebasepro/server-core": "0.2.1",
+    "@rebasepro/types": "0.2.1"
   },
   "devDependencies": {
-    "@types/node": "^20.19.17",
+    "@types/node": "^20.19.41",
+    "@types/pg": "^8.20.0",
+    "pg": "^8.21.0",
     "typescript": "^5.9.3",
-    "vite": "^7.2.4",
+    "vite": "^7.3.3",
     "vitest": "4.1.5"
   },
   "files": [
@@ -61,6 +62,7 @@
   "gitHead": "d935eefa5aa8d1009a2398cfac2c1e4ee9aeb6b6",
   "scripts": {
     "test": "vitest run",
+    "test:e2e": "vitest run --config vitest.e2e.config.ts",
     "build": "vite build && tsc --emitDeclarationOnly -p tsconfig.json",
     "clean": "rm -rf dist && find ./src -name '*.js' -type f | xargs rm -f"
   }

package/templates/template/.cursorrules

@@ -0,0 +1,2 @@
+# Rebase AI Rules
+Please refer to and follow the instructions defined in [ai-instructions.md](./ai-instructions.md).

package/templates/template/.env.example

@@ -22,6 +22,8 @@ DATABASE_URL=postgresql://rebase:changeme@localhost:5432/rebase
 # ── Server ────────────────────────────────────────────────────────────────────
 PORT=3001
 NODE_ENV=development
+# Allow connecting to localhost / 127.0.0.1 in production mode (for local testing of prod builds)
+# ALLOW_LOCALHOST_IN_PRODUCTION=false
 
 # ── Logging ───────────────────────────────────────────────────────────────────
 # Levels: error, warn, info, debug
@@ -94,3 +96,8 @@ VITE_API_URL=http://localhost:3001
 # When set, scripts authenticate with: Authorization: Bearer <key>
 # Generate with: node -e "console.log(require('crypto').randomBytes(48).toString('base64'))"
 # REBASE_SERVICE_KEY=
+
+# Disable switching to database-level roles (e.g. 'admin') for Studio SQL execution (optional)
+# Falls back to false. Useful for databases with application-only roles or managed setups.
+# DISABLE_DB_ROLE_SWITCHING=true
+

package/templates/template/.github/copilot-instructions.md

@@ -0,0 +1,2 @@
+# Rebase AI Rules
+Please refer to and follow the instructions defined in [ai-instructions.md](../ai-instructions.md).

package/templates/template/.windsurfrules

@@ -0,0 +1,2 @@
+# Rebase AI Rules
+Please refer to and follow the instructions defined in [ai-instructions.md](./ai-instructions.md).

package/templates/template/README.md

@@ -44,8 +44,8 @@ cp .env.example .env
 3. Generate schema and push to database:
 
 ```bash
-rebase schema generate
-rebase db push
+pnpm run schema:generate   # or: npm run schema:generate
+pnpm run db:push            # or: npm run db:push
 ```
 
 4. Start the dev server:

package/templates/template/ai-instructions.md

@@ -0,0 +1,14 @@
+# Rebase AI Coding Rules
+
+For the most up-to-date, comprehensive guidelines, architecture details, SDK APIs, and troubleshooting guides, please refer to the official Rebase LLM documentation:
+👉 https://rebase.pro/llms.txt
+
+If you are running in an agentic environment (like Antigravity or a Gemini CLI extension), the assistant will automatically load the active Rebase agent skills.
+
+## Core Tenets (Quick Reference)
+
+1. **Schema-as-Code**: Always define or edit collections in `config/collections/` (e.g., `config/collections/posts.ts`). Never modify generated Drizzle schemas or PostgreSQL tables manually.
+2. **Two-Step Migrations**:
+   - Step 1: Run `rebase schema generate` to compile collections to the Drizzle schema.
+   - Step 2: Run `rebase db push` (development) or `rebase db generate && rebase db migrate` (production) to apply schema changes to the database.
+3. **Use the SDK**: Always use the Rebase SDK (`rebase.data.<slug>`) to fetch or modify data. Bypassing it with raw SQL or direct Drizzle/PG queries circumvents model validations, lifecycle hooks, and Row-Level Security (RLS).

package/templates/template/backend/Dockerfile

@@ -33,7 +33,7 @@ RUN pnpm --filter "*-config" run build
 RUN pnpm --filter "*-backend" run build
 
 # Prune dev dependencies for a smaller runtime
-RUN pnpm install --frozen-lockfile --prod
+RUN CI=true pnpm install --frozen-lockfile --prod
 
 # ── Stage 2: Production Runtime ──────────────────────────────────────
 FROM node:22-alpine AS runtime

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

@@ -3,7 +3,8 @@ 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";
+import { getTableName } from "drizzle-orm";
+import { getTableConfig, PgTable } from "drizzle-orm/pg-core";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -18,7 +19,13 @@ if (!process.env.DATABASE_URL) {
 // Extract table names from the generated schema.
 // This ensures drizzle-kit ONLY manages tables defined in the schema.
 // Any tables in the database that are NOT part of the Rebase schema are left untouched.
-const tableNames = Object.values(tables).map(table => getTableName(table as Table));
+const tableNames = Object.values(tables).map(table => getTableName(table as PgTable));
+
+// Dynamically extract all schemas defined in the generated tables to ensure Drizzle Kit manages them.
+const schemas = Array.from(new Set(
+    Object.values(tables)
+        .map(table => getTableConfig(table as PgTable).schema || "public")
+));
 
 export default defineConfig({
     schema: "./src/schema.generated.ts",
@@ -30,9 +37,8 @@ export default defineConfig({
     // Only manage tables defined in the generated schema.
     // Unmapped tables in the database are completely ignored.
     tablesFilter: tableNames,
-    // Restrict drizzle-kit to the public schema only — tables in other schemas
-    // (e.g. extensions, custom schemas) are never touched.
-    schemaFilter: ["public"],
+    // Restrict drizzle-kit to the schemas defined in our collections
+    schemaFilter: schemas.length > 0 ? schemas : ["public"],
     // Prevent drizzle-kit from managing roles not defined in the schema
     entities: {
         roles: false

package/templates/template/backend/package.json

@@ -6,19 +6,20 @@
     "type": "module",
     "scripts": {
         "dev": "tsx watch --watch=\"../config/**/*\" src/index.ts",
-        "build": "tsc --noEmit",
-        "start": "tsx src/index.ts"
+        "build": "rebase schema generate --collections ../config/collections && tsc",
+        "start": "node dist/backend/src/index.js"
     },
     "dependencies": {
         "{{PROJECT_NAME}}-config": "*",
         "@rebasepro/server-core": "workspace:*",
         "@rebasepro/server-postgresql": "workspace:*",
+        "@rebasepro/admin": "workspace:*",
         "drizzle-orm": "^0.44.4",
         "hono": "^4.12.10",
         "@hono/node-server": "^1.19.12",
         "pg": "^8.11.3",
         "ws": "^8.16.0",
-        "zod": "^3.22.4",
+        "react-compiler-runtime": "^1.0.0",
         "dotenv": "^16.0.0"
     },
     "devDependencies": {

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

@@ -1,52 +1,11 @@
-import { z } from "zod";
 import * as dotenv from "dotenv";
 import path from "path";
 import { fileURLToPath } from "url";
+import { loadEnv } from "@rebasepro/server-core";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 dotenv.config({ path: path.resolve(__dirname, "../../.env") });
 
-const envSchema = z.object({
-    NODE_ENV: z.enum(["development", "production", "test"]).default("development"),
-    PORT: z.string().default("3001").transform(Number),
-    DATABASE_URL: z.string().url("DATABASE_URL must be a valid URL"),
-    ADMIN_CONNECTION_STRING: z.string().url().optional(),
-    JWT_SECRET: z.string().min(32, "JWT_SECRET must be at least 32 characters long"),
-    JWT_ACCESS_EXPIRES_IN: z.string().default("1h"),
-    JWT_REFRESH_EXPIRES_IN: z.string().default("30d"),
-    GOOGLE_CLIENT_ID: z.string().optional(),
-    ALLOW_REGISTRATION: z.enum(["true", "false", ""]).default("false").transform(v => v === "true"),
-    CORS_ORIGINS: z.string().optional(),
-    FRONTEND_URL: z.string().optional(),
-    DB_POOL_MAX: z.string().default("20").transform(Number),
-    DB_POOL_IDLE_TIMEOUT: z.string().default("30000").transform(Number),
-    DB_POOL_CONNECT_TIMEOUT: z.string().default("10000").transform(Number),
-    FORCE_LOCAL_STORAGE: z.enum(["true", "false", ""]).optional().transform(v => v === "true"),
-    STORAGE_TYPE: z.enum(["local", "s3"]).default("local"),
-    STORAGE_PATH: z.string().optional(),
-    S3_BUCKET: z.string().optional(),
-    S3_REGION: z.string().optional(),
-    S3_ACCESS_KEY_ID: z.string().optional(),
-    S3_SECRET_ACCESS_KEY: z.string().optional(),
-    S3_ENDPOINT: z.string().url().optional(),
-    S3_FORCE_PATH_STYLE: z.enum(["true", "false", ""]).optional().transform(v => v === "true"),
-    /**
-     * Service key for admin-level script / server-to-server authentication.
-     * When set, scripts can send `Authorization: Bearer <key>` to get admin access.
-     * Generate with: node -e "console.log(require('crypto').randomBytes(48).toString('base64'))"
-     */
-    REBASE_SERVICE_KEY: z.string().min(32, "REBASE_SERVICE_KEY must be at least 32 characters").optional()
-}).superRefine((data, ctx) => {
-    if (data.NODE_ENV === "production" && !data.CORS_ORIGINS && !data.FRONTEND_URL) {
-        ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            message: "CORS_ORIGINS or FRONTEND_URL must be set in production to secure the API.",
-            path: ["CORS_ORIGINS"]
-        });
-    }
-});
-
-// Parse and export
-export const env = envSchema.parse(process.env);
+export const env = loadEnv();

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

@@ -13,15 +13,15 @@ import {
     cleanupDevPortFile,
     logger
 } from "@rebasepro/server-core";
-import { createPostgresDatabaseConnection, createPostgresBootstrapper } from "@rebasepro/server-postgresql";
-import { enums, relations, tables } from "./schema.generated";
-import { env } from "./env";
+import { createPostgresDatabaseConnection, createPostgresAdapter } from "@rebasepro/server-postgresql";
+import { enums, relations, tables } from "./schema.generated.js";
+import { env } from "./env.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 // ─── App ─────────────────────────────────────────────────────────────
-const app = new Hono<HonoEnv>();
+const app: Hono<HonoEnv> = new Hono<HonoEnv>();
 
 const isProduction = env.NODE_ENV === "production";
 const allowedOrigins = isProduction
@@ -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/config/collections/index.ts

@@ -1,5 +1,7 @@
-import postsCollection from "./posts";
-import authorsCollection from "./authors";
-import tagsCollection from "./tags";
+import postsCollection from "./posts.js";
+import authorsCollection from "./authors.js";
+import tagsCollection from "./tags.js";
+import usersCollection from "./users.js";
+import rolesCollection from "./roles.js";
 
-export const collections = [postsCollection, authorsCollection, tagsCollection];
+export const collections = [postsCollection, authorsCollection, tagsCollection, usersCollection, rolesCollection];

package/templates/template/config/collections/posts.ts

@@ -1,6 +1,6 @@
 import { EntityCollection } from "@rebasepro/types";
-import authorsCollection from "./authors";
-import tagsCollection from "./tags";
+import authorsCollection from "./authors.js";
+import tagsCollection from "./tags.js";
 
 const postsCollection: EntityCollection = {
     name: "Posts",
@@ -71,21 +71,7 @@ const postsCollection: EntityCollection = {
                 target: () => tagsCollection
             }
         }
-    },
-    relations: [
-        {
-            relationName: "author",
-            target: () => authorsCollection,
-            cardinality: "one",
-            direction: "owning"
-        },
-        {
-            relationName: "tags",
-            target: () => tagsCollection,
-            cardinality: "many",
-            direction: "owning"
-        }
-    ]
+    }
 };
 
 export default postsCollection;

package/templates/template/config/collections/roles.ts

@@ -0,0 +1,72 @@
+import { PostgresCollection, EntityCollection } from "@rebasepro/types";
+
+const rolesCollection: PostgresCollection = {
+    name: "Roles",
+    singularName: "Role",
+    slug: "roles",
+    table: "roles",
+    schema: "rebase",
+    icon: "Shield",
+    group: "Settings",
+    properties: {
+        id: {
+            name: "ID",
+            type: "string",
+            isId: "manual",
+            validation: {
+                required: true
+            }
+        },
+        name: {
+            name: "Name",
+            type: "string",
+            validation: {
+                required: true
+            }
+        },
+        isAdmin: {
+            name: "Is Admin",
+            type: "boolean",
+            columnName: "is_admin",
+            defaultValue: false
+        },
+        defaultPermissions: {
+            name: "Default Permissions",
+            type: "map",
+            columnName: "default_permissions",
+            properties: {
+                read: { name: "Read", type: "boolean" },
+                create: { name: "Create", type: "boolean" },
+                edit: { name: "Edit", type: "boolean" },
+                delete: { name: "Delete", type: "boolean" }
+            }
+        },
+        collectionPermissions: {
+            name: "Collection Permissions",
+            type: "map",
+            columnName: "collection_permissions"
+        },
+        config: {
+            name: "Config",
+            type: "map",
+            columnName: "config",
+            properties: {
+                createCollections: { name: "Create Collections", type: "boolean" },
+                editCollections: { name: "Edit Collections", type: "string" },
+                deleteCollections: { name: "Delete Collections", type: "string" }
+            }
+        }
+    }
+};
+
+rolesCollection.securityRules = [
+    {
+        name: "roles_public_access",
+        mode: "permissive",
+        operation: "all",
+        pgRoles: ["public"],
+        using: "true"
+    }
+];
+
+export default rolesCollection;

package/templates/template/config/collections/users.ts

@@ -0,0 +1,141 @@
+import { EntityCollection } from "@rebasepro/types";
+import { resetPasswordAction, deleteEntityAction, RolesFilterSelect, UserRolesSelectField } from "@rebasepro/admin";
+import rolesCollection from "./roles.js";
+
+const usersCollection: EntityCollection = {
+    name: "Users",
+    singularName: "User",
+    slug: "users",
+    table: "users",
+    schema: "rebase",
+    icon: "Users",
+    group: "Settings",
+    openEntityMode: "dialog",
+    disableDefaultActions: ["copy"],
+    Actions: [RolesFilterSelect],
+    entityActions: [
+        resetPasswordAction,
+        {
+            ...deleteEntityAction,
+            collapsed: false
+        }
+    ],
+    sort: ["createdAt", "desc"],
+    properties: {
+        id: {
+            name: "ID",
+            type: "string",
+            isId: "uuid",
+            ui: {
+                readOnly: true
+            }
+        },
+        email: {
+            name: "Email",
+            type: "string",
+            validation: {
+                required: true,
+                unique: true
+            }
+        },
+        displayName: {
+            name: "Name",
+            type: "string",
+            validation: {
+                required: true
+            }
+        },
+        photoURL: {
+            name: "Photo URL",
+            type: "string",
+            url: "image"
+        },
+        roles: {
+            name: "Roles",
+            type: "relation",
+            target: () => rolesCollection,
+            cardinality: "many",
+            direction: "owning",
+            through: {
+                table: "user_roles",
+                sourceColumn: "user_id",
+                targetColumn: "role_id"
+            },
+            ui: {
+                Field: UserRolesSelectField
+            }
+        },
+        passwordHash: {
+            name: "Password Hash",
+            type: "string",
+            columnName: "password_hash",
+            ui: {
+                hideFromCollection: true,
+                disabled: { hidden: true }
+            }
+        },
+        emailVerified: {
+            name: "Email Verified",
+            type: "boolean",
+            columnName: "email_verified",
+            defaultValue: false,
+            ui: {
+                hideFromCollection: true,
+                disabled: { hidden: true }
+            }
+        },
+        emailVerificationToken: {
+            name: "Email Verification Token",
+            type: "string",
+            columnName: "email_verification_token",
+            ui: {
+                hideFromCollection: true,
+                disabled: { hidden: true }
+            }
+        },
+        emailVerificationSentAt: {
+            name: "Email Verification Sent At",
+            type: "date",
+            columnName: "email_verification_sent_at",
+            ui: {
+                hideFromCollection: true,
+                disabled: { hidden: true }
+            }
+        },
+        metadata: {
+            name: "Metadata",
+            type: "map",
+            defaultValue: {},
+            ui: {
+                hideFromCollection: true,
+                disabled: { hidden: true }
+            }
+        },
+        createdAt: {
+            name: "Created At",
+            type: "date",
+            ui: {
+                readOnly: true
+            }
+        },
+        updatedAt: {
+            name: "Updated At",
+            type: "date",
+            columnName: "updated_at",
+            autoValue: "on_update",
+            ui: {
+                hideFromCollection: true,
+                disabled: { hidden: true }
+            }
+        }
+    },
+    propertiesOrder: [
+        "id",
+        "email",
+        "displayName",
+        "roles",
+        "createdAt"
+    ]
+};
+
+export default usersCollection;

package/templates/template/config/index.ts

@@ -3,4 +3,4 @@
  * Collections defined here are used by both the frontend and backend
  */
 
-export { collections } from "./collections";
+export { collections } from "./collections/index.js";

package/templates/template/config/package.json

@@ -12,7 +12,8 @@
         "clean": "rm -rf dist"
     },
     "dependencies": {
-        "@rebasepro/types": "workspace:*"
+        "@rebasepro/types": "workspace:*",
+        "@rebasepro/admin": "workspace:*"
     },
     "devDependencies": {
         "typescript": "^5.9.2"

package/templates/template/docker-compose.yml

@@ -15,7 +15,7 @@
 services:
   # ── PostgreSQL ───────────────────────────────────────────────────────
   db:
-    image: postgres:18-alpine
+    image: postgres:16-alpine
     restart: unless-stopped
     environment:
       POSTGRES_USER: rebase

package/templates/template/frontend/package.json

@@ -18,7 +18,8 @@
         "react-dom": "^19.0.0",
         "react-router": "^7.0.0",
         "react-router-dom": "^7.0.0",
-        "typeface-rubik": "^1.1.13"
+        "react-compiler-runtime": "^1.0.0",
+        "@fontsource/rubik": "^5.2.5"
     },
     "scripts": {
         "dev": "vite --mode development",
@@ -40,6 +41,7 @@
     "devDependencies": {
         "@tailwindcss/typography": "^0.5.16",
         "@tailwindcss/vite": "^4.1.12",
+        "@types/node": "^20.19.41",
         "@types/react": "^19.0.8",
         "@types/react-dom": "^19.0.3",
         "@vitejs/plugin-react": "^4.3.4",

package/templates/template/frontend/src/App.tsx

@@ -1,10 +1,10 @@
 import React from "react";
 
 import "@fontsource/jetbrains-mono";
-import "typeface-rubik";
+import "@fontsource/rubik";
 
-import { useRebaseAuthController, useBackendUserManagement, RebaseAuth } from "@rebasepro/auth";
-import { Rebase } from "@rebasepro/core";
+import { useRebaseAuthController, useBackendUserManagement } from "@rebasepro/auth";
+import { Rebase, RebaseAuth } from "@rebasepro/core";
 import { RebaseCMS, RebaseShell } from "@rebasepro/admin";
 import { RebaseStudio } from "@rebasepro/studio";
 import { createRebaseClient } from "@rebasepro/client";

package/templates/template/frontend/src/virtual.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="vite/client" />
+/// <reference types="vite-plugin-svgr/client" />
+
+declare module "virtual:rebase-collections" {
+    export const collections: any[];
+}

package/templates/template/frontend/tsconfig.json

@@ -14,7 +14,8 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "jsx": "react-jsx"
+    "jsx": "react-jsx",
+    "types": ["vite/client", "node"]
   },
-  "include": ["./src", "./vite.config.ts"]
+  "include": ["src/**/*", "vite.config.ts"]
 }

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

@@ -20,7 +20,7 @@ export default defineConfig({
             output: {
                 manualChunks(id) {
                     // Heavy vendor libraries — split into individually cached chunks
-                    if (id.includes("xlsx")) return "vendor-xlsx";
+                    if (id.includes("exceljs")) return "vendor-exceljs";
                     if (id.includes("prosemirror")) return "vendor-prosemirror";
                     if (id.includes("monaco-editor") || id.includes("@monaco-editor")) return "vendor-monaco";
                     if (id.includes("@xyflow") || id.includes("dagre")) return "vendor-xyflow";

package/templates/template/pnpm-workspace.yaml

@@ -2,3 +2,9 @@ packages:
   - "frontend"
   - "backend"
   - "config"
+linkWorkspacePackages: true
+blockExoticSubdeps: false
+minimumReleaseAge: 0
+allowBuilds:
+  esbuild: true
+