Skip to content

Commit

Permalink
Merge pull request #14 from team-Ollie/8-deploy-test
Browse files Browse the repository at this point in the history
chore: Git Action을 활용한 CICD
  • Loading branch information
iOdiO89 authored Jun 23, 2024
2 parents 53dc2d4 + c449d13 commit 0396c64
Show file tree
Hide file tree
Showing 6 changed files with 321 additions and 363 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"es6": true,
"node": true
},
"parser": "babel-eslint",
"parser": "@babel/eslint-parser",
"extends": [
"eslint:recommended",
"plugin:react/recommended",
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/nextjs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ name: Deploy WeCare Website
on:
# Runs on pushes targeting the default branch
push:
branches: ["8-deploy-test"]
branches: ["deploy"]
pull_request:
branches: ["deploy"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand Down Expand Up @@ -75,6 +77,8 @@ jobs:
run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }}
- name: Build with Next.js
run: ${{ steps.detect-package-manager.outputs.runner }} next build
- name: Export with Next.js
run: ${{ steps.detect-package-manager.outputs.runner }} next export
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
Expand Down
14 changes: 0 additions & 14 deletions netlify.toml

This file was deleted.

10 changes: 3 additions & 7 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/** @type {import('next').NextConfig} */

const nextConfig = {
images: {
domains: ["image.tmdb.org"],
unoptimized: true,
},
webpack: (config) => {
config.module.rules.push({
Expand All @@ -14,12 +15,7 @@ const nextConfig = {
compiler: {
styledComponents: true,
},
eslint: {
ignoreDuringBuilds: true,
},
typescript: {
ignoreBuildErrors: true,
},
output: "export",
};

module.exports = nextConfig;
16 changes: 6 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
"name": "wecare-fe",
"version": "0.1.0",
"private": true,
"homepage": "https://team-ollie.github.io/WeCare-FE/home/",
"scripts": {
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint"
"lint": "next lint",
"export": "next export"
},
"dependencies": {
"@netlify/plugin-nextjs": "^5.3.3",
"@babel/eslint-parser": "^7.24.7",
"@svgr/webpack": "^8.1.0",
"@tanstack/eslint-plugin-query": "^5.35.6",
"@tanstack/react-query": "^5.40.1",
Expand All @@ -18,6 +20,7 @@
"axios": "^1.6.2",
"embla-carousel-autoplay": "^8.1.3",
"embla-carousel-react": "^8.1.3",
"gh-pages": "^6.1.1",
"jotai": "^2.8.3",
"lottie-web": "^5.12.2",
"next": "12.3.4",
Expand All @@ -33,19 +36,12 @@
"tailwindcss": "^3.4.3"
},
"devDependencies": {
"@types/gh-pages": "^6",
"@types/node": "20.14.2",
"@types/react": "18.3.3",
"@types/react-modal": "^3",
"babel-eslint": "^10.1.0",
"eslint": "8.54.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-next": "14.0.3",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.9.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.34.3",
"eslint-plugin-react-hooks": "^4.6.2",
"typescript": "5.4.5"
},
"packageManager": "[email protected]"
Expand Down
Loading

0 comments on commit 0396c64

Please sign in to comment.