Skip to content

Commit fb36ca4

Browse files
Tobbeshadcn
Tobbe
and
shadcn
authored
fix(transform): Support aliases that are longer than one character (#5678)
* fix(transform): Support aliases that are longer than one character * feat(shadcn): update handling of aliases * chore: add changeset --------- Co-authored-by: shadcn <[email protected]>
1 parent 824a35a commit fb36ca4

File tree

17 files changed

+287
-3
lines changed

17 files changed

+287
-3
lines changed

‎.changeset/fifty-rivers-sparkle.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"shadcn": patch
3+
---
4+
5+
support aliases longer than one char

‎packages/shadcn/src/utils/get-project-info.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ export async function getTsConfigAliasPrefix(cwd: string) {
165165
paths.includes("./app/*") ||
166166
paths.includes("./resources/js/*") // Laravel.
167167
) {
168-
return alias.at(0) ?? null
168+
return alias.replace(/\/\*$/, "") ?? null
169169
}
170170
}
171171

‎packages/shadcn/src/utils/transformers/transform-import.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ function updateImportAliases(moduleSpecifier: string, config: Config) {
3535

3636
// Not a registry import.
3737
if (!moduleSpecifier.startsWith("@/registry/")) {
38-
// We fix the alias an return.
39-
const alias = config.aliases.components.charAt(0)
38+
// We fix the alias and return.
39+
const alias = config.aliases.components.split("/")[0]
4040
return moduleSpecifier.replace(/^@\//, `${alias}/`)
4141
}
4242

‎packages/shadcn/test/fixtures/frameworks/next-app-custom-alias/app/favicon.ico‎

25.3 KB
Binary file not shown.

‎packages/shadcn/test/fixtures/frameworks/next-app-custom-alias/app/globals.css‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
@tailwind base;
2+
@tailwind components;
3+
@tailwind utilities;
4+
5+
:root {
6+
--foreground-rgb: 0, 0, 0;
7+
--background-start-rgb: 214, 219, 220;
8+
--background-end-rgb: 255, 255, 255;
9+
}
10+
11+
@media (prefers-color-scheme: dark) {
12+
:root {
13+
--foreground-rgb: 255, 255, 255;
14+
--background-start-rgb: 0, 0, 0;
15+
--background-end-rgb: 0, 0, 0;
16+
}
17+
}
18+
19+
body {
20+
color: rgb(var(--foreground-rgb));
21+
background: linear-gradient(
22+
to bottom,
23+
transparent,
24+
rgb(var(--background-end-rgb))
25+
)
26+
rgb(var(--background-start-rgb));
27+
}

‎packages/shadcn/test/fixtures/frameworks/next-app-custom-alias/app/layout.tsx‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import './globals.css'
2+
import type { Metadata } from 'next'
3+
import { Inter } from 'next/font/google'
4+
5+
const inter = Inter({ subsets: ['latin'] })
6+
7+
export const metadata: Metadata = {
8+
title: 'Create Next App',
9+
description: 'Generated by create next app',
10+
}
11+
12+
export default function RootLayout({
13+
children,
14+
}: {
15+
children: React.ReactNode
16+
}) {
17+
return (
18+
<html lang="en">
19+
<body className={inter.className}>{children}</body>
20+
</html>
21+
)
22+
}

‎packages/shadcn/test/fixtures/frameworks/next-app-custom-alias/app/other.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
body {
2+
background-color: red;
3+
}

‎packages/shadcn/test/fixtures/frameworks/next-app-custom-alias/app/page.tsx‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
import Image from 'next/image'
2+
3+
export default function Home() {
4+
return (
5+
<main className="flex min-h-screen flex-col items-center justify-between p-24">
6+
<div className="z-10 max-w-5xl w-full items-center justify-between font-mono text-sm lg:flex">
7+
<p className="fixed left-0 top-0 flex w-full justify-center border-b border-gray-300 bg-gradient-to-b from-zinc-200 pb-6 pt-8 backdrop-blur-2xl dark:border-neutral-800 dark:bg-zinc-800/30 dark:from-inherit lg:static lg:w-auto lg:rounded-xl lg:border lg:bg-gray-200 lg:p-4 lg:dark:bg-zinc-800/30">
8+
Get started by editing&nbsp;
9+
<code className="font-mono font-bold">app/page.tsx</code>
10+
</p>
11+
<div className="fixed bottom-0 left-0 flex h-48 w-full items-end justify-center bg-gradient-to-t from-white via-white dark:from-black dark:via-black lg:static lg:h-auto lg:w-auto lg:bg-none">
12+
<a
13+
className="pointer-events-none flex place-items-center gap-2 p-8 lg:pointer-events-auto lg:p-0"
14+
href="https://vercel.com?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
15+
target="_blank"
16+
rel="noopener noreferrer"
17+
>
18+
By{' '}
19+
<Image
20+
src="/vercel.svg"
21+
alt="Vercel Logo"
22+
className="dark:invert"
23+
width={100}
24+
height={24}
25+
priority
26+
/>
27+
</a>
28+
</div>
29+
</div>
30+
31+
<div className="relative flex place-items-center before:absolute before:h-[300px] before:w-[480px] before:-translate-x-1/2 before:rounded-full before:bg-gradient-radial before:from-white before:to-transparent before:blur-2xl before:content-[''] after:absolute after:-z-20 after:h-[180px] after:w-[240px] after:translate-x-1/3 after:bg-gradient-conic after:from-sky-200 after:via-blue-200 after:blur-2xl after:content-[''] before:dark:bg-gradient-to-br before:dark:from-transparent before:dark:to-blue-700 before:dark:opacity-10 after:dark:from-sky-900 after:dark:via-[#0141ff] after:dark:opacity-40 before:lg:h-[360px] z-[-1]">
32+
<Image
33+
className="relative dark:drop-shadow-[0_0_0.3rem_#ffffff70] dark:invert"
34+
src="/next.svg"
35+
alt="Next.js Logo"
36+
width={180}
37+
height={37}
38+
priority
39+
/>
40+
</div>
41+
42+
<div className="mb-32 grid text-center lg:max-w-5xl lg:w-full lg:mb-0 lg:grid-cols-4 lg:text-left">
43+
<a
44+
href="https://nextjs.org/docs?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
45+
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
46+
target="_blank"
47+
rel="noopener noreferrer"
48+
>
49+
<h2 className={`mb-3 text-2xl font-semibold`}>
50+
Docs{' '}
51+
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
52+
-&gt;
53+
</span>
54+
</h2>
55+
<p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
56+
Find in-depth information about Next.js features and API.
57+
</p>
58+
</a>
59+
60+
<a
61+
href="https://nextjs.org/learn?utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app"
62+
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
63+
target="_blank"
64+
rel="noopener noreferrer"
65+
>
66+
<h2 className={`mb-3 text-2xl font-semibold`}>
67+
Learn{' '}
68+
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
69+
-&gt;
70+
</span>
71+
</h2>
72+
<p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
73+
Learn about Next.js in an interactive course with&nbsp;quizzes!
74+
</p>
75+
</a>
76+
77+
<a
78+
href="https://vercel.com/templates?framework=next.js&utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
79+
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
80+
target="_blank"
81+
rel="noopener noreferrer"
82+
>
83+
<h2 className={`mb-3 text-2xl font-semibold`}>
84+
Templates{' '}
85+
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
86+
-&gt;
87+
</span>
88+
</h2>
89+
<p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
90+
Explore the Next.js 13 playground.
91+
</p>
92+
</a>
93+
94+
<a
95+
href="https://vercel.com/new?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
96+
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
97+
target="_blank"
98+
rel="noopener noreferrer"
99+
>
100+
<h2 className={`mb-3 text-2xl font-semibold`}>
101+
Deploy{' '}
102+
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
103+
-&gt;
104+
</span>
105+
</h2>
106+
<p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
107+
Instantly deploy your Next.js site to a shareable URL with Vercel.
108+
</p>
109+
</a>
110+
</div>
111+
</main>
112+
)
113+
}

‎packages/shadcn/test/fixtures/frameworks/next-app-custom-alias/next-env.d.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/// <reference types="next" />
2+
/// <reference types="next/image-types/global" />
3+
4+
// NOTE: This file should not be edited
5+
// see https://nextjs.org/docs/basic-features/typescript for more information.

‎packages/shadcn/test/fixtures/frameworks/next-app-custom-alias/next.config.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/** @type {import('next').NextConfig} */
2+
const nextConfig = {}
3+
4+
module.exports = nextConfig

0 commit comments

Comments
 (0)