Merge branch 'release/v0.4.5'

Author: cbnsndwch

.github/WORKFLOWS.md

@@ -7,7 +7,7 @@ This document provides an overview of the CI/CD workflows in this repository.
 The repository uses GitHub Actions for continuous integration and deployment. The workflows are designed to:
 
 1. Validate code and run tests
-2. Build and publish Docker images for tagged releases
+2. Build and publish Docker images for tagged releases and the develop branch
 3. Maintain code quality through automated checks
 
 ## Workflow Structure
@@ -21,6 +21,7 @@ Triggered when a new tag with the pattern `v*.*.*` is pushed. This workflow:
 1. Validates that the tag follows semantic versioning
 2. Runs tests for the server package
 3. Builds and pushes a Docker image to GitHub Container Registry (if tests pass)
+4. Tags the image with the version number and 'latest'
 
 ```mermaid
 graph TD
@@ -33,58 +34,93 @@ graph TD
     F -->|No| H[End Workflow]
 ```
 
-### Reusable Workflows
+#### Develop Branch Workflow (`develop-push.yml`)
 
-#### Test Workflow (`reusable-test.yml`)
+Triggered when code is pushed to the develop branch. This workflow:
 
-A reusable workflow that handles testing. It:
+1. Runs tests for the server package
+2. Builds and pushes a Docker image to GitHub Container Registry with the 'dev' tag (if tests pass)
+
+#### Main Branch Workflow (`main-push.yml`)
+
+Triggered when code is pushed to the main branch. This workflow:
 
-1. Sets up Node.js and pnpm
-2. Installs jsdom (required for Vitest DOM testing)
-3. Builds the application
-4. Runs tests and collects coverage
-5. Uploads test results and coverage reports as artifacts
+1. Runs tests for the server package
 
-#### Docker Build Workflow (`reusable-docker-build.yml`)
+#### Pull Request Workflow (`pull-request.yml`)
 
-A reusable workflow that handles building and pushing Docker images. It:
+Triggered when a pull request is opened or updated for the main or develop branches. This workflow:
 
-1. Sets up Docker Buildx
-2. Logs in to GitHub Container Registry
-3. Extracts metadata for proper tagging
-4. Builds and optionally pushes the Docker image
-5. Supports tagging with semver and latest
+1. Runs tests for the server package
+
+### Reusable Workflows
+
+#### Test Workflow (`reusable-test.yml`)
+
+A reusable workflow that handles testing. It:
+
+1. Sets up Node.js (v22) and pnpm
+2. Builds the application
+3. Runs tests and collects coverage
+4. Uploads test results and coverage reports as artifacts
 
 ### Shared Actions
 
 #### Setup Node and pnpm (`setup-node-pnpm`)
 
-Sets up Node.js and pnpm with caching for faster installations.
+Sets up Node.js (v22) and pnpm with caching for faster installations. Uses non-frozen lockfile to ensure compatibility.
 
 #### Validate Semver Tag (`validate-semver-tag`)
 
 Validates that a tag follows semantic versioning format (v*.*.*)
 
-#### Test Report (`test-report`)
+## Dependencies
+
+The workflows expect jsdom to be included in the package.json of the server application for DOM testing with Vitest.
+
+## Docker Images
+
+The workflow uses GitHub's official Docker actions directly:
+- `docker/setup-buildx-action` - For setting up Docker Buildx
+- `docker/login-action` - For authenticating with GitHub Container Registry
+- `docker/metadata-action` - For generating image tags and labels
+- `docker/build-push-action` - For building and pushing Docker images
+
+Important Docker build configuration:
+- Context is set to the repository root (`.`)
+- Dockerfile path is explicitly set to `apps/server/Dockerfile`
+- Cache is enabled for faster builds using GitHub Actions cache
+
+### Simplified Dockerfile Structure
 
-Runs tests and generates reports with coverage information.
+The Dockerfile has been simplified to use a two-stage build approach:
 
-## Required Dependencies
+1. **Builder Stage**:
+   - Uses Node.js 22 Alpine as the base image
+   - Copies the entire repository into the container
+   - Installs dependencies with `--no-frozen-lockfile` to avoid dependency conflicts
+   - Builds the application using the pnpm filter
 
