@rebasepro/cli 0.0.1-canary.e259309 → 0.0.1-canary.eb08332

package/templates/template/config/collections/presets/ecommerce/orders.ts

@@ -0,0 +1,66 @@
+import { CollectionConfig } from "@rebasepro/types";
+
+const ordersCollection: CollectionConfig = {
+    name: "Orders",
+    singularName: "Order",
+    slug: "orders",
+    table: "orders",
+    icon: "Receipt",
+    properties: {
+        id: {
+            name: "ID",
+            type: "number",
+            isId: "increment"
+        },
+        customerEmail: {
+            name: "Customer Email",
+            type: "string",
+            columnName: "customer_email",
+            validation: { required: true }
+        },
+        status: {
+            name: "Status",
+            type: "string",
+            enum: [
+                { id: "pending",
+label: "Pending",
+color: "gray" },
+                { id: "processing",
+label: "Processing",
+color: "blue" },
+                { id: "shipped",
+label: "Shipped",
+color: "orange" },
+                { id: "delivered",
+label: "Delivered",
+color: "green" },
+                { id: "cancelled",
+label: "Cancelled",
+color: "red" }
+            ]
+        },
+        total: {
+            name: "Total",
+            type: "number",
+            validation: { required: true }
+        },
+        notes: {
+            name: "Notes",
+            type: "string",
+            ui: {
+                multiline: true
+            }
+        },
+        createdAt: {
+            name: "Created At",
+            type: "date",
+            columnName: "created_at",
+            autoValue: "on_create",
+            ui: {
+                readOnly: true
+            }
+        }
+    }
+};
+
+export default ordersCollection;

package/templates/template/config/collections/presets/ecommerce/products.ts

@@ -0,0 +1,64 @@
+import { CollectionConfig } from "@rebasepro/types";
+import categoriesCollection from "./categories.js";
+
+const productsCollection: CollectionConfig = {
+    name: "Products",
+    singularName: "Product",
+    slug: "products",
+    table: "products",
+    icon: "ShoppingCart",
+    properties: {
+        id: {
+            name: "ID",
+            type: "number",
+            isId: "increment"
+        },
+        name: {
+            name: "Name",
+            type: "string",
+            validation: { required: true }
+        },
+        description: {
+            name: "Description",
+            type: "string",
+            ui: {
+                markdown: true
+            }
+        },
+        price: {
+            name: "Price",
+            type: "number",
+            validation: { required: true }
+        },
+        image: {
+            name: "Image",
+            type: "string",
+            storage: { storagePath: "product_images/" }
+        },
+        status: {
+            name: "Status",
+            type: "string",
+            enum: [
+                { id: "draft",
+label: "Draft",
+color: "gray" },
+                { id: "active",
+label: "Active",
+color: "green" },
+                { id: "archived",
+label: "Archived",
+color: "orange" }
+            ]
+        },
+        category: {
+            name: "Category",
+            type: "relation",
+            relationName: "category",
+            target: () => categoriesCollection,
+            cardinality: "one",
+            direction: "owning"
+        }
+    }
+};
+
+export default productsCollection;

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

@@ -1,6 +1,6 @@
-import { EntityCollection } from "@rebasepro/types";
+import { CollectionConfig } from "@rebasepro/types";
 
