Skip to content

Commit

Permalink
fix(shadcn): components.json utils alias
Browse files Browse the repository at this point in the history
  • Loading branch information
Tobbe committed Oct 28, 2024
1 parent f0cff7e commit 6777f4e
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions packages/shadcn/src/utils/transformers/transform-import.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,24 @@ export const transformImport: Transformer = async ({ sourceFile, config }) => {
const importDeclarations = sourceFile.getImportDeclarations()

for (const importDeclaration of importDeclarations) {
const moduleSpecifier = updateImportAliases(
importDeclaration.getModuleSpecifierValue(),
config
)

importDeclaration.setModuleSpecifier(moduleSpecifier)
const moduleSpecifierValue = importDeclaration.getModuleSpecifierValue()

// Replace `import { cn } from "@/lib/utils"`
if (moduleSpecifier == "@/lib/utils") {
if (moduleSpecifierValue === "@/lib/utils") {
const namedImports = importDeclaration.getNamedImports()
const cnImport = namedImports.find((i) => i.getName() === "cn")

if (cnImport) {
importDeclaration.setModuleSpecifier(
moduleSpecifier.replace(/^@\/lib\/utils/, config.aliases.utils)
moduleSpecifierValue.replace(/^@\/lib\/utils/, config.aliases.utils)
)

continue
}
}

const moduleSpecifier = updateImportAliases(moduleSpecifierValue, config)
importDeclaration.setModuleSpecifier(moduleSpecifier)
}

return sourceFile
Expand Down

0 comments on commit 6777f4e

Please sign in to comment.