@idealyst/cli 1.0.33 → 1.0.35

package/dist/templates/workspace/setup.sh

@@ -0,0 +1,205 @@
+#!/bin/bash
+
+# Quick setup script for Idealyst workspace
+# Usage: ./setup.sh [development|production]
+
+set -e
+
+ENVIRONMENT=${1:-development}
+PROJECT_NAME="{{packageName}}"
+
+echo "🚀 Setting up Idealyst workspace..."
+echo "Environment: $ENVIRONMENT"
+echo "Project: $PROJECT_NAME"
+echo ""
+
+# Function to generate random password
+generate_password() {
+    openssl rand -base64 32 | tr -d "=+/" | cut -c1-25
+}
+
+# Function to generate JWT secret
+generate_jwt_secret() {
+    openssl rand -base64 64 | tr -d "=+/" | cut -c1-50
+}
+
+# Function to setup development environment
+setup_development() {
+    echo "🔧 Setting up development environment..."
+    
+    if [ ! -f ".env" ]; then
+        echo "📝 Creating .env from template..."
+        cp .env.example .env
+        echo "✅ Created .env file"
+    else
+        echo "⚠️  .env file already exists, skipping..."
+    fi
+    
+    echo ""
+    echo "🐳 Starting development containers..."
+    if command -v docker-compose &> /dev/null; then
+        docker-compose up -d postgres redis
+        echo "✅ Database and Redis started"
+        
+        echo "⏳ Waiting for services to be ready..."
+        sleep 10
+        
+        echo "🚀 Starting development environment..."
+        echo "💡 You can now:"
+        echo "   - Run 'docker-compose up -d dev' for full dev container"
+        echo "   - Run 'yarn dev' for local development"
+        echo "   - Open in VS Code and select 'Reopen in Container'"
+    else
+        echo "❌ Docker Compose not found. Please install Docker and Docker Compose."
+        exit 1
+    fi
+}
+
+# Function to setup production environment
+setup_production() {
+    echo "🏭 Setting up production environment..."
+    
+    if [ ! -f ".env" ]; then
+        echo "📝 Creating .env from production template..."
+        cp .env.production .env
+        
+        # Generate secure passwords and secrets
+        echo "🔐 Generating secure credentials..."
+        
+        DB_PASSWORD=$(generate_password)
+        JWT_SECRET=$(generate_jwt_secret)
+        SESSION_SECRET=$(generate_jwt_secret)
+        ENCRYPTION_KEY=$(openssl rand -base64 32 | cut -c1-32)
+        GRAFANA_PASSWORD=$(generate_password)
+        
+        # Replace placeholders in .env file
+        sed -i "s/CHANGE_THIS_STRONG_PASSWORD/$DB_PASSWORD/g" .env
+        sed -i "s/CHANGE_THIS_VERY_STRONG_JWT_SECRET_MINIMUM_32_CHARACTERS/$JWT_SECRET/g" .env
+        sed -i "s/CHANGE_THIS_VERY_STRONG_SESSION_SECRET/$SESSION_SECRET/g" .env
+        sed -i "s/CHANGE_THIS_32_CHARACTER_ENCRYPTION_KEY/$ENCRYPTION_KEY/g" .env
+        sed -i "s/CHANGE_THIS_STRONG_PASSWORD/$GRAFANA_PASSWORD/g" .env
+        
+        echo "✅ Created .env with secure credentials"
+        echo ""
+        echo "🔐 Generated Credentials (save these securely!):"
+        echo "   Database Password: $DB_PASSWORD"
+        echo "   JWT Secret: $JWT_SECRET"
+        echo "   Grafana Password: $GRAFANA_PASSWORD"
+        echo ""
+        echo "⚠️  IMPORTANT: Edit .env to configure your domain and other settings!"
+        
+    else
+        echo "⚠️  .env file already exists. Please verify production settings."
+    fi
+    
+    echo ""
+    echo "📋 Production Checklist:"
+    echo "  [ ] Edit .env with your domain name"
+    echo "  [ ] Configure SSL certificates"
+    echo "  [ ] Set up DNS records"
+    echo "  [ ] Configure firewall rules"
+    echo "  [ ] Set up monitoring (optional)"
+    echo ""
+    echo "🚀 Deploy with: ./scripts/docker/deploy.sh production"
+}
+
+# Function to check prerequisites
+check_prerequisites() {
+    echo "🔍 Checking prerequisites..."
+    
+    # Check Docker
+    if ! command -v docker &> /dev/null; then
+        echo "❌ Docker not found. Please install Docker."
+        exit 1
+    fi
+    
+    # Check Docker Compose
+    if ! command -v docker-compose &> /dev/null; then
+        echo "❌ Docker Compose not found. Please install Docker Compose."
+        exit 1
+    fi
+    
+    # Check if Docker is running
+    if ! docker info &> /dev/null; then
+        echo "❌ Docker is not running. Please start Docker."
+        exit 1
+    fi
+    
+    echo "✅ Prerequisites check passed"
+    echo ""
+}
+
+# Function to show post-setup instructions
+show_instructions() {
+    echo ""
+    echo "🎉 Setup complete!"
+    echo ""
+    echo "Next steps:"
+    
+    if [ "$ENVIRONMENT" = "development" ]; then
+        echo "  1. Install dependencies: yarn install"
+        echo "  2. Start development:"
+        echo "     - Full container: docker-compose up -d dev"
+        echo "     - VS Code: Open in Container"
+        echo "     - Local: yarn dev"
+        echo "  3. Access your app:"
+        echo "     - Web: http://localhost:3000"
+        echo "     - API: http://localhost:3001"
+        echo "     - Database: postgresql://postgres:postgres@localhost:5432/idealyst_db"
+    else
+        echo "  1. Edit .env with your production settings"
+        echo "  2. Configure SSL certificates"
+        echo "  3. Deploy: ./scripts/docker/deploy.sh production"
+        echo "  4. Set up monitoring (optional)"
+    fi
+    
+    echo ""
+    echo "📚 Documentation:"
+    echo "  - DOCKER.md - Complete Docker guide"
+    echo "  - TESTING.md - Testing documentation"
+    echo "  - README.md - General workspace info"
+    echo ""
+    echo "🆘 Need help? Check the documentation or run:"
+    echo "  ./scripts/docker/deploy.sh --help"
+}
+
+# Main setup process
+main() {
+    check_prerequisites
+    
+    case $ENVIRONMENT in
+        "development"|"dev")
+            setup_development
+            ;;
+        "production"|"prod")
+            setup_production
+            ;;
+        *)
+            echo "❌ Invalid environment. Use 'development' or 'production'"
+            echo "Usage: $0 [development|production]"
+            exit 1
+            ;;
+    esac
+    
+    show_instructions
+}
+
+# Handle help
+if [[ "$1" == "--help" ]] || [[ "$1" == "-h" ]] || [[ "$1" == "help" ]]; then
+    echo "Idealyst Workspace Setup Script"
+    echo ""
+    echo "Usage: $0 [environment]"
+    echo ""
+    echo "Environments:"
+    echo "  development (default) - Set up for local development"
+    echo "  production           - Set up for production deployment"
+    echo ""
+    echo "Examples:"
+    echo "  $0                   # Development setup"
+    echo "  $0 development       # Development setup"
+    echo "  $0 production        # Production setup"
+    echo ""
+    exit 0
+fi
+
+main

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@idealyst/cli",
-  "version": "1.0.33",
+  "version": "1.0.35",
   "description": "CLI tool for generating Idealyst Framework projects",
   "main": "dist/index.js",
   "bin": {
@@ -18,7 +18,8 @@
     "access": "public"
   },
   "scripts": {
-    "build": "tsc",
+    "build": "tsc && npm run copy-templates",
+    "copy-templates": "cp -r templates dist/",
     "test": "jest",
     "test:integration": "jest __tests__/integration.test.ts",
     "dev": "tsc --watch",

package/templates/workspace/.devcontainer/Dockerfile

@@ -0,0 +1,22 @@
+FROM node:20-bullseye
+
+# Install additional tools
+RUN apt-get update && apt-get install -y \
+    git \
+    postgresql-client \
+    && rm -rf /var/lib/apt/lists/*
+
+# Enable corepack for yarn
+RUN corepack enable
+
+# Set working directory
+WORKDIR /workspace
+
+# Install global tools that might be useful
+RUN npm install -g @expo/cli
+
+# Set up git (will be configured in setup script)
+RUN git config --global init.defaultBranch main
+
+# Keep container running
+CMD ["sleep", "infinity"]

package/templates/workspace/.devcontainer/devcontainer.json

@@ -1,140 +0,0 @@
-{
-  "name": "Idealyst Development Environment",
-  "dockerComposeFile": ["./docker-compose.yml"],
-  "service": "dev",
-  "workspaceFolder": "/app",
-  "shutdownAction": "stopCompose",
-
-  // VS Code configuration
-  "customizations": {
-    "vscode": {
-      "settings": {
-        "terminal.integrated.shell.linux": "/bin/bash",
-        "typescript.preferences.includePackageJsonAutoImports": "auto",
-        "editor.formatOnSave": true,
-        "editor.codeActionsOnSave": {
-          "source.fixAll.eslint": "explicit",
-          "source.organizeImports": "explicit"
-        },
-        "files.watcherExclude": {
-          "**/node_modules/**": true,
-          "**/.git/**": true,
-          "**/dist/**": true,
-          "**/coverage/**": true
-        },
-        "search.exclude": {
-          "**/node_modules": true,
-          "**/dist": true,
-          "**/coverage": true,
-          "**/.yarn": true
-        },
-        "typescript.preferences.importModuleSpecifier": "relative",
-        "jest.jestCommandLine": "yarn test",
-        "jest.autoRun": "off"
-      },
-
-      // Extensions to install
-      "extensions": [
-        "ms-vscode.vscode-typescript-next",
-        "bradlc.vscode-tailwindcss",
-        "esbenp.prettier-vscode",
-        "dbaeumer.vscode-eslint",
-        "ms-vscode.vscode-json",
-        "ms-vscode.test-adapter-converter",
-        "orta.vscode-jest",
-        "ms-vscode.vscode-npm-script",
-        "christian-kohler.path-intellisense",
-        "formulahendry.auto-rename-tag",
-        "bradlc.vscode-tailwindcss",
-        "ms-vscode.vscode-docker",
-        "ms-azuretools.vscode-docker",
-        "redhat.vscode-yaml",
-        "ms-vscode.vscode-markdown",
-        "yzhang.markdown-all-in-one",
-        "davidanson.vscode-markdownlint",
-        "ms-vscode.vscode-git-graph",
-        "eamodio.gitlens",
-        "github.vscode-pull-request-github",
-        "github.copilot",
-        "github.copilot-chat",
-        "ms-vscode.vscode-react-native",
-        "msjsdiag.vscode-react-native"
-      ]
-    }
-  },
-
-  // Development container features
-  "features": {
-    "ghcr.io/devcontainers/features/git:1": {
-      "ppa": true,
-      "version": "latest"
-    },
-    "ghcr.io/devcontainers/features/github-cli:1": {
-      "version": "latest"
-    },
-    "ghcr.io/devcontainers/features/common-utils:2": {
-      "installZsh": true,
-      "configureZshAsDefaultShell": true,
-      "installOhMyZsh": true,
-      "username": "devuser",
-      "userUid": 1001,
-      "userGid": 1001
-    }
-  },
-
-  // Port forwarding for development servers
-  "forwardPorts": [
-    3000,  // Web dev server
-    3001,  // API server
-    5173,  // Vite dev server
-    8080,  // Additional dev server
-    19006, // Expo dev tools
-    5432,  // PostgreSQL
-    6379   // Redis
-  ],
-
-  "portsAttributes": {
-    "3000": {
-      "label": "Web App",
-      "onAutoForward": "openBrowser"
-    },
-    "3001": {
-      "label": "API Server",
-      "onAutoForward": "silent"
-    },
-    "5173": {
-      "label": "Vite Dev Server",
-      "onAutoForward": "openBrowser"
-    },
-    "19006": {
-      "label": "Expo Dev Tools",
-      "onAutoForward": "openBrowser"
-    },
-    "5432": {
-      "label": "PostgreSQL",
-      "onAutoForward": "silent"
-    },
-    "6379": {
-      "label": "Redis",
-      "onAutoForward": "silent"
-    }
-  },
-
-  // Post-create commands
-  "postCreateCommand": "bash .devcontainer/post-create.sh",
-
-  // Development user
-  "remoteUser": "devuser",
-
-  // Environment variables
-  "remoteEnv": {
-    "NODE_ENV": "development",
-    "DATABASE_URL": "postgresql://postgres:postgres@postgres:5432/idealyst_db",
-    "REDIS_URL": "redis://redis:6379"
-  },
-
-  // Mount the workspace with proper permissions
-  "mounts": [
-    "source=${localWorkspaceFolder},target=/app,type=bind,consistency=cached"
-  ]
-}

