Skip to content

Commit b272dc2

Browse files
committed
fix: conflict 해결 후 오류 수정
1 parent ceea339 commit b272dc2

7 files changed

Lines changed: 8 additions & 138 deletions

File tree

apps/extension/src/index.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
@import "@linkyboard/tailwind-config/tailwind-config.css";
1+
@source "../../../packages/components/src/**/*.{ts,tsx}";
2+
3+
@import "@linkyboard/tailwind-config";
24

35
@layer base {
46
body {

apps/extension/src/utils/cookie.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { errorToast } from "./toast";
1+
import { errorToast } from "@linkyboard/utils";
22

33
const baseUrl = import.meta.env.VITE_API_BASE_URL;
44

apps/web/package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
"@linkyboard/utils": "workspace:*",
1414
"@linkyboard/components": "workspace:*",
1515
"@hookform/resolvers": "^5.2.1",
16-
"@linkyboard/components": "workspace:*",
17-
"@linkyboard/hooks": "workspace:*",
18-
"@linkyboard/utils": "workspace:*",
1916
"@next/third-parties": "^15.5.4",
2017
"@tanstack/react-query": "^5.84.1",
2118
"@tiptap/extension-code-block": "^3.1.0",

apps/web/postcss.config.mjs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import { postcssConfig } from "@linkyboard/tailwind-config/postcss";
2+
3+
export default postcssConfig;

packages/components/src/style.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/tailwind-config/tailwind-config.css

Lines changed: 0 additions & 129 deletions
This file was deleted.

pnpm-lock.yaml

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)