issue #231 refactor: design system version refactoring

teamWaggle · Apr 18, 2024 · 01e17f5 · 01e17f5
1 parent dd2c73d
commit 01e17f5
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     },
     "scripts": {
         "dev": "yarn workspace waggle-service dev",
-        "build:design-system": "yarn workspace waggle-design-system publish:npm",
+        "build:design-system": "yarn workspace waggle-design-system build",
         "build:waggle-service": "yarn workspace waggle-service build",
         "preview:waggle-service": "yarn workspace waggle-service preview",
         "lint": "eslint ./packages/*/src/**/*.{ts,tsx,js,jsx}",

diff --git a/packages/waggle-design-system/vite.config.ts b/packages/waggle-design-system/vite.config.ts
@@ -12,7 +12,7 @@ export default defineConfig({
   build: {
     lib: {
       entry: path.resolve(__dirname, "src/index.tsx"),
-      name: "waggle-desin-system",
+      name: "waggle-design-system",
       formats: ["es", "cjs"],
       fileName: (format) => `index.${format}.js`,
     },

diff --git a/packages/waggle-service/package.json b/packages/waggle-service/package.json
@@ -32,7 +32,7 @@
     "recoil": "^0.7.7",
     "styled-components": "^6.1.1",
     "vite-plugin-svgr": "^4.1.0",
-    "waggle-design-system": "^1.4.7",
+    "waggle-design-system": "workspace:^",
     "yup": "^1.4.0"
   },
   "devDependencies": {

diff --git a/packages/waggle-service/src/components/Header/Header.tsx b/packages/waggle-service/src/components/Header/Header.tsx
@@ -4,8 +4,7 @@ import { useRecoilValue } from "recoil";
 import Logo from "@/assets/svg/logo.svg?react";
 import NotiIcon from "@/assets/svg/ic-header-noti.svg?react";
 
-import { Flex } from "@/components/common";
-import { Text } from "waggle-design-system";
+import { Flex, Text } from "@/components/common";
 import LogInMenu from "@/components/Header/LogInMenu/LogInMenu";
 import LoginModal from "@/components/Login/LoginModal/LoginModal";
 

diff --git a/packages/waggle-service/src/components/Team/TeamSchedule/TeamSchedule.tsx b/packages/waggle-service/src/components/Team/TeamSchedule/TeamSchedule.tsx
@@ -29,7 +29,6 @@ import {
   teamScheduleSearchButtonStyle,
   teamScheduleTitleStyle,
 } from "@/components/Team/TeamSchedule/TeamSchedule.style";
-import { Skeleton } from "waggle-design-system";
 
 const TeamSchedule = () => {
   const teamId = useParamsTeamId();
@@ -64,7 +63,6 @@ const TeamSchedule = () => {
     <>
       {isMember ? (
         <>
-          <Skeleton />
           <Flex css={teamScheduleBoxStyle}>
             <Flex style={{ alignItems: "center", gap: "16px" }}>
               <Heading size="xLarge" css={teamScheduleTitleStyle}>

diff --git a/packages/waggle-service/src/main.tsx b/packages/waggle-service/src/main.tsx
@@ -2,7 +2,9 @@ import React, { Suspense } from "react";
 import ReactDOM from "react-dom/client";
 import { toast } from "react-toastify";
 
-import { Global, ThemeProvider } from "@emotion/react";
+import { Global } from "@emotion/react";
+
+import { WaggleProvider } from "waggle-design-system";
 
 import { RecoilRoot } from "recoil";
 
@@ -13,7 +15,6 @@ import ModalRoot from "@/components/common/Design/Modal/ModalRoot";
 import AppRouter from "@/router/AppRouter";
 
 import { GlobalStyle } from "@/styles/GlobalStyle";
-import { Theme } from "@/styles/Theme";
 
 const queryClient = new QueryClient({
   defaultOptions: {
@@ -35,13 +36,13 @@ ReactDOM.createRoot(document.getElementById("root")!).render(
   <React.StrictMode>
     <QueryClientProvider client={queryClient}>
       <RecoilRoot>
-        <ThemeProvider theme={Theme}>
+        <WaggleProvider>
           <Suspense fallback={<div></div>}>
             <Global styles={GlobalStyle} />
             <ModalRoot></ModalRoot>
             <AppRouter />
           </Suspense>
-        </ThemeProvider>
+        </WaggleProvider>
       </RecoilRoot>
       <ReactQueryDevtools initialIsOpen={true} />
     </QueryClientProvider>

diff --git a/yarn.lock b/yarn.lock
@@ -18722,7 +18722,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"waggle-design-system@npm:^1.4.7, waggle-design-system@workspace:packages/waggle-design-system":
+"waggle-design-system@workspace:^, waggle-design-system@workspace:packages/waggle-design-system":
   version: 0.0.0-use.local
   resolution: "waggle-design-system@workspace:packages/waggle-design-system"
   dependencies:
@@ -18835,7 +18835,7 @@ __metadata:
     vite-plugin-svgr: "npm:^4.1.0"
     vite-tsconfig-paths: "npm:^4.2.1"
     vitest: "npm:^1.3.1"
-    waggle-design-system: "npm:^1.4.7"
+    waggle-design-system: "workspace:^"
     yup: "npm:^1.4.0"
   languageName: unknown
   linkType: soft