Skip to content

Commit 950515b

Browse files
committed
fix: wrong typescript aliases
1 parent 540fd02 commit 950515b

File tree

7 files changed

+11
-9
lines changed

7 files changed

+11
-9
lines changed

apps/docs/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"extends": "tsconfig/nextjs.json",
33
"compilerOptions": {
4-
"plugins": [{ "name": "next" }]
4+
"plugins": [{ "name": "next" }],
5+
"baseUrl": "."
56
},
67
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
78
"exclude": ["node_modules"]

apps/web/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"extends": "tsconfig/nextjs.json",
33
"compilerOptions": {
4-
"plugins": [{ "name": "next" }]
4+
"plugins": [{ "name": "next" }],
5+
"baseUrl": "."
56
},
67
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
78
"exclude": ["node_modules"]

packages/tsconfig/nextjs.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
"resolveJsonModule": true,
1616
"strict": false,
1717
"target": "es5",
18-
"baseUrl": ".",
1918
"paths": {
20-
"@/*": ["../../packages/ui/*"]
19+
"@/*": ["./*"],
20+
"@ui/*": ["../../packages/ui/*"]
2121
}
2222
},
2323
"include": ["src", "next-env.d.ts"],

packages/ui/components.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"cssVariables": true
1010
},
1111
"aliases": {
12-
"components": "@/components",
13-
"utils": "@/lib/utils"
12+
"components": "@ui/components",
13+
"utils": "@ui/lib/utils"
1414
}
1515
}

packages/ui/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 "@/lib/utils"
5+
import { cn } from "@ui/lib/utils"
66

77
const buttonVariants = cva(
88
"inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",

packages/ui/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
import * as React from 'react';
22

33
// Components export
4-
export * from '@/components/button';
4+
export * from '@ui/components/button';

packages/ui/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"compilerOptions": {
66
"baseUrl": ".",
77
"paths": {
8-
"@/*": ["./*"]
8+
"@ui/*": ["./*"]
99
}
1010
}
1111
}

0 commit comments

Comments
 (0)