Merge pull request #114 from boostcampwm-2024/refactor/#108

Refactor/#108 docker 파일 최적화, test 분리

Author: swkim12345

core/package.json

@@ -25,10 +25,7 @@
   },
   "devDependencies": {
     "tsup": "^8.0.0",
-    "@playwright/test": "^1.49.0",
-    "@types/pngjs": "^6.0.5",
-    "pngjs": "^7.0.0",
-    "typescript": "^5.0.0",
-    "vitest": "^2.1.5"
+    "vitest": "^2.1.5",
+    "typescript": "^5.0.0"
   }
 }

docker-build/dev/Dockerfile.server

@@ -13,11 +13,8 @@ COPY pnpm-workspace.yaml package.json pnpm-lock.yaml tsconfig.base.json ./
 COPY core ./core
 COPY server ./server
 
-RUN pnpm install --filter core --frozen-lockfile
-RUN pnpm install --filter server --frozen-lockfile
-
-RUN pnpm --filter @troublepainter/core build
-RUN pnpm --filter server build
+RUN pnpm install --filter core --frozen-lockfile && pnpm --filter @troublepainter/core build
+RUN pnpm install --filter server --frozen-lockfile && pnpm --filter server build
 
 FROM node:22-slim AS production
 WORKDIR /app
@@ -33,8 +30,7 @@ COPY --from=builder /app/server/dist ./server/dist
 COPY --from=builder /app/core/package.json ./core/package.json
 COPY --from=builder /app/core/dist ./core/dist
 
-RUN corepack enable && corepack prepare [email protected] --activate
-RUN pnpm install --prod --filter '!@troublepainter/core'
+RUN corepack enable && corepack prepare [email protected] --activate && pnpm install --prod --no-optional --filter '!@troublepainter/core'
 
 WORKDIR /app/server
 

docker-build/prod/Dockerfile.server

@@ -13,11 +13,8 @@ COPY pnpm-workspace.yaml package.json pnpm-lock.yaml tsconfig.base.json ./
 COPY core ./core
 COPY server ./server
 
-RUN pnpm install --filter core --frozen-lockfile
-RUN pnpm install --filter server --frozen-lockfile
-
-RUN pnpm --filter @troublepainter/core build
-RUN pnpm --filter server build
+RUN pnpm install --filter core --frozen-lockfile && pnpm --filter @troublepainter/core build
+RUN pnpm install --filter server --frozen-lockfile && pnpm --filter server build
 
 FROM node:22-slim AS production
 WORKDIR /app
@@ -33,8 +30,7 @@ COPY --from=builder /app/server/dist ./server/dist
 COPY --from=builder /app/core/package.json ./core/package.json
 COPY --from=builder /app/core/dist ./core/dist
 
-RUN corepack enable && corepack prepare [email protected] --activate
-RUN pnpm install --prod --filter '!@troublepainter/core'
+RUN corepack enable && corepack prepare [email protected] --activate && pnpm install --prod --no-optional --filter '!@troublepainter/core'
 
 WORKDIR /app/server
 

e2e-test/.prettierrc

@@ -0,0 +1,14 @@
+{
+  "printWidth": 120,
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": true,
+  "quoteProps": "as-needed",
+  "trailingComma": "all",
+  "bracketSpacing": true,
+  "arrowParens": "always",
+  "proseWrap": "preserve",
+  "endOfLine": "auto",
+  "embeddedLanguageFormatting": "auto"
+}

server/src/artillery/README.md renamed to e2e-test/artillery/README.md

@@ -1,4 +1,4 @@
-import { test as base, Page, chromium, BrowserContext } from '@playwright/test';
+import { BrowserContext, chromium, Page, test as base } from '@playwright/test';
 import { drawEventData } from './drawing-utils';
 import eventData1 from './drawing-performance/event-data-1.json' assert { type: 'json' };
 import eventData2 from './drawing-performance/event-data-2.json' assert { type: 'json' };