feat: Dev to Main

.github/actions/pnpm-install/action.yml

@@ -7,7 +7,7 @@ runs:
     - name: Setup pnpm
       uses: pnpm/action-setup@v2
       with:
-        version: 8 # or your preferred version
+        version: 8
 
     - name: Get pnpm store directory
       id: pnpm-cache

.github/workflows/ci.yml

@@ -0,0 +1,58 @@
+name: APP CI
+
+on:
+  pull_request:
+    paths:
+      - 'services/**'
+      - 'package.json'
+      - 'pnpm-lock.yaml'
+      - '.github/workflows/**'
+
+permissions:
+  actions: read
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  DEFAULT_NODE_VERSION: '20.13.0'
+  HUSKY: '0'
+  NEXT_TELEMETRY_DISABLED: '1'
+  NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
+
+jobs:
+  main:
+    name: 🚀 CI Pipeline
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+
+    steps:
+      - name: 📥 Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: 🔨 Setup Node.js
+        uses: actions/setup-node@v3
+        timeout-minutes: 1
+        with:
+          node-version: ${{ env.DEFAULT_NODE_VERSION }}
+
+      - name: 📦 Install Dependencies
+        uses: ./.github/actions/pnpm-install
+        timeout-minutes: 5
+
+      - name: 🔄 Set Nx Base/Head
+        uses: nrwl/nx-set-shas@v4
+
+      - name: 🔑 Create Environment File
+        timeout-minutes: 1
+        run: |
+          echo '${{ secrets.DEV_REACT_APP_CONFIG }}' > config.json
+          echo '${{ secrets.DEV_ONE_APP_CONFIG }}' | jq -r 'to_entries | .[] | "\(.key)=\(.value)"' > services/one-app/.env
+
+      - name: 🏃 Run CI Tasks
+        run: |
+          pnpm nx affected --parallel=3 -t type-check,build,test,lint

.github/workflows/deploy-app.yml

@@ -4,7 +4,9 @@ on:
   push:
     branches:
       - main
+      - develop
     paths:
+      - 'packages/**'
       - 'services/ahhachul.com/**'
 
 env:
@@ -20,11 +22,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Parse secrets from JSON
-        id: secrets
-        run: |
-          echo '${{ secrets.DEV_META_DATA }}' | jq -r 'to_entries | .[] | "echo \(.key)=\(.value) >> $GITHUB_ENV"' | bash
-
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
@@ -33,13 +30,20 @@ jobs:
       - name: Install dependencies
         uses: ./.github/actions/pnpm-install
 
+      - name: Set AWS Environment Variables
+        run: |
+          echo "AWS_ACCESS_KEY_ID=${{ fromJson(secrets.DEV_META_DATA).AWS_ACCESS_KEY_ID }}" >> $GITHUB_ENV
+          echo "AWS_SECRET_ACCESS_KEY=${{ fromJson(secrets.DEV_META_DATA).AWS_SECRET_ACCESS_KEY }}" >> $GITHUB_ENV
+          echo "AWS_REGION=${{ fromJson(secrets.DEV_META_DATA).AWS_REGION }}" >> $GITHUB_ENV
+          echo "S3_BUCKET_NAME=${{ fromJson(secrets.DEV_META_DATA).S3_BUCKET_NAME }}" >> $GITHUB_ENV
+          echo "AWS_CLOUDFRONT_DISTRIBUTION_ID_USER=${{ fromJson(secrets.DEV_META_DATA).AWS_CLOUDFRONT_DISTRIBUTION_ID_USER }}" >> $GITHUB_ENV
+
       - name: Create .env file for ahhachul.com
         run: |
-          echo '${{ secrets.DEV_REACT_APP_CONFIG }}' > config.json
-          cat config.json | jq -r 'to_entries[] | "\(.key)=\(.value)"' >> services/ahhachul.com/.env
+          echo '${{ secrets.DEV_REACT_APP_CONFIG }}' | jq -r 'to_entries[] | "\(.key)=\(.value)"' > services/ahhachul.com/.env
 
       - name: Build ahhachul.com
-        run: pnpm build:app
+        run: pnpm app:build
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v2

.github/workflows/deploy-one-app.yml → .github/workflows/deploy-nextjs.yml

@@ -4,7 +4,10 @@ on:
   push:
     branches:
       - main
+      # 추후 develop 브렌치는 제외
+      - develop
     paths:
+      - 'packages/**'
       - 'services/one-app/**'
 
 env:
@@ -33,6 +36,14 @@ jobs:
         with:
           node-version: ${{ env.DEFAULT_NODE_VERSION }}
 
+      - name: Update Corepack
+        run: |
+          echo "Before: corepack version => $(corepack --version || echo 'not installed')"
+          npm install -g corepack@latest
+          echo "After : corepack version => $(corepack --version)"
+          corepack enable
+          pnpm --version
+
       - name: Install dependencies
         uses: ./.github/actions/pnpm-install
 

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "typescript.tsdk": "node_modules/typescript/lib"
+}

Dockerfile

@@ -1,20 +1,29 @@
-FROM node:20-alpine
+FROM node:20.13.0-alpine
+
+RUN npm install -g corepack@latest && \
+    corepack enable && \
+    corepack prepare pnpm@latest --activate
+
 RUN apk add --no-cache libc6-compat
+
 WORKDIR /app
 
-COPY services/one-app          ./services/one-app
-COPY nx.json tsconfig*         ./ 
-COPY package.json              ./
-COPY pnpm-lock.yaml            ./ 
-COPY pnpm-workspace.yaml       ./ 
-COPY .nx                       ./ 
+COPY packages/utils           ./packages/utils
+COPY services/one-app        ./services/one-app
+COPY nx.json tsconfig*       ./ 
+COPY package.json           ./
+COPY pnpm-lock.yaml        ./ 
+COPY pnpm-workspace.yaml   ./ 
+COPY .nx                   ./ 
 
-RUN pnpm install 
+RUN pnpm install && \
+    cd services/one-app && \
+    pnpm install sharp
 
 ENV NEXT_TELEMETRY_DISABLED=1 
 
-RUN pnpm build:one-app 
+RUN pnpm nextjs:build
 
 EXPOSE 3000
 
-CMD ["pnpm", "start:one-app"]
+CMD ["pnpm", "nextjs:start"]