@idealyst/cli 1.0.35 → 1.0.37

package/dist/templates/workspace/.devcontainer/Dockerfile

@@ -0,0 +1,23 @@
+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
+
+# 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
+
+# Create workspace directory
+RUN mkdir -p /workspace
+WORKDIR /workspace
+
+# Keep container running
+CMD ["sleep", "infinity"]

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

@@ -1,88 +1,10 @@
 {
-  "name": "Idealyst Development Environment",
-  "dockerComposeFile": ["./docker-compose.yml"],
-  "service": "dev",
-  "workspaceFolder": "/app",
-  "shutdownAction": "stopCompose",
+  "name": "Idealyst Development",
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "app",
+  "workspaceFolder": "/workspace",
 
-  // 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
+  // Forward ports
   "forwardPorts": [
     3000,  // Web dev server
     3001,  // API server
@@ -93,6 +15,7 @@
     6379   // Redis
   ],
 
+  // Port attributes
   "portsAttributes": {
     "3000": {
       "label": "Web App",
@@ -100,41 +23,90 @@
     },
     "3001": {
       "label": "API Server",
-      "onAutoForward": "silent"
+      "onAutoForward": "notify"
     },
     "5173": {
       "label": "Vite Dev Server",
       "onAutoForward": "openBrowser"
     },
+    "8080": {
+      "label": "Additional Dev Server",
+      "onAutoForward": "notify"
+    },
     "19006": {
       "label": "Expo Dev Tools",
       "onAutoForward": "openBrowser"
     },
     "5432": {
-      "label": "PostgreSQL",
+      "label": "PostgreSQL Database",
       "onAutoForward": "silent"
     },
     "6379": {
-      "label": "Redis",
+      "label": "Redis Cache",
       "onAutoForward": "silent"
     }
   },
 
-  // Post-create commands
-  "postCreateCommand": "bash .devcontainer/post-create.sh",
+  // VS Code customizations
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        // React Native/React development
+        "ms-vscode.vscode-react-native",
+        "msjsdiag.vscode-react-native",
+
+        // TypeScript/JavaScript
+        "ms-vscode.vscode-typescript-next",
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode",
+        "bradlc.vscode-tailwindcss",
+
+        // General development
+        "ms-vscode.vscode-json",
+        "redhat.vscode-yaml",
+        "ms-vscode.vscode-docker",
+        "ms-vscode.vscode-markdown",
+        "christian-kohler.path-intellisense",
+        "formulahendry.auto-rename-tag",
 
-  // Development user
-  "remoteUser": "devuser",
+        // Testing
+        "orta.vscode-jest",
+        "ms-vscode.test-adapter-converter",
 
-  // Environment variables
-  "remoteEnv": {
-    "NODE_ENV": "development",
-    "DATABASE_URL": "postgresql://postgres:postgres@postgres:5432/idealyst_db",
-    "REDIS_URL": "redis://redis:6379"
+        // Git
+        "mhutchie.git-graph",
+        "eamodio.gitlens",
+        "github.vscode-pull-request-github",
+        "github.copilot",
+        "github.copilot-chat"
+      ],
+      "settings": {
+        "terminal.integrated.defaultProfile.linux": "bash",
+        "typescript.preferences.includePackageJsonAutoImports": "auto",
+        "editor.formatOnSave": true,
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
+        "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
+        },
+        "jest.jestCommandLine": "yarn test",
+        "jest.autoRun": "off"
+      }
+    }
   },
 
-  // Mount the workspace with proper permissions
-  "mounts": [
-    "source=${localWorkspaceFolder},target=/app,type=bind,consistency=cached"
-  ]
+  // Post-create command to set up the development environment
+  "postCreateCommand": "bash .devcontainer/setup.sh"
 }

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

@@ -2,73 +2,46 @@ services:
   # PostgreSQL Database
   postgres:
     image: postgres:15-alpine
-    container_name: ${PROJECT_NAME:-truday}-postgres
     environment:
-      POSTGRES_DB: ${POSTGRES_DB:-idealyst_db}
-      POSTGRES_USER: ${POSTGRES_USER:-postgres}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres}
+      POSTGRES_DB: idealyst_db
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
     ports:
-      - "${POSTGRES_PORT:-5432}:5432"
+      - "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
     ports:
-      - "${REDIS_PORT:-6379}:6379"
+      - "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: ..
+      context: .
       dockerfile: Dockerfile
-      target: dev
-    container_name: ${PROJECT_NAME:-truday}-dev
     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
-      - "5173:5173"   # Vite dev server
-      - "8080:8080"   # Additional dev server
-      - "19006:19006" # Expo dev tools
+      - "3000:3000"
+      - "3001:3001"
+      - "5173:5173"
+      - "8080:8080"
+      - "19006:19006"
     volumes:
-      - ..:/app
-      - /app/node_modules
-      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - ..:/workspace
+      - /workspace/node_modules
     depends_on:
-      postgres:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
-    networks:
-      - idealyst-network
-    tty: true
-    stdin_open: true
+      - postgres
+      - redis
+    command: sleep infinity
 
 volumes:
   postgres_data:
   redis_data:
