@rebasepro/cli 0.0.1-canary.eae7889 → 0.0.1-canary.f81da60

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
 ```
@@ -37,7 +37,7 @@ pnpm install
 2. Configure environment:
 
 ```bash
-cp .env.template .env
+cp .env.example .env
 # Edit .env — set DATABASE_URL, JWT_SECRET
 ```
 
@@ -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,14 +1,23 @@
-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");
 }
 
-// Extract table names from the generated schema
-// This ensures drizzle-kit ONLY manages tables defined in the schema
+// 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));
 
 export default defineConfig({
@@ -18,5 +27,16 @@ export default defineConfig({
     dbCredentials: {
         url: process.env.DATABASE_URL
     },
-    tablesFilter: tableNames
+    // 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"],
+    // Prevent drizzle-kit from managing roles not defined in the schema
+    entities: {
+        roles: false
+    },
+    // If PostGIS or other extensions create helper tables, ignore them
+    extensionsFilters: ["postgis"]
 });

package/templates/template/backend/package.json

@@ -10,12 +10,12 @@
         "start": "tsx src/index.ts"
     },
     "dependencies": {
-        "{{PROJECT_NAME}}-config": "0.0.1",
+        "{{PROJECT_NAME}}-config": "workspace:*",
         "@rebasepro/server-core": "workspace:*",
         "@rebasepro/server-postgresql": "workspace:*",
         "drizzle-orm": "^0.44.4",
-        "hono": "^4.2.0",
-        "@hono/node-server": "^1.11.0",
+        "hono": "^4.12.10",
+        "@hono/node-server": "^1.19.12",
         "pg": "^8.11.3",
         "ws": "^8.16.0",
         "zod": "^3.22.4",

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

@@ -35,17 +35,17 @@ const postsCollection: EntityCollection = {
                 {
                     id: "draft",
                     label: "Draft",
-                    color: "grayLight"
+                    color: "gray"
                 },
                 {
                     id: "review",
                     label: "In Review",
-                    color: "orangeLight"
+                    color: "orange"
                 },
                 {
                     id: "published",
                     label: "Published",
-                    color: "greenLight"
+                    color: "green"
                 }
             ]
         },

package/templates/template/docker-compose.yml

@@ -1,8 +1,8 @@
 # ─── 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
@@ -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": "0.0.1",
+        "{{PROJECT_NAME}}-config": "workspace:*",
         "react": "^19.0.0",
         "react-dom": "^19.0.0",
         "react-router": "^7.0.0",

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

@@ -1,47 +1,23 @@
-import React, { useCallback } from "react";
+import React from "react";
 
 import "@fontsource/jetbrains-mono";
 import "typeface-rubik";
 
-import {
-    RebaseLoginView,
-    useBackendUserManagement,
-    useRebaseAuthController
-} from "@rebasepro/auth";
-import {
-    AppBar,
-    Drawer,
-    Rebase,
-    ModeControllerProvider,
-    NotFoundPage,
-    Scaffold,
-    SideDialogs,
-    RebaseRoutes,
-    SnackbarProvider,
-    ContentHomePage,
-    useBuildUrlController,
-    useBuildCollectionRegistryController,
-    useBuildLocalConfigurationPersistence,
-    useBuildModeController,
-    useBuildNavigationStateController
-} from "@rebasepro/core";
-import { RebaseRoute } from "@rebasepro/admin";
-import { CircularProgressCenter } from "@rebasepro/ui";
-import { collections } from "virtual:rebase-collections";
-import { Route, Outlet } from "react-router-dom";
+import { useRebaseAuthController, useBackendUserManagement, RebaseAuth } from "@rebasepro/auth";
+import { Rebase } from "@rebasepro/core";
+import { RebaseCMS, RebaseShell } from "@rebasepro/admin";
+import { RebaseStudio } from "@rebasepro/studio";
 import { createRebaseClient } from "@rebasepro/client";
+import { collections } from "virtual:rebase-collections";
 
 // Configuration from environment
 const API_URL = import.meta.env.VITE_API_URL || (import.meta.env.DEV ? "http://localhost:3001" : undefined);
 const GOOGLE_CLIENT_ID = import.meta.env.VITE_GOOGLE_CLIENT_ID;
 
 export function App() {
-    const modeController = useBuildModeController();
-    const userConfigPersistence = useBuildLocalConfigurationPersistence();
-
     const rebaseClient = React.useMemo(() => createRebaseClient({
         baseUrl: API_URL
-    }), [API_URL]);
+    }), []);
 
     const authController = useRebaseAuthController({
         client: rebaseClient,
@@ -53,73 +29,18 @@ export function App() {
         currentUser: authController.user
     });
 
-    const collectionsBuilder = useCallback(() => {
-        return [...collections];
-    }, []);
-
-    const collectionRegistryController = useBuildCollectionRegistryController({ userConfigPersistence });
-    const urlController = useBuildUrlController({
-        basePath: "/",
-        baseCollectionPath: "/c",
-        collectionRegistryController
-    });
-
-    const navigationStateController = useBuildNavigationStateController({
-        collections: collectionsBuilder,
-        authController,
-        data: rebaseClient.data,
-        collectionRegistryController,
-        urlController,
-        userManagement
-    });
-
     return (
-        <SnackbarProvider>
-            <ModeControllerProvider value={modeController}>
-                <Rebase
-                    client={rebaseClient}
-                    apiUrl={API_URL}
-                    collectionRegistryController={collectionRegistryController}
-                    urlController={urlController}
-                    navigationStateController={navigationStateController}
-                    authController={authController}
-                    userConfigPersistence={userConfigPersistence}
-                    storageSource={rebaseClient.storage}
-                >
-                    {({ loading }) => {
-                        if (loading || authController.initialLoading) {
-                            return <CircularProgressCenter/>;
-                        }
-
-                        if (!authController.user) {
-                            return (
-                                <RebaseLoginView
-                                    authController={authController}
-                                    googleEnabled={!!GOOGLE_CLIENT_ID}
-                                    googleClientId={GOOGLE_CLIENT_ID}
-                                />
-                            );
-                        }
-
-                        return (
-                            <RebaseRoutes>
-                                <Route element={
-                                    <Scaffold autoOpenDrawer={false}>
-                                        <AppBar/>
-                                        <Drawer/>
-                                        <Outlet/>
-                                        <SideDialogs/>
-                                    </Scaffold>
-                                }>
-                                    <Route path={"/"} element={<ContentHomePage/>}/>
-                                    <Route path={"/c/*"} element={<RebaseRoute/>}/>
-                                    <Route path={"*"} element={<NotFoundPage/>}/>
-                                </Route>
-                            </RebaseRoutes>
-                        );
-                    }}
-                </Rebase>
-            </ModeControllerProvider>
-        </SnackbarProvider>
+        <Rebase
+            client={rebaseClient}
+            authController={authController}
+            userManagement={userManagement}
+        >
+            <RebaseAuth />
+            <RebaseCMS
+                collections={collections}
+            />
+            <RebaseStudio/>
+            <RebaseShell title="Rebase"/>
+        </Rebase>
     );
 }

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

@@ -7,14 +7,44 @@ 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" }
     },
     build: {
         minify: true,
-        outDir: "./build",
+        outDir: "./dist",
         target: "ESNEXT",
-        sourcemap: true
+        sourcemap: true,
+        rollupOptions: {
+            output: {
+                manualChunks(id) {
+                    // Heavy vendor libraries — split into individually cached chunks
+                    if (id.includes("xlsx")) return "vendor-xlsx";
+                    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";
+                    if (id.includes("@dnd-kit")) return "vendor-dnd";
+                    if (id.includes("prism-react-renderer")) return "vendor-prism";
+                    if (id.includes("markdown-it")) return "vendor-markdown";
+                    if (id.includes("react-dropzone")) return "vendor-dropzone";
+                    if (id.includes("date-fns")) return "vendor-datefns";
+                    if (id.includes("fuse.js")) return "vendor-fuse";
+                    if (id.includes("node_modules/react-dom/")) return "vendor-react-dom";
+                    if (id.includes("node_modules/react-router") || id.includes("node_modules/@remix-run")) return "vendor-react-router";
+                    if (id.includes("node_modules/@radix-ui/")) return "vendor-radix";
+                    if (id.includes("node_modules/framer-motion/")) return "vendor-framer-motion";
+                    if (id.includes("node_modules/zod/")) return "vendor-zod";
+                    if (id.includes("node_modules/i18next") || id.includes("node_modules/react-i18next")) return "vendor-i18next";
+                    if (id.includes("node_modules/@floating-ui/")) return "vendor-floating-ui";
+                    if (id.includes("node_modules/tailwind-merge/")) return "vendor-tailwind-merge";
+                    if (id.includes("node_modules/notistack/")) return "vendor-notistack";
+                    if (id.includes("node_modules/lucide-react/")) return "vendor-lucide-react";
+
+                    return undefined;
+                }
+            }
+        }
     },
     optimizeDeps: { include: ["react/jsx-runtime"] },
     plugins: [

package/templates/template/package.json

@@ -8,13 +8,14 @@
         "dev": "rebase dev",
         "build": "pnpm -r run build",
         "start": "pnpm --filter \"*-backend\" start",
-        "db:generate": "rebase db generate",
+        "db:generate": "rebase db generate --collections ../config/collections",
         "db:migrate": "rebase db migrate",
         "db:pull": "rebase db pull",
-        "db:push": "rebase db push",
+        "db:push": "rebase db push --collections ../config/collections",
         "db:studio": "rebase db studio",
-        "schema:generate": "rebase schema generate",
-        "generate:sdk": "rebase generate-sdk"
+        "schema:generate": "rebase schema generate --collections ../config/collections",
+        "generate:sdk": "rebase generate-sdk",
+        "deploy": "pnpm run build && pnpm run 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