Skip to content

Commit

Permalink
[공통] - 워크스페이스 패키지명 수정 (#62)
Browse files Browse the repository at this point in the history
* refactor: 패키지 폴더명 수정

- FE는 client로 수정
- BE는 server로 수정

* chore: concurrently 설치 후 서버와 클라이언트 동시 실행 스크립트 추가
  • Loading branch information
dooohun authored Nov 14, 2024
1 parent 46bfc11 commit 056cc41
Show file tree
Hide file tree
Showing 147 changed files with 741 additions and 683 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/backend-ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches:
- 'main'
paths:
- 'packages/BE/**'
- 'packages/server/**'
workflow_dispatch:

jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/frontend-ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches:
- 'develop'
paths:
- 'packages/FE/**'
- 'packages/client/**'
workflow_dispatch:

jobs:
Expand All @@ -21,7 +21,7 @@ jobs:
with:
node-version: '22.9.0'

- name: FE 의존성 설치
- name: client 의존성 설치
run: yarn install

# e2e 테스트 추가 후 설정 예정
Expand Down
1,267 changes: 647 additions & 620 deletions .pnp.cjs

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions Dockerfile.be
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ COPY ./yarn.lock ./
RUN corepack enable
RUN yarn install

WORKDIR /app/packages/BE
WORKDIR /app/packages/server

COPY ./packages/BE .
COPY ./packages/server .

RUN yarn install

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.fe
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ COPY packages ./packages
RUN yarn install

# FE 프로젝트 빌드
WORKDIR /app/packages/FE
WORKDIR /app/packages/client
RUN yarn build

# 실행 스테이지
Expand Down
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
"packages/*"
],
"scripts": {
"dev": "yarn dev:FE",
"dev:FE": "yarn workspace client run dev"
"start": "concurrently \"yarn start:server \" \"yarn dev:client\"",
"dev:client": "yarn workspace client run dev",
"start:server": "yarn workspace server run start"
},
"devDependencies": {
"@types/jest": "^29.5.14",
"@typescript-eslint/eslint-plugin": "^8.12.2",
"@typescript-eslint/parser": "^8.12.2",
"concurrently": "^9.1.0",
"eslint": "^9.14.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-prettier": "^9.1.0",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/BE/package.json → packages/server/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "BE",
"name": "server",
"packageManager": "[email protected]",
"scripts": {
"start": "ts-node src/main.ts",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ import { join } from 'path';
@Module({
imports: [
ConfigModule.forRoot({
envFilePath: './packages/BE/.env',
isGlobal: true,
load: [databaseConfig],
validationSchema: Joi.object({
MYSQL_HOST: Joi.string().required(),
MYSQL_PORT: Joi.number().required(),
MYSQL_USER: Joi.string().required(),
MYSQL_PASSWORD: Joi.string().required(),
MYSQL_DATABASE: Joi.string().required(),
}),
envFilePath: './packages/server/.env',
isGlobal: true,
load: [databaseConfig],
validationSchema: Joi.object({
MYSQL_HOST: Joi.string().required(),
MYSQL_PORT: Joi.number().required(),
MYSQL_USER: Joi.string().required(),
MYSQL_PASSWORD: Joi.string().required(),
MYSQL_DATABASE: Joi.string().required(),
}),
}),
],
providers: [MysqlConfigService],
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions packages/shared/config/c.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
const t = 5;
1 change: 1 addition & 0 deletions packages/shared/constants/b.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
const b = 5;
1 change: 1 addition & 0 deletions packages/shared/types/a.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
const a = 5;
114 changes: 70 additions & 44 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3491,46 +3491,6 @@ __metadata:
languageName: node
linkType: hard

"BE@workspace:packages/BE":
version: 0.0.0-use.local
resolution: "BE@workspace:packages/BE"
dependencies:
"@nestjs-modules/ioredis": "npm:^2.0.2"
"@nestjs/cli": "npm:^10.4.5"
"@nestjs/common": "npm:^10.4.6"
"@nestjs/config": "npm:^3.3.0"
"@nestjs/core": "npm:^10.4.6"
"@nestjs/microservices": "npm:^10.4.7"
"@nestjs/platform-express": "npm:^10.4.6"
"@nestjs/platform-socket.io": "npm:^10.4.7"
"@nestjs/testing": "npm:^10.4.6"
"@nestjs/typeorm": "npm:^10.0.2"
"@nestjs/websockets": "npm:^10.4.7"
"@types/express": "npm:^5.0.0"
"@types/jest": "npm:^29.5.14"
"@types/joi": "npm:^17.2.3"
"@types/node": "npm:^22.8.7"
"@types/supertest": "npm:^6.0.2"
class-transformer: "npm:^0.5.1"
class-validator: "npm:^0.14.1"
dotenv: "npm:^16.4.5"
ioredis: "npm:^5.4.1"
jest: "npm:^29.7.0"
joi: "npm:^17.13.3"
mysql2: "npm:^3.11.3"
redis: "npm:^4.7.0"
reflect-metadata: "npm:^0.2.2"
rxjs: "npm:^7.8.1"
socket.io: "npm:^4.8.1"
supertest: "npm:^7.0.0"
ts-jest: "npm:^29.2.5"
ts-node: "npm:^10.9.2"
ts-node-dev: "npm:^2.0.0"
tslib: "npm:^2.8.1"
typeorm: "npm:^0.3.20"
languageName: unknown
linkType: soft

"abbrev@npm:^2.0.0":
version: 2.0.0
resolution: "abbrev@npm:2.0.0"
Expand Down Expand Up @@ -4452,9 +4412,9 @@ __metadata:
languageName: node
linkType: hard

"client@workspace:packages/FE":
"client@workspace:packages/client":
version: 0.0.0-use.local
resolution: "client@workspace:packages/FE"
resolution: "client@workspace:packages/client"
dependencies:
"@chromatic-com/storybook": "npm:^3.2.2"
"@eslint/js": "npm:^9.13.0"
Expand Down Expand Up @@ -4620,6 +4580,24 @@ __metadata:
languageName: node
linkType: hard

"concurrently@npm:^9.1.0":
version: 9.1.0
resolution: "concurrently@npm:9.1.0"
dependencies:
chalk: "npm:^4.1.2"
lodash: "npm:^4.17.21"
rxjs: "npm:^7.8.1"
shell-quote: "npm:^1.8.1"
supports-color: "npm:^8.1.1"
tree-kill: "npm:^1.2.2"
yargs: "npm:^17.7.2"
bin:
conc: dist/bin/concurrently.js
concurrently: dist/bin/concurrently.js
checksum: 10c0/f2f42f94dde508bfbaf47b5ac654db9e8a4bf07d3d7b6267dd058ae6f362eec677ae7c8ede398d081e5fd0d1de5811dc9a53e57d3f1f68e72ac6459db9e0896b
languageName: node
linkType: hard

"confusing-browser-globals@npm:^1.0.10":
version: 1.0.11
resolution: "confusing-browser-globals@npm:1.0.11"
Expand Down Expand Up @@ -9340,6 +9318,46 @@ __metadata:
languageName: node
linkType: hard

"server@workspace:packages/server":
version: 0.0.0-use.local
resolution: "server@workspace:packages/server"
dependencies:
"@nestjs-modules/ioredis": "npm:^2.0.2"
"@nestjs/cli": "npm:^10.4.5"
"@nestjs/common": "npm:^10.4.6"
"@nestjs/config": "npm:^3.3.0"
"@nestjs/core": "npm:^10.4.6"
"@nestjs/microservices": "npm:^10.4.7"
"@nestjs/platform-express": "npm:^10.4.6"
"@nestjs/platform-socket.io": "npm:^10.4.7"
"@nestjs/testing": "npm:^10.4.6"
"@nestjs/typeorm": "npm:^10.0.2"
"@nestjs/websockets": "npm:^10.4.7"
"@types/express": "npm:^5.0.0"
"@types/jest": "npm:^29.5.14"
"@types/joi": "npm:^17.2.3"
"@types/node": "npm:^22.8.7"
"@types/supertest": "npm:^6.0.2"
class-transformer: "npm:^0.5.1"
class-validator: "npm:^0.14.1"
dotenv: "npm:^16.4.5"
ioredis: "npm:^5.4.1"
jest: "npm:^29.7.0"
joi: "npm:^17.13.3"
mysql2: "npm:^3.11.3"
redis: "npm:^4.7.0"
reflect-metadata: "npm:^0.2.2"
rxjs: "npm:^7.8.1"
socket.io: "npm:^4.8.1"
supertest: "npm:^7.0.0"
ts-jest: "npm:^29.2.5"
ts-node: "npm:^10.9.2"
ts-node-dev: "npm:^2.0.0"
tslib: "npm:^2.8.1"
typeorm: "npm:^0.3.20"
languageName: unknown
linkType: soft

"set-function-length@npm:^1.2.1":
version: 1.2.2
resolution: "set-function-length@npm:1.2.2"
Expand Down Expand Up @@ -9389,6 +9407,13 @@ __metadata:
languageName: node
linkType: hard

"shell-quote@npm:^1.8.1":
version: 1.8.1
resolution: "shell-quote@npm:1.8.1"
checksum: 10c0/8cec6fd827bad74d0a49347057d40dfea1e01f12a6123bf82c4649f3ef152fc2bc6d6176e6376bffcd205d9d0ccb4f1f9acae889384d20baff92186f01ea455a
languageName: node
linkType: hard

"side-channel@npm:^1.0.6":
version: 1.0.6
resolution: "side-channel@npm:1.0.6"
Expand Down Expand Up @@ -9811,7 +9836,7 @@ __metadata:
languageName: node
linkType: hard

"supports-color@npm:^8.0.0":
"supports-color@npm:^8.0.0, supports-color@npm:^8.1.1":
version: 8.1.1
resolution: "supports-color@npm:8.1.1"
dependencies:
Expand Down Expand Up @@ -10930,7 +10955,7 @@ __metadata:
languageName: node
linkType: hard

"yargs@npm:^17.3.1, yargs@npm:^17.6.2":
"yargs@npm:^17.3.1, yargs@npm:^17.6.2, yargs@npm:^17.7.2":
version: 17.7.2
resolution: "yargs@npm:17.7.2"
dependencies:
Expand Down Expand Up @@ -10966,6 +10991,7 @@ __metadata:
"@types/jest": "npm:^29.5.14"
"@typescript-eslint/eslint-plugin": "npm:^8.12.2"
"@typescript-eslint/parser": "npm:^8.12.2"
concurrently: "npm:^9.1.0"
eslint: "npm:^9.14.0"
eslint-config-airbnb: "npm:^19.0.4"
eslint-config-prettier: "npm:^9.1.0"
Expand Down

0 comments on commit 056cc41

Please sign in to comment.