-const tagsCollection: EntityCollection = {
+const tagsCollection: CollectionConfig = {
     name: "Tags",
     singularName: "Tag",
     slug: "tags",
@@ -10,9 +10,7 @@ const tagsCollection: EntityCollection = {
         id: {
             name: "ID",
             type: "number",
-            validation: {
-                required: true
-            }
+            isId: "increment"
         },
         name: {
             name: "Tag Name",

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

@@ -0,0 +1,142 @@
+import type { CollectionConfig } from "@rebasepro/types";
+
+const usersCollection: CollectionConfig = {
+    name: "Users",
+    singularName: "User",
+    slug: "users",
+    auth: { enabled: true },
+    table: "users",
+    schema: "rebase",
+    icon: "Users",
+    group: "Settings",
+    openEntityMode: "dialog",
+    disableDefaultActions: ["copy"],
+    securityRules: [
+        { operation: "select",
+roles: ["admin"] },
+        { operations: ["insert", "update", "delete"],
+roles: ["admin"] }
+    ],
+    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",
+            columnName: "display_name"
+        },
+        photoURL: {
+            name: "Photo URL",
+            type: "string",
+            columnName: "photo_url",
+            ui: {
+                url: "image"
+            }
+        },
+        roles: {
+            name: "Roles",
+            type: "array",
+            columnType: "text[]",
+            of: {
+                name: "Role",
+                type: "string",
+                enum: {
+                    admin: "Admin",
+                    editor: "Editor",
+                    viewer: "Viewer"
+                }
+            }
+        },
+        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",
+            keyValue: true,
+            properties: {},
+            defaultValue: {},
+            ui: {
+                hideFromCollection: true,
+                disabled: { hidden: true }
+            }
+        },
+        createdAt: {
+            name: "Created At",
+            type: "date",
+            columnName: "created_at",
+            autoValue: "on_create",
+            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/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
+      - postgres_data:/var/lib/postgresql
     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?options=-c%20search_path=public
+      ADMIN_CONNECTION_STRING: postgresql://rebase:${DATABASE_PASSWORD:-changeme}@db:5432/rebase?options=-c%20search_path=public
       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/Dockerfile

@@ -17,14 +17,16 @@ RUN apk add --no-cache python3 make g++
 WORKDIR /app
 
 # Copy workspace root files
-COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
+COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc ./
 
 # Copy workspace packages
 COPY frontend ./frontend
 COPY config ./config
 
-# Install dependencies
-RUN pnpm install --frozen-lockfile
+# Install dependencies (skip scripts to avoid @ariga/atlas binary download,
+# which is a backend-only dependency that may fail on certain platforms)
+RUN pnpm install --frozen-lockfile --ignore-scripts
+RUN pnpm rebuild esbuild
 
 # Build config first, then frontend
 RUN pnpm --filter "*-config" run build

package/templates/template/frontend/package.json

@@ -4,21 +4,21 @@
     "private": true,
     "type": "module",
     "dependencies": {
-        "@rebasepro/auth": "workspace:*",
-        "@rebasepro/core": "workspace:*",
-        "@rebasepro/plugin-data-enhancement": "workspace:*",
+        "@rebasepro/app": "workspace:*",
+        "@rebasepro/plugin-ai": "workspace:*",
         "@rebasepro/client": "workspace:*",
         "@rebasepro/admin": "workspace:*",
         "@rebasepro/studio": "workspace:*",
         "@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",
         "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,12 +40,13 @@
     "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",
+        "@vitejs/plugin-react": "^4.4.1",
         "tailwindcss": "^4.1.3",
         "typescript": "^5.9.2",
-        "vite": "^5.4.17",
+        "vite": "^6.4.3",
         "vite-plugin-svgr": "^4.3.0"
     }
 }

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

@@ -1,11 +1,12 @@
 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 { RebaseCMS, RebaseShell } from "@rebasepro/admin";
+import { useRebaseAuthController } from "@rebasepro/app";
+import { Rebase, RebaseAuth } from "@rebasepro/app";
+import { RebaseAdmin, RebaseShell } from "@rebasepro/admin";
+import { ErrorBoundary } from "@rebasepro/ui";
 import { RebaseStudio } from "@rebasepro/studio";
 import { createRebaseClient } from "@rebasepro/client";
 import { collections } from "virtual:rebase-collections";
@@ -16,7 +17,10 @@ const GOOGLE_CLIENT_ID = import.meta.env.VITE_GOOGLE_CLIENT_ID;
 
 export function App() {
     const rebaseClient = React.useMemo(() => createRebaseClient({
-        baseUrl: API_URL
+        baseUrl: API_URL,
+        // Store the refresh token in an httpOnly cookie (XSS-safe) rather than
+        // localStorage. The backend issues it via `auth.cookieAuth`.
+        auth: { authFlowMode: "cookie" }
     }), []);
 
     const authController = useRebaseAuthController({
@@ -24,23 +28,19 @@ export function App() {
         googleClientId: GOOGLE_CLIENT_ID
     });
 
-    const userManagement = useBackendUserManagement({
-        client: rebaseClient,
-        currentUser: authController.user
-    });
-
     return (
-        <Rebase
-            client={rebaseClient}
-            authController={authController}
-            userManagement={userManagement}
-        >
-            <RebaseAuth />
-            <RebaseCMS
-                collections={collections}
-            />
-            <RebaseStudio/>
-            <RebaseShell title="Rebase"/>
-        </Rebase>
+        <ErrorBoundary fullPage>
+            <Rebase
+                client={rebaseClient}
+                authController={authController}
+            >
+                <RebaseAuth />
+                <RebaseAdmin
+                    collections={collections}
+                />
+                <RebaseStudio/>
+                <RebaseShell title="Rebase"/>
+            </Rebase>
+        </ErrorBoundary>
     );
 }

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

@@ -4,6 +4,10 @@ import { createBrowserRouter, RouterProvider } from "react-router-dom";
 import { App } from "./App";
 import "./index.css";
 
+window.addEventListener("unhandledrejection", (event: PromiseRejectionEvent) => {
+    console.error("[Rebase] Unhandled promise rejection:", event.reason);
+});
+
 const router = createBrowserRouter([
     {
         path: "/*",

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

@@ -1,12 +1,26 @@
-// @ts-ignore
 import path from "path";
 import { defineConfig } from "vite";
 import react from "@vitejs/plugin-react";
 import svgr from "vite-plugin-svgr";
 import tailwindcss from "@tailwindcss/vite";
-import { rebaseCollectionsPlugin } from "@rebasepro/core/vitePlugin";
+import { rebaseCollectionsPlugin } from "@rebasepro/app/vitePlugin";
 
 export default defineConfig({
+    envDir: path.resolve(__dirname, ".."),
+    // Force a single copy of React and React Router across the app and all
+    // @rebasepro/* packages. Without this, a locally `link:`ed Rebase checkout
+    // resolves its own copies of react-router, producing "multiple copies of
+    // React" and "useBlocker must be used within a data router" errors in the
+    // admin. Safe to keep for npm-installed setups too.
+    resolve: {
+        dedupe: [
+            "react",
+            "react-dom",
+            "react-router",
+            "react-router-dom",
+            "@remix-run/router"
+        ]
+    },
     esbuild: {
         logOverride: { "this-is-undefined-in-esm": "silent" }
     },
@@ -19,7 +33,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/package.json

@@ -4,25 +4,38 @@
     "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"
+        "skills:install": "rebase skills install",
+        "deploy": "rebase build && rebase start"
     },
     "devDependencies": {
         "@rebasepro/cli": "workspace:*",
+        "@rebasepro/types": "workspace:*",
         "concurrently": "^8.2.2",
         "typescript": "^5.9.2"
     },
     "engines": {
         "node": ">=18.0.0"
+    },
+    "pnpm": {
+        "onlyBuiltDependencies": [
+            "esbuild",
+            "sharp",
+            "@ariga/atlas"
+        ]
     }
 }

package/templates/template/pnpm-workspace.yaml

@@ -2,3 +2,12 @@ packages:
   - "frontend"
   - "backend"
   - "config"
+linkWorkspacePackages: true
+blockExoticSubdeps: false
+minimumReleaseAge: 0
+allowBuilds:
+  esbuild: true
+  sharp: true
+  "@ariga/atlas": true
+  "{{PROJECT_NAME}}-config": true
+

package/templates/template/scripts/example.ts

@@ -3,7 +3,7 @@
  *
  * Scripts run OUTSIDE the server and need explicit authentication.
  * Use a Service Key (set in .env as REBASE_SERVICE_KEY) to get admin
- * access — similar to a Firebase Service Account credential.
+ * access — similar to a Service Account credential.
  *
  * Usage:
  *   # With local dev server running (`pnpm dev` in another terminal):
@@ -75,7 +75,10 @@ async function run() {
 
     try {
         // Example: Check backend health
-        const health = await fetch(`${baseUrl}/api/health`).then(res => res.json());
+        const res = await fetch(`${baseUrl}/health`);
+        const health = res.headers.get("content-type")?.includes("application/json")
+            ? await res.json()
+            : { status: res.status, text: await res.text() };
         console.log("✅ Backend health:", health);
 
         // Example: Fetch some data (requires auth if backend is secure-by-default)