Merge branch 'master' into request-ride-workflow

Author: mjaydenkim

.dockerignore

@@ -2,4 +2,12 @@
 **/node_modules
 build
 *.log
-*.gz
+*.gz
+
+**/.env
+
+.dockerignore
+Dockerfile
+LICENSE
+
+.github

.eslintignore

@@ -23,10 +23,12 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: Set up Node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v6
         with:
-          node-version: '20.x'
+          node-version: 'lts/*'
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
       - name: Install Server Dependencies
-        run: npm run install:server
+        run: pnpm install --frozen-lockfile
       # - name: Test Server
-      #   run: npm run test:server
+      #   run: npm run test --filter server

.eslintrc.js

@@ -7,12 +7,14 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: Set up Node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v6
         with:
-          node-version: '20.x'
+          node-version: 'lts/*'
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
       - name: Install Dependencies
-        run: npm install
+        run: pnpm install --frozen-lockfile
       - name: Build Frontend
-        run: CI='' npm run build:frontend
+        run: CI='' pnpm run --filter frontend... build
       - name: Build Server
-        run: CI='' npm run build:server
+        run: CI='' pnpm run --filter server... build

.github/workflows/cd-workflow.yml

@@ -6,28 +6,29 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: Set up Node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v6
         with:
-          node-version: '20.x'
+          node-version: 'lts/*'
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
       - name: Clean Install
         run: |
-          rm -rf node_modules
-          rm -rf package-lock.json
-          npm cache clean --force
-          npm install
+          pnpm install --frozen-lockfile
           echo "Prettier version:"
-          npx prettier --version
+          pnpm prettier --version
+      - name: Build Shared Package
+        run: pnpm --filter shared... build
       - name: Debug Prettier
         run: |
           echo "Files to be checked:"
-          npx prettier --list-different "**/*.{ts,js,tsx,jsx,css}"
+          pnpm prettier --list-different "**/*.{ts,js,tsx,jsx,css}"
           echo "Checking specific file:"
-          npx prettier --check "frontend/src/pages/Landing/Landing.tsx"
+          pnpm prettier --check "frontend/src/pages/Landing/Landing.tsx"
           echo "Running full check:"
           ls -la frontend/src/pages/Landing/
           cat frontend/src/pages/Landing/Landing.tsx | od -c
-          npm run format:check
+          pnpm run format:check
       - name: Run Linter
-        run: npm run lint
+        run: pnpm run lint
       - name: Run Type Check
-        run: npm run type-check
+        run: pnpm run -r type-check

.github/workflows/ci-backend-test.yml

@@ -1,17 +1,61 @@
-name: CI Docker Build
+name: CI Docker Build / Push
 
-on: pull_request
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - 'master'
+    tags:
+      - 'v*'
+  pull_request:
+
+permissions:
+  contents: read
+  packages: write
 
 jobs:
-  build:
-    uses: ./.github/workflows/docker-build-push.yml
-    with:
-      push: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
-      tags: |
-        ghcr.io/${{ github.repository_owner }}/${{ github.repository }}:pr-${{ github.event.pull_request.number }}-latest
-        ghcr.io/${{ github.repository_owner }}/${{ github.repository }}:pr-${{ github.event.pull_request.number }}-${{ github.sha }}
-      labels: |
-        org.opencontainers.image.source=${{ github.event.pull_request.html_url }}
-        org.opencontainers.image.title=PR-${{ github.event.pull_request.number }}
-        org.opencontainers.image.description=${{ github.event.pull_request.title }}
-    secrets: inherit
+  build-push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/${{ github.repository }}
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=tag
+            type=ref,event=pr
+            type=sha
+
+      - name: Docker build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          context: .
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          build-args: |
+            VITE_CLIENT_ID=${{ secrets.VITE_CLIENT_ID }}
+            VITE_PUBLIC_VAPID_KEY=${{ secrets.VITE_PUBLIC_VAPID_KEY }}
+            VITE_ENCRYPTION_KEY=${{ secrets.VITE_ENCRYPTION_KEY }}
+            VITE_GOOGLE_MAPS_API_KEY=${{ secrets.VITE_GOOGLE_MAPS_API_KEY }}
+            VITE_GOOGLE_MAPS_MAP_ID=${{ secrets.VITE_GOOGLE_MAPS_MAP_ID }}

.github/workflows/ci-build.yml

@@ -81,9 +81,6 @@ build/
 # Claude Code
 .claude/
 
-# Husky
-.husky/
-
 # Documentation
 docs/