Merge develop to main (#319)

* feat: next.js 폴더 구조 개선 (#308) (#309)

* feat: next.js 폴더 구조 개선 (#308)

* chore: script 명령어 관련 개선 (#308)

* chore: nextjs ci failed issue fix (#308)

* fix: type check issue fix (#308)

* feat: next app router 15 기본 구조 잡는 작업 (#310) (#311)

* feat: header & navMenu 추가 (#310)

* feat: 기본 구조 작업 (#310)

* chore: fix ci error (#310)

* chore: deploy nextjs (#develop)

* feat: prefetch & ssr pages (#310-prefetch) (#312)

* chore: ci workflow 개선, 약간의 이미지 최적화 작업들, 부하테스트 (#316)

* feat: prefetch & ssr pages (#310-prefetch)

* chore: ci improves and next.js add sharp (#ci-advancement)

* feat(nx-cloud): setup nx cloud workspace (#315)

This commit sets up Nx Cloud for your Nx workspace, enabling distributed caching and the Nx Cloud GitHub integration for fast CI and improved developer experience.

You can access your Nx Cloud workspace by going to
https://cloud.nx.app/orgs/679e78e771fd2cb4bf200e5c/workspaces/679e791071fd2cb4bf200e60

**Note:** This commit attempts to maintain formatting of the nx.json file, however you may need to correct formatting by running an nx format command and committing the changes.

* chore: add cancel-in-progress: true (#ci-advancement)

* fix: ci-app.yml fix (#ci-advancement)

* chore: conflicts (#ci-advancement)

* chore: update ci for using nx (#ci-advancement)

* chore: next.js project에도 bundle analyze와 부하 테스트트 스크립트 추가 (#ci-advancement)

* chore: fix docker build issue - install sharp on workspace (#develop)

* chore: Adjusting CI (#317)

* chore: adjust ci (#ci-adjust)

* chore: remove comment (#ci-adjust)

* chore: ci working test (#ci-adjust)

* chore: ci working test 2 (#ci-adjust)

* feat(nx-cloud): setup nx cloud workspace (#318)

This commit sets up Nx Cloud for your Nx workspace, enabling distributed caching and the Nx Cloud GitHub integration for fast CI and improved developer experience.

You can access your Nx Cloud workspace by going to
https://cloud.nx.app/orgs/67a199185e4612c72a76ed4c/workspaces/67a199375e4612c72a76ed4f

**Note:** This commit attempts to maintain formatting of the nx.json file, however you may need to correct formatting by running an nx format command and committing the changes.

* chore: ci working test 3 (#ci-adjust)

* chore: ci working test 4 (#ci-adjust)

* chore: ci affected test (#ci-adjust)

* chore: ci affected test 2 (#ci-adjust)

* chore: using nx ci token (#ci-adjust)

* chore: test affected (#ci-adjust)

* chore: test affected (#ci-adjust)

* chore: test affected (#ci-adjust)

* chore: test affected (#ci-adjust)

* chore: test affected (#ci-adjust)

---------

Co-authored-by: ahHachul <[email protected]>

---------

Co-authored-by: ahHachul <[email protected]>

Author: createhb21

.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-app.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/ci-one-app.yml

@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - main
+      # 추후 develop 브렌치는 제외
+      - develop
     paths:
       - 'services/ahhachul.com/**'
 
@@ -39,7 +41,7 @@ jobs:
           cat config.json | 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/ci.yml

@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - main
+      # 추후 develop 브렌치는 제외
+      - develop
     paths:
       - 'services/one-app/**'
 

.github/workflows/deploy-app.yml

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

.github/workflows/deploy-one-app.yml .github/workflows/deploy-nextjs.yml.github/workflows/deploy-one-app.yml renamed to .github/workflows/deploy-nextjs.yml

@@ -1,20 +1,27 @@
-FROM node:20-alpine
+FROM node:20.13.0-alpine
+
+RUN npm install -g pnpm
+
 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 add -w 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"]