-
-networks:
-  idealyst-network:
-    driver: bridge

package/dist/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/dist/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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@idealyst/cli",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "description": "CLI tool for generating Idealyst Framework projects",
   "main": "dist/index.js",
   "bin": {

package/templates/workspace/.devcontainer/Dockerfile

@@ -9,14 +9,15 @@ RUN apt-get update && apt-get install -y \
 # 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
 
+# Create workspace directory
+RUN mkdir -p /workspace
+WORKDIR /workspace
+
 # Keep container running
 CMD ["sleep", "infinity"]

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

@@ -0,0 +1,112 @@
+{
+  "name": "Idealyst Development",
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "app",
+  "workspaceFolder": "/workspace",
+
+  // Forward ports
+  "forwardPorts": [
+    3000,  // Web dev server
+    3001,  // API server
+    5173,  // Vite dev server
+    8080,  // Additional dev server
+    19006, // Expo dev tools
+    5432,  // PostgreSQL
+    6379   // Redis
+  ],
+
+  // Port attributes
+  "portsAttributes": {
+    "3000": {
+      "label": "Web App",
+      "onAutoForward": "openBrowser"
+    },
+    "3001": {
+      "label": "API Server",
+      "onAutoForward": "notify"
+    },
+    "5173": {
+      "label": "Vite Dev Server",
+      "onAutoForward": "openBrowser"
+    },
+    "8080": {
+      "label": "Additional Dev Server",
+      "onAutoForward": "notify"
+    },
+    "19006": {
+      "label": "Expo Dev Tools",
+      "onAutoForward": "openBrowser"
+    },
+    "5432": {
+      "label": "PostgreSQL Database",
+      "onAutoForward": "silent"
+    },
+    "6379": {
+      "label": "Redis Cache",
+      "onAutoForward": "silent"
+    }
+  },
+
+  // VS Code customizations
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        // React Native/React development
+        "ms-vscode.vscode-react-native",
+        "msjsdiag.vscode-react-native",
+
+        // TypeScript/JavaScript
+        "ms-vscode.vscode-typescript-next",
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode",
+        "bradlc.vscode-tailwindcss",
+
+        // General development
+        "ms-vscode.vscode-json",
+        "redhat.vscode-yaml",
+        "ms-vscode.vscode-docker",
+        "ms-vscode.vscode-markdown",
+        "christian-kohler.path-intellisense",
+        "formulahendry.auto-rename-tag",
+
+        // Testing
+        "orta.vscode-jest",
+        "ms-vscode.test-adapter-converter",
+
+        // Git
+        "mhutchie.git-graph",
+        "eamodio.gitlens",
+        "github.vscode-pull-request-github",
+        "github.copilot",
+        "github.copilot-chat"
+      ],
+      "settings": {
+        "terminal.integrated.defaultProfile.linux": "bash",
+        "typescript.preferences.includePackageJsonAutoImports": "auto",
+        "editor.formatOnSave": true,
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
+        "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
+        },
+        "jest.jestCommandLine": "yarn test",
+        "jest.autoRun": "off"
+      }
+    }
+  },
+
+  // Post-create command to set up the development environment
+  "postCreateCommand": "bash .devcontainer/setup.sh"
+}

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

@@ -2,60 +2,46 @@ services:
   # PostgreSQL Database
   postgres:
     image: postgres:15-alpine
-    container_name: ${PROJECT_NAME:-idealyst}-postgres
     environment:
-      POSTGRES_DB: ${POSTGRES_DB:-idealyst_db}
-      POSTGRES_USER: ${POSTGRES_USER:-postgres}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres}
+      POSTGRES_DB: idealyst_db
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
     ports:
-      - "${POSTGRES_PORT:-5432}:5432"
+      - "5432:5432"
     volumes:
       - postgres_data:/var/lib/postgresql/data
-    networks:
-      - idealyst-network
 
   # Redis Cache
   redis:
     image: redis:7-alpine
-    container_name: ${PROJECT_NAME:-idealyst}-redis
     ports:
-      - "${REDIS_PORT:-6379}:6379"
+      - "6379:6379"
     volumes:
       - redis_data:/data
-    networks:
-      - idealyst-network
 
   # Development Service (for devcontainer)
   app:
     build:
-      context: ..
-      dockerfile: .devcontainer/Dockerfile
-    container_name: ${PROJECT_NAME:-idealyst}-app
+      context: .
+      dockerfile: Dockerfile
     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
-      - "5173:5173"   # Vite dev server
-      - "8080:8080"   # Additional dev server
-      - "19006:19006" # Expo dev tools
+      - "3000:3000"
+      - "3001:3001"
+      - "5173:5173"
+      - "8080:8080"
+      - "19006:19006"
     volumes:
       - ..:/workspace
-      - node_modules:/workspace/node_modules
+      - /workspace/node_modules
     depends_on:
       - postgres
       - redis
-    networks:
-      - idealyst-network
     command: sleep infinity
 
 volumes:
   postgres_data:
   redis_data:
-  node_modules:
-
-networks:
-  idealyst-network:
-    driver: bridge