Merge pull request #528 from woowacourse-teams/develop-FE-2

[FE] 1.0.0 배포
woowacourse-teams · Sep 30, 2023 · f3b43d3 · f3b43d3
2 parents 1427f37 + fafe2f4
commit f3b43d3
Show file tree

Hide file tree

Showing 39 changed files with 8,221 additions and 25,502 deletions.
diff --git a/.github/workflows/fe-merge-dev.yml b/.github/workflows/fe-merge-dev.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
 
   pull_request:
-    branches: [develop-FE]
+    branches: [develop-FE-2]
     types: [closed]
     paths: frontend/**
 
@@ -23,8 +23,8 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
-          cache: 'npm'
-          cache-dependency-path: 'frontend'
+          cache: "npm"
+          cache-dependency-path: "frontend"
 
       - name: Install npm
         run: npm install
@@ -33,6 +33,9 @@ jobs:
       - name: Build project
         run: npm run build
         working-directory: frontend
+        env:
+          REACT_APP_GOOGLE_ANALYTICS: ${{ secrets.REACT_APP_GOOGLE_ANALYTICS }}
+          APP_URL: "https://mapbefine.kro.kr/api"
 
       - name: upload to artifact
         uses: actions/upload-artifact@v3
@@ -63,7 +66,7 @@ jobs:
 
         uses: 8398a7/action-slack@v3
         with:
-          mention: 'here'
+          mention: "here"
           if_mention: always
           status: ${{ job.status }}
           fields: workflow,job,commit,message,ref,author,took

diff --git a/.github/workflows/fe-merge-prod.yml b/.github/workflows/fe-merge-prod.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
 
   pull_request:
-    branches: [ main ]
+    branches: [main]
     types: [closed]
     paths: frontend/**
 
@@ -33,6 +33,9 @@ jobs:
       - name: Build project
         run: npm run build
         working-directory: frontend
+        env:
+          REACT_APP_GOOGLE_ANALYTICS: ${{ secrets.REACT_APP_GOOGLE_ANALYTICS }}
+          APP_URL: "https://mapbefine.com/api"
 
       - name: upload to artifact
         uses: actions/upload-artifact@v3
@@ -41,7 +44,7 @@ jobs:
           path: frontend/dist
 
   deploy:
-    runs-on: [ self-hosted, prod]
+    runs-on: [self-hosted, prod]
     needs: build-and-upload
 
     if: github.event.pull_request.merged
@@ -63,7 +66,7 @@ jobs:
 
         uses: 8398a7/action-slack@v3
         with:
-          mention: 'here'
+          mention: "here"
           if_mention: always
           status: ${{ job.status }}
           fields: workflow,job,commit,message,ref,author,took

diff --git a/.github/workflows/fe-pull-request.yml b/.github/workflows/fe-pull-request.yml
@@ -3,7 +3,7 @@ name: Frontend CI For Test Validation
 on:
   # pull request open과 reopen 시 실행한다.
   pull_request:
-    branches: [main, develop-FE]
+    branches: [main, develop-FE-2]
     paths: frontend/**
 
 defaults:

diff --git a/frontend/jest.config.js b/frontend/jest.config.js
@@ -1,3 +1,4 @@
 module.exports = {
+  preset: 'ts-jest',
   testEnvironment: 'jsdom',
 };