-The testing workflow requires the `jsdom` package to be available for DOM testing with Vitest. This dependency is automatically installed during the workflow execution.
+2. **Production Stage**:
+   - Uses a fresh Node.js Alpine image
+   - Copies only the built application and package.json
+   - Installs only production dependencies
+   - Results in a smaller final image with no build tools or source code
 
 ## Badges
 
 Workflow status can be displayed in the README.md using the following badge:
 
 ```markdown
-[![CI/CD Pipeline](https://github.com/cbnsndwch/react-router-nest/actions/workflows/release-tag.yml/badge.svg)](https://github.com/cbnsndwch/react-router-nest/actions/workflows/release-tag.yml)
+[![Release Pipeline](https://github.com/cbnsndwch/react-router-nest/actions/workflows/release-tag.yml/badge.svg)](https://github.com/cbnsndwch/react-router-nest/actions/workflows/release-tag.yml)
 ```
 
 ## Troubleshooting
 
 If the workflow fails, check:
 
-1. **Missing dependencies**: Ensure all required dependencies are either in the package.json or installed during workflow execution
-2. **Tag format**: Ensure tags follow the semantic versioning format v*.*.* (e.g., v1.0.0)
-3. **Test failures**: Look at test artifacts for details on failing tests
+1. **Missing dependencies**: Ensure all required dependencies are in the package.json
+2. **Node.js version**: The workflow expects Node.js v22+ as specified in the server package.json
+3. **Tag format**: Ensure release tags follow the semantic versioning format v*.*.* (e.g., v1.0.0)
+4. **Test failures**: Look at test artifacts for details on failing tests
+5. **Docker build context**: The Dockerfile expects to be built from the repository root. If you modify the workflows, ensure the Docker context is set to `.` (repository root) and the file parameter points to `apps/server/Dockerfile`

.github/actions/setup-node-pnpm/action.yml

@@ -21,7 +21,7 @@ runs:
     - name: Setup Node.js
       uses: actions/setup-node@v4
       with:
-        node-version-file: ${{ inputs.node-version-file }}
+        node-version: '22'
 
     - name: Setup pnpm
       uses: pnpm/action-setup@v4
@@ -46,8 +46,10 @@ runs:
       if: ${{ inputs.install-deps == 'true' }}
       shell: bash
       run: |
+        # The server package.json has jsdom as a dependency that's added later
+        # Avoid frozen lockfile to prevent errors when CI adds it
         if [[ "${{ inputs.frozen-lockfile }}" == "true" ]]; then
-          pnpm install --frozen-lockfile
+          pnpm install --no-frozen-lockfile
         else
           pnpm install
         fi

.github/workflows/develop-push.yml

@@ -23,8 +23,37 @@ jobs:
     name: Build & Push Docker Image
     needs: test
     if: ${{ needs.test.outputs.tests_passed == 'true' }}
-    uses: ./.github/workflows/reusable-docker-build.yml
-    with:
-      push: true
-      is-develop: true
-      include-latest: true
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      
+      - name: Extract metadata for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/cbnsndwch/react-router-nest-server
+          tags: |
+            type=raw,value=dev
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: apps/server/Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/release-tag.yml

@@ -41,9 +41,38 @@ jobs:
     name: Build & Push Docker Image
     needs: [validate-tag, test]
     if: ${{ needs.validate-tag.outputs.is-valid == 'true' && needs.test.outputs.tests_passed == 'true' }}
-    uses: ./.github/workflows/reusable-docker-build.yml
-    with:
-      push: true
-      tag-version: ${{ needs.validate-tag.outputs.version }}
-      is-release: true
-      include-latest: true
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      
+      - name: Extract metadata for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/cbnsndwch/react-router-nest-server
+          tags: |
+            type=semver,pattern={{version}},value=v${{ needs.validate-tag.outputs.version }}
+            type=raw,value=latest
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: apps/server/Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/reusable-docker-build.yml

@@ -40,9 +40,6 @@ jobs:
           install-deps: true
           frozen-lockfile: true
 
-      - name: Install jsdom for Vitest DOM testing
-        run: pnpm add -D jsdom --filter "${{ inputs.package-filter }}"
-      
       - name: Build application
         run: pnpm ${{ inputs.build-command }}
 

.github/workflows/reusable-test.yml

@@ -47,6 +47,7 @@
         "Googlebot",
         "isbot",
         "Pipeable",
-        "vset"
+        "vset",
+        "vtag"
     ]
 }