fix: styled-components peer 디팬던시 이슈 수정

choooz · Oct 16, 2023 · e966525 · e966525
1 parent 4463025
commit e966525
Show file tree

Hide file tree

Showing 7 changed files with 135 additions and 70 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/apps/jurumarble/package.json b/apps/jurumarble/package.json
@@ -14,6 +14,7 @@
   "dependencies": {
     "@emotion/is-prop-valid": "^1.2.1",
     "@monorepo/hooks": "workspace:*",
+    "@monorepo/ui": "workspace:*",
     "@react-hookz/web": "^23.1.0",
     "@tanstack/react-query": "^4.33.0",
     "@tanstack/react-query-devtools": "^4.33.0",

diff --git a/apps/jurumarble/src/lib/styles/StyledComponents.tsx b/apps/jurumarble/src/lib/styles/StyledComponents.tsx
@@ -2,12 +2,18 @@
 
 import StyledComponentsRegistry from "lib/registory";
 import { PropsWithChildren } from "react";
-import { StyleSheetManager, ThemeProvider } from "styled-components";
+import { ThemeProvider } from "styled-components";
 import { jurumarbleTheme } from "./theme";
-import isPropValid from "@emotion/is-prop-valid";
+import { theme } from "@monorepo/ui";
+
 import GlobalStyles from "./globalStyles";
 
 function StyledComponents({ children }: PropsWithChildren) {
+  const mergedTheme = {
+    ...theme,
+    ...jurumarbleTheme,
+  };
+
   return (
     <StyledComponentsRegistry>
       {/*
@@ -19,7 +25,7 @@ function StyledComponents({ children }: PropsWithChildren) {
           return typeof elementToBeRendered === "string" ? isPropValid(propName) : true;
         }}
       > */}
-      <ThemeProvider theme={jurumarbleTheme}>
+      <ThemeProvider theme={mergedTheme}>
         <>
           <GlobalStyles />
           {children}

diff --git a/...ble/src/lib/styles/styled-components.d.ts → apps/jurumarble/src/lib/styles/styled.d.ts b/...ble/src/lib/styles/styled-components.d.ts → apps/jurumarble/src/lib/styles/styled.d.ts
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -6,17 +6,20 @@
   "main": "index.ts",
   "author": "",
   "license": "ISC",
-  "dependencies": {
-    "@monorepo/hooks": "workspace:*",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-is": "^18.2.0",
-    "styled-components": "^5.3.6"
-  },
   "devDependencies": {
+    "@monorepo/hooks": "workspace:*",
     "@types/node": "20.5.7",
     "@types/react": "18.2.21",
     "@types/styled-components": "^5",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-is": "^18.2.0",
+    "styled-components": "^5.3.6",
     "typescript": "4.9.3"
+  },
+  "peerDependencies": {
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "styled-components": "^5.3.6"
   }
 }
diff --git a/packages/ui/styled-components.d.ts → packages/ui/styled.d.ts b/packages/ui/styled-components.d.ts → packages/ui/styled.d.ts
diff --git a/yarn.lock b/yarn.lock
@@ -1620,6 +1620,7 @@ __metadata:
   dependencies:
     "@emotion/is-prop-valid": ^1.2.1
     "@monorepo/hooks": "workspace:*"
+    "@monorepo/ui": "workspace:*"
     "@react-hookz/web": ^23.1.0
     "@svgr/cli": ^8.0.1
     "@svgr/core": ^8.0.0
@@ -1658,6 +1659,10 @@ __metadata:
     react-is: ^18.2.0
     styled-components: ^5.3.6
     typescript: 4.9.3
+  peerDependencies:
+    react: ^18.2.0
+    react-dom: ^18.2.0
+    styled-components: ^5.3.6
   languageName: unknown
   linkType: soft