Skip to content

Commit b3135b8

Browse files
fix: resolve ui package imports and build configuration
1 parent bbe2fbf commit b3135b8

21 files changed

Lines changed: 29 additions & 31 deletions

apps/web/app/(pages)/playground/[projectId]/_components/ChatSection.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useCallback, useEffect, useMemo, useState } from "react";
2-
import { Button } from "@workspace/ui/components/button";
2+
import { Button } from "@workspace/ui";
33
import { ArrowUpRight, Loader2 } from "lucide-react";
44
import { useTheme } from "next-themes";
55
import { FrameMessage } from "@workspace/types";

apps/web/app/(pages)/playground/[projectId]/_components/PlaygroundHeader.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Button } from "@workspace/ui/components/button"
1+
import { Button } from "@workspace/ui"
22
import { BookAIcon, Loader2, Save } from "lucide-react"
33
import { useDesignStore } from '@/store/useDesignStore';
44
import { PlaygroundHeaderProps } from "@workspace/types";

apps/web/app/(pages)/playground/[projectId]/_components/ViewCodeBlock.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
import { Button } from "@workspace/ui/components/button";
2-
import { Card, CardContent, CardHeader, CardTitle } from "@workspace/ui/components/card";
3-
import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, DialogTrigger } from "@workspace/ui/components/dialog";
4-
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@workspace/ui/components/tabs";
1+
import { Button, Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, DialogTrigger } from "@workspace/ui";
52
import { Copy, Check, Download } from "lucide-react";
63
import SyntaxHighlighter from "react-syntax-highlighter";
74
import { prism } from "react-syntax-highlighter/dist/cjs/styles/prism";

apps/web/next.config.mjs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
/** @type {import('next').NextConfig} */
22
const nextConfig = {
3-
transpilePackages: ["@workspace/ui"],
3+
// Remove transpilePackages - it's forcing Next.js to use src files
4+
experimental: {
5+
externalDir: true,
6+
},
47
}
58

6-
export default nextConfig
9+
export default nextConfig

apps/web/tsconfig.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
"baseUrl": ".",
55
"paths": {
66
"@/*": ["./*"],
7-
"@workspace/ui": ["../../packages/ui/src"],
8-
"@workspace/ui/*": ["../../packages/ui/src/*"],
97
"@workspace/types": ["../../packages/types/src"],
108
"@workspace/types/*": ["../../packages/types/src/*"]
119
},

packages/ui/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,9 @@
4343
"exports": {
4444
".": {
4545
"types": "./dist/index.d.ts",
46-
"import": "./dist/index.js"
46+
"import": "./dist/index.js",
47+
"default": "./dist/index.js"
4748
},
48-
"./components/*": "./dist/components/*.js",
49-
"./lib/*": "./dist/lib/*.js",
5049
"./globals.css": "./src/styles/globals.css",
5150
"./postcss.config": "./postcss.config.mjs"
5251
}

packages/ui/src/components/badge.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from "react";
22
import { cva, type VariantProps } from "class-variance-authority";
33

4-
import { cn } from "@workspace/ui/lib/utils";
4+
import { cn } from "../lib/utils.js"
55

66
const badgeVariants = cva(
77
"inline-flex items-center rounded-full border border-transparent px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",

packages/ui/src/components/button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from "react"
22
import { Slot } from "@radix-ui/react-slot"
33
import { cva, type VariantProps } from "class-variance-authority"
44

5-
import { cn } from "@workspace/ui/lib/utils"
5+
import { cn } from "../lib/utils.js"
66

77
const buttonVariants = cva(
88
"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",

packages/ui/src/components/card.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from "react";
2-
import { cn } from "@workspace/ui/lib/utils";
2+
import { cn } from "../lib/utils.js";
33

44
const Card = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
55
({ className, ...props }, ref) => (

packages/ui/src/components/dialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as React from "react"
44
import * as DialogPrimitive from "@radix-ui/react-dialog"
55
import { XIcon } from "lucide-react"
66

7-
import { cn } from "@workspace/ui/lib/utils"
7+
import { cn } from "../lib/utils.js"
88

99
function Dialog({
1010
...props

0 commit comments

Comments
 (0)