Skip to content

Commit

Permalink
build: panda css 관련 경로 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
minjungw00 committed Nov 13, 2024
1 parent 7ffba4b commit 9e385e4
Show file tree
Hide file tree
Showing 31 changed files with 27 additions and 48 deletions.
1 change: 0 additions & 1 deletion @noctaCrdt/dist/Crdt.d.ts

This file was deleted.

1 change: 0 additions & 1 deletion @noctaCrdt/dist/Crdt.d.ts.map

This file was deleted.

2 changes: 0 additions & 2 deletions @noctaCrdt/dist/Crdt.js

This file was deleted.

1 change: 0 additions & 1 deletion @noctaCrdt/dist/Crdt.js.map

This file was deleted.

1 change: 0 additions & 1 deletion @noctaCrdt/dist/Interfaces.d.ts

This file was deleted.

1 change: 0 additions & 1 deletion @noctaCrdt/dist/Interfaces.d.ts.map

This file was deleted.

2 changes: 0 additions & 2 deletions @noctaCrdt/dist/Interfaces.js

This file was deleted.

1 change: 0 additions & 1 deletion @noctaCrdt/dist/Interfaces.js.map

This file was deleted.

1 change: 0 additions & 1 deletion @noctaCrdt/dist/LinkedList.d.ts

This file was deleted.

1 change: 0 additions & 1 deletion @noctaCrdt/dist/LinkedList.d.ts.map

This file was deleted.

2 changes: 0 additions & 2 deletions @noctaCrdt/dist/LinkedList.js

This file was deleted.

1 change: 0 additions & 1 deletion @noctaCrdt/dist/LinkedList.js.map

This file was deleted.

1 change: 0 additions & 1 deletion @noctaCrdt/dist/Node.d.ts

This file was deleted.

1 change: 0 additions & 1 deletion @noctaCrdt/dist/Node.d.ts.map

This file was deleted.

2 changes: 0 additions & 2 deletions @noctaCrdt/dist/Node.js

This file was deleted.

1 change: 0 additions & 1 deletion @noctaCrdt/dist/Node.js.map

This file was deleted.

1 change: 0 additions & 1 deletion @noctaCrdt/dist/tsconfig.tsbuildinfo

This file was deleted.

8 changes: 5 additions & 3 deletions client/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@ FROM node:20 AS build
WORKDIR /app

# 2. 모노레포 루트에서 필요한 파일 복사
COPY ./package.json ./pnpm-lock.yaml ./pnpm-workspace.yaml ./
COPY ./client/package.json ./client/
COPY . .
# COPY ./package.json ./pnpm-lock.yaml ./pnpm-workspace.yaml ./
# COPY ./client/package.json ./client/panda.config.ts ./client/vite.config.ts ./client/tsconfig.json ./client/
# COPY ./client/src/styles ./client/src/styles
# COPY ./@noctaCrdt/package.json ./@noctaCrdt/

# 3. pnpm 설치 및 의존성 설치
RUN npm install -g pnpm
RUN pnpm install

# 4. 애플리케이션 빌드
COPY . .
RUN pnpm --filter client run build

# 5. 빌드된 정적 파일 준비 (Nginx에서 제공)
Expand Down
16 changes: 8 additions & 8 deletions client/panda.config.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { defineConfig } from "@pandacss/dev";
import { radii } from "@styles/tokens/radii";
import { colors } from "@styles/tokens/color";
import { shadows } from "@styles/tokens/shadow";
import { spacing } from "@styles/tokens/spacing";
import { textStyles } from "@styles/typography";
import { globalStyles } from "@styles/global";
import { glassContainerRecipe } from "@styles/recipes/glassContainerRecipe";
import { sizes } from "@styles/tokens/sizes";
import { radii } from "./src/styles/tokens/radii";
import { colors } from "./src/styles/tokens/color";
import { shadows } from "./src/styles/tokens/shadow";
import { spacing } from "./src/styles/tokens/spacing";
import { sizes } from "./src/styles/tokens/sizes";
import { textStyles } from "./src/styles/typography";
import { globalStyles } from "./src/styles/global";
import { glassContainerRecipe } from "./src/styles/recipes/glassContainerRecipe";

