Skip to content

Commit e1e173f

Browse files
authored
chore: develop to main (#289)
chore: 레포지토리 최적화 작업, ahhachul.com 프로젝트를 vite로 전환 chore: develop to main
1 parent 6f7f96a commit e1e173f

File tree

1,145 files changed

+27997
-65758
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,145 files changed

+27997
-65758
lines changed

.eslintignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

.eslintrc.js

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,51 @@
11
module.exports = {
2+
root: true,
23
env: {
34
browser: true,
4-
es2021: true,
5+
es6: true,
56
node: true,
7+
commonjs: true,
68
},
7-
root: true,
89
parser: '@typescript-eslint/parser',
910
parserOptions: {
10-
project: './tsconfig.eslint.json',
11-
tsconfigRootDir: __dirname,
11+
ecmaFeatures: {
12+
jsx: true,
13+
},
14+
sourceType: 'module',
15+
ecmaVersion: 2021,
1216
},
17+
plugins: ['unused-imports', 'compat'],
1318
extends: [
1419
'eslint:recommended',
1520
'plugin:react/recommended',
16-
'plugin:storybook/recommended',
17-
'prettier',
21+
'plugin:react/jsx-runtime',
22+
'plugin:@typescript-eslint/recommended',
23+
'plugin:@typescript-eslint/eslint-recommended',
24+
'plugin:compat/recommended',
25+
'plugin:prettier/recommended',
1826
],
19-
plugins: ['react', '@typescript-eslint', 'jsx-a11y'],
2027
rules: {
21-
'react/react-in-jsx-scope': 'off',
22-
'comma-dangle': 'off',
23-
'react/display-name': 'off',
24-
'no-empty-function': 'off',
25-
'@typescript-eslint/no-empty-function': ['off'],
26-
'@typescript-eslint/no-unused-vars': [
27-
'error',
28-
{
29-
argsIgnorePattern: '^_',
30-
},
31-
],
32-
'storybook/prefer-pascal-case': 'off',
33-
'react-hooks/exhaustive-deps': 'off',
28+
'compat/compat': 'error',
29+
'@typescript-eslint/ban-ts-comment': ['error', { 'ts-ignore': 'allow-with-description' }],
30+
'@typescript-eslint/explicit-module-boundary-types': 'off',
31+
'@typescript-eslint/no-empty-function': 'off',
32+
'@typescript-eslint/no-explicit-any': 'off',
33+
'@typescript-eslint/no-non-null-assertion': 'off',
34+
'@typescript-eslint/no-var-requires': 'off',
35+
'prefer-const': 'off',
36+
'no-async-promise-executor': 'off',
37+
'no-prototype-builtins': 'off',
38+
'unused-imports/no-unused-imports': 'error',
39+
// emotion css props
40+
'react/no-unknown-property': ['error', { ignore: ['css'] }],
3441
},
3542
overrides: [
3643
{
37-
files: ['*.ts', '*.tsx'],
44+
files: ['*.js'],
3845
rules: {
39-
'no-undef': 'off',
40-
'react/no-unknown-property': 0,
41-
'@typescript-eslint/no-var-requires': 'off',
42-
'no-unused-vars': 'off',
43-
'react/prop-types': 'off',
44-
semi: ['error', 'always'],
46+
'@typescript-eslint/explicit-function-return-type': 'off',
4547
},
4648
},
4749
],
48-
ignorePatterns: ['**/dist/**/*', '.eslintrc.js'],
49-
settings: {
50-
'import/resolver': {
51-
typescript: {},
52-
},
53-
},
50+
ignorePatterns: ['node_modules', 'dist', 'build', 'out', 'coverage'],
5451
};
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: 'Install dependencies with pnpm'
2+
3+
runs:
4+
using: 'composite'
5+
6+
steps:
7+
- name: Setup pnpm
8+
uses: pnpm/action-setup@v2
9+
with:
10+
version: 8 # or your preferred version
11+
12+
- name: Get pnpm store directory
13+
id: pnpm-cache
14+
shell: bash
15+
run: |
16+
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
17+
18+
- name: Restore pnpm cache
19+
uses: actions/cache@v3
20+
with:
21+
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
22+
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
23+
restore-keys: |
24+
${{ runner.os }}-pnpm-store-
25+
26+
- name: Install dependencies
27+
shell: bash
28+
run: pnpm install

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

Lines changed: 0 additions & 33 deletions
This file was deleted.

.github/workflows/ci-app.yml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
name: CI-APP
2+
on:
3+
pull_request:
4+
paths:
5+
- 'services/ahhachul.com/**'
6+
- 'package.json'
7+
- 'pnpm-lock.yaml'
8+
- '.github/workflows/**'
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
14+
env:
15+
DEFAULT_NODE_VERSION: '20.13.0'
16+
17+
jobs:
18+
ci:
19+
runs-on: ubuntu-latest
20+
timeout-minutes: 15
21+
22+
steps:
23+
- name: Check out the repository
24+
uses: actions/checkout@v4
25+
with:
26+
fetch-depth: 0
27+
28+
- name: Set up Node.js
29+
uses: actions/setup-node@v3
30+
timeout-minutes: 1
31+
with:
32+
node-version: ${{ env.DEFAULT_NODE_VERSION }}
33+
34+
- name: Install dependencies
35+
uses: ./.github/actions/pnpm-install
36+
timeout-minutes: 5
37+
38+
- name: Create .env file for ahhachul.com
39+
timeout-minutes: 1
40+
run: |
41+
echo '${{ secrets.DEV_REACT_APP_CONFIG }}' > config.json
42+
cat config.json | jq -r 'to_entries[] | "\(.key)=\(.value)"' >> services/ahhachul.com/.env
43+
44+
- name: Lint ahhachul.com
45+
timeout-minutes: 3
46+
run: pnpm lint:app
47+
continue-on-error: false
48+
49+
- name: Test ahhachul.com
50+
if: success()
51+
timeout-minutes: 5
52+
run: pnpm test:app
53+
continue-on-error: false
54+
55+
- name: Build ahhachul.com
56+
if: success()
57+
timeout-minutes: 5
58+
run: pnpm build:app
59+
continue-on-error: false
60+
61+
- name: Upload test results
62+
if: always()
63+
uses: actions/upload-artifact@v3
64+
with:
65+
name: test-results
66+
path: services/ahhachul.com/coverage
67+
retention-days: 7

.github/workflows/ci-one-app.yml

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
name: CI-ONE-APP
2+
on:
3+
pull_request:
4+
paths:
5+
- 'services/one-app/**'
6+
- 'package.json'
7+
- 'pnpm-lock.yaml'
8+
- '.github/workflows/**'
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
14+
env:
15+
DEFAULT_NODE_VERSION: '20.13.0'
16+
17+
jobs:
18+
ci:
19+
runs-on: ubuntu-latest
20+
timeout-minutes: 15
21+
22+
steps:
23+
- name: Check out the repository
24+
uses: actions/checkout@v4
25+
with:
26+
fetch-depth: 0
27+
28+
- name: Set up Node.js
29+
uses: actions/setup-node@v3
30+
timeout-minutes: 1
31+
with:
32+
node-version: ${{ env.DEFAULT_NODE_VERSION }}
33+
34+
- name: Install dependencies
35+
uses: ./.github/actions/pnpm-install
36+
timeout-minutes: 5
37+
38+
- name: Create .env file for one-app
39+
timeout-minutes: 1
40+
run: |
41+
echo '${{ secrets.DEV_ONE_APP_CONFIG }}' | jq -r 'to_entries | .[] | "\(.key)=\(.value)"' > services/one-app/.env
42+
43+
- name: TypeScript Compilation Check
44+
timeout-minutes: 3
45+
working-directory: ./services/one-app
46+
run: pnpm tsc --noEmit --project tsconfig.json
47+
continue-on-error: false
48+
49+
- name: Lint one-app
50+
timeout-minutes: 3
51+
run: pnpm lint:one-app
52+
continue-on-error: false
53+
54+
- name: Test one-app
55+
if: success()
56+
timeout-minutes: 5
57+
run: pnpm test:one-app
58+
continue-on-error: false
59+
60+
- name: Build one-app
61+
if: success()
62+
timeout-minutes: 5
63+
run: pnpm build:one-app
64+
continue-on-error: false
65+
66+
- name: Upload test results
67+
if: always()
68+
uses: actions/upload-artifact@v3
69+
with:
70+
name: one-app-test-results
71+
path: services/one-app/coverage
72+
retention-days: 7

.github/workflows/ci.yml

Lines changed: 0 additions & 46 deletions
This file was deleted.

.github/workflows/deploy-app.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- 'services/ahhachul.com/**'
99

1010
env:
11-
DEFAULT_NODE_VERSION: '20.14.0'
11+
DEFAULT_NODE_VERSION: '20.13.0'
1212

1313
jobs:
1414
deploy:
@@ -31,15 +31,15 @@ jobs:
3131
node-version: ${{ env.DEFAULT_NODE_VERSION }}
3232

3333
- name: Install dependencies
34-
uses: ./.github/actions/yarn-install
34+
uses: ./.github/actions/pnpm-install
3535

3636
- name: Create .env file for ahhachul.com
3737
run: |
3838
echo '${{ secrets.DEV_REACT_APP_CONFIG }}' > config.json
3939
cat config.json | jq -r 'to_entries[] | "\(.key)=\(.value)"' >> services/ahhachul.com/.env
4040
4141
- name: Build ahhachul.com
42-
run: yarn build:app
42+
run: pnpm build:app
4343

4444
- name: Configure AWS credentials
4545
uses: aws-actions/configure-aws-credentials@v2
@@ -51,7 +51,7 @@ jobs:
5151
- name: Remove Existing Files & Upload New to S3
5252
run: |
5353
aws s3 rm s3://${S3_BUCKET_NAME} --recursive
54-
aws s3 cp services/ahhachul.com/build s3://${S3_BUCKET_NAME} --recursive
54+
aws s3 cp services/ahhachul.com/dist s3://${S3_BUCKET_NAME} --recursive
5555
5656
- name: Invalidate CloudFront
5757
run: aws cloudfront create-invalidation --distribution-id ${{ env.AWS_CLOUDFRONT_DISTRIBUTION_ID_USER }} --paths "/*"

0 commit comments

Comments
 (0)