package/templates/workspace/.devcontainer/docker-compose.yml

@@ -2,7 +2,7 @@ services:
   # PostgreSQL Database
   postgres:
     image: postgres:15-alpine
-    container_name: ${PROJECT_NAME:-truday}-postgres
+    container_name: ${PROJECT_NAME:-idealyst}-postgres
     environment:
       POSTGRES_DB: ${POSTGRES_DB:-idealyst_db}
       POSTGRES_USER: ${POSTGRES_USER:-postgres}
@@ -11,40 +11,30 @@ services:
       - "${POSTGRES_PORT:-5432}:5432"
     volumes:
       - postgres_data:/var/lib/postgresql/data
-      - ../docker/postgres/init.sql:/docker-entrypoint-initdb.d/init.sql
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-postgres}"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
     networks:
       - idealyst-network
 
   # Redis Cache
   redis:
     image: redis:7-alpine
-    container_name: ${PROJECT_NAME:-truday}-redis
+    container_name: ${PROJECT_NAME:-idealyst}-redis
     ports:
       - "${REDIS_PORT:-6379}:6379"
     volumes:
       - redis_data:/data
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
     networks:
       - idealyst-network
 
   # Development Service (for devcontainer)
-  dev:
+  app:
     build:
       context: ..
-      dockerfile: Dockerfile
-      target: dev
-    container_name: ${PROJECT_NAME:-truday}-dev
+      dockerfile: .devcontainer/Dockerfile
+    container_name: ${PROJECT_NAME:-idealyst}-app
     environment:
       NODE_ENV: development
+      DATABASE_URL: postgresql://postgres:postgres@postgres:5432/idealyst_db
+      REDIS_URL: redis://redis:6379
     ports:
       - "3000:3000"   # Web dev server
       - "3001:3001"   # API dev server
@@ -52,22 +42,19 @@ services:
       - "8080:8080"   # Additional dev server
       - "19006:19006" # Expo dev tools
     volumes:
-      - ..:/app
-      - /app/node_modules
-      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - ..:/workspace
+      - node_modules:/workspace/node_modules
     depends_on:
-      postgres:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
+      - postgres
+      - redis
     networks:
       - idealyst-network
-    tty: true
-    stdin_open: true
+    command: sleep infinity
 
 volumes:
   postgres_data:
   redis_data:
+  node_modules:
 
 networks:
   idealyst-network:

package/templates/workspace/.devcontainer/setup.sh

@@ -0,0 +1,64 @@
+#!/bin/bash
+
+echo "🚀 Setting up Idealyst development environment..."
+
+# Install dependencies
+echo "📦 Installing dependencies..."
+yarn install
+
+# Create environment file if it doesn't exist
+if [ ! -f ".env" ]; then
+    echo "📝 Creating .env file..."
+    cat > .env << EOF
+# Database Configuration
+DATABASE_URL=postgresql://postgres:postgres@postgres:5432/idealyst_db
+POSTGRES_DB=idealyst_db
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
+
+# Redis Configuration
+REDIS_URL=redis://redis:6379
+
+# API Configuration
+API_PORT=3001
+JWT_SECRET=your-jwt-secret-here
+
+# Web Configuration
+WEB_PORT=3000
+
+# Development Configuration
+NODE_ENV=development
+LOG_LEVEL=debug
+
+# Project Configuration
+PROJECT_NAME={{packageName}}
+EOF
+fi
+
+# Wait for database to be ready
+echo "⏳ Waiting for database to be ready..."
+until pg_isready -h postgres -p 5432 -U postgres; do
+    echo "Database is unavailable - sleeping"
+    sleep 1
+done
+
+echo "✅ Database is ready!"
+
+# Run database migrations if they exist
+if [ -d "packages" ]; then
+    echo "🗄️ Setting up database..."
+    
+    # Check if any package has prisma
+    for package_dir in packages/*/; do
+        if [ -f "${package_dir}prisma/schema.prisma" ]; then
+            echo "Running Prisma setup for $(basename "$package_dir")..."
+            cd "$package_dir"
+            npx prisma generate
+            npx prisma db push
+            cd /workspace
+        fi
+    done
+fi
+
+echo "✅ Development environment is ready!"
+echo "🎉 You can now start developing your Idealyst application!"

package/templates/workspace/Dockerfile

@@ -66,16 +66,34 @@ CMD ["nginx", "-g", "daemon off;"]
 # Development stage - for use with dev containers
 FROM base AS dev
 
+# Install additional tools for development
+RUN apt-get update && apt-get install -y \
+    sudo \
+    postgresql-client \
+    && rm -rf /var/lib/apt/lists/*
+
+# Create dev user with proper permissions
+RUN groupadd --gid 1000 devuser \
+    && useradd --uid 1000 --gid devuser --shell /bin/bash --create-home devuser \
+    && echo 'devuser ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+# Set up workspace directory with proper ownership
+RUN mkdir -p /app && chown -R devuser:devuser /app
+
+# Switch to dev user for remaining setup
+USER devuser
+WORKDIR /app
+
 # Copy package files
-COPY package.json yarn.lock .yarnrc.yml ./
-COPY .yarn .yarn
+COPY --chown=devuser:devuser package.json yarn.lock .yarnrc.yml ./
+COPY --chown=devuser:devuser .yarn .yarn
 
 # Create packages directory structure and copy package.json files
 RUN mkdir -p packages/api packages/app packages/components packages/web
-COPY packages/api/package.json ./packages/api/
-COPY packages/app/package.json ./packages/app/
-COPY packages/components/package.json ./packages/components/
-COPY packages/web/package.json ./packages/web/
+COPY --chown=devuser:devuser packages/api/package.json ./packages/api/
+COPY --chown=devuser:devuser packages/app/package.json ./packages/app/
+COPY --chown=devuser:devuser packages/components/package.json ./packages/components/
+COPY --chown=devuser:devuser packages/web/package.json ./packages/web/
 
 # Install dependencies including dev dependencies
 RUN yarn install