export default defineConfig({
preflight: true,
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/bottomNavigator/BottomNavigator.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Page } from "@src/types/page";
import { motion } from "framer-motion";
import { IconButton } from "@components/button/IconButton";
import { Page } from "src/types/page";
import { animation } from "./BottomNavigator.animation";
import { bottomNavigatorContainer } from "./BottomNavigator.style";

Expand Down
4 changes: 2 additions & 2 deletions client/src/components/sidebar/Sidebar.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useIsSidebarOpen, useSidebarActions } from "@src/stores/useSidebarStore";
import { Page } from "@src/types/page";
import { motion } from "framer-motion";
import { IconButton } from "@components/button/IconButton";
import { useIsSidebarOpen, useSidebarActions } from "src/stores/useSidebarStore";
import { Page } from "src/types/page";
import { MenuButton } from "./MenuButton";
import { PageItem } from "./PageItem";
import { animation, contentVariants, sidebarVariants } from "./Sidebar.animation";
Expand Down
2 changes: 1 addition & 1 deletion client/src/features/page/Page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Page as PageType } from "@src/types/page";
import { motion, AnimatePresence } from "framer-motion";
import { useRef } from "react";
import { Editor } from "@features/editor/Editor";
import { Page as PageType } from "src/types/page";
import { pageAnimation, resizeHandleAnimation } from "./Page.animation";
import { pageContainer, pageHeader, resizeHandle } from "./Page.style";

Expand Down
4 changes: 2 additions & 2 deletions client/src/features/page/hooks/usePage.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useIsSidebarOpen } from "@src/stores/useSidebarStore";
import { Position, Size } from "@src/types/page";
import { useEffect, useState } from "react";
import { PAGE, SIDE_BAR } from "@constants/size";
import { SPACING } from "@constants/spacing";
import { useIsSidebarOpen } from "src/stores/useSidebarStore";
import { Position, Size } from "src/types/page";

const PADDING = SPACING.MEDIUM * 2;

Expand Down
2 changes: 1 addition & 1 deletion client/src/features/workSpace/hooks/usePagesManage.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Page } from "@src/types/page";
import { useState } from "react";
import { Page } from "src/types/page";

interface usePagesManageProps {
pages: Page[];
Expand Down
2 changes: 1 addition & 1 deletion client/src/styles/tokens/color.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { COLOR } from "src/constants/color";
import { COLOR } from "@constants/color";

export const colors = {
white: {
Expand Down
2 changes: 1 addition & 1 deletion client/src/styles/tokens/sizes.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SIDE_BAR } from "src/constants/size";
import { SIDE_BAR } from "@constants/size";

export const sizes = {
sidebar: {
Expand Down
2 changes: 1 addition & 1 deletion client/src/styles/tokens/spacing.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SPACING } from "src/constants/spacing";
import { SPACING } from "@constants/spacing";

export const spacing = {
sm: { value: `${SPACING.SMALL}px` },
Expand Down
1 change: 1 addition & 0 deletions client/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"types": ["vite/client"],
"baseUrl": ".",
"paths": {
"@src/*": ["src/*"],
"@styled-system/*": ["styled-system/*"],
"@components/*": ["src/components/*"],
"@assets/*": ["src/assets/*"],
Expand Down
6 changes: 1 addition & 5 deletions client/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,5 @@ import tsconfigPaths from "vite-tsconfig-paths";

export default defineConfig({
plugins: [react(), tsconfigPaths()],
resolve: {
alias: {
"@noctaCrdt": path.resolve(__dirname, "../@noctaCrdt"),
},
},
resolve: { alias: { "@noctaCrdt": path.resolve(__dirname, "../@noctaCrdt") } },
});
2 changes: 1 addition & 1 deletion pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
packages:
- "client"
- "server"
- "@noctaCrdt"
- "./@noctaCrdt"
1 change: 1 addition & 0 deletions server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ WORKDIR /app
# 2. 모노레포 루트에서 필요한 파일 복사
COPY ./package.json ./pnpm-lock.yaml ./pnpm-workspace.yaml ./
COPY ./server/package.json ./server/
COPY ./@noctaCrdt/package.json ./@noctaCrdt/

# 3. pnpm 설치 및 의존성 설치
RUN npm install -g pnpm
Expand Down

0 comments on commit 9e385e4

Please sign in to comment.