Skip to content

Commit

Permalink
feat: change default tailwind.config.ts to tailwind.config.js
Browse files Browse the repository at this point in the history
  • Loading branch information
adrian-ub committed Jul 29, 2024
1 parent 4c85f92 commit 3934b13
Show file tree
Hide file tree
Showing 145 changed files with 7 additions and 14,348 deletions.
5 changes: 5 additions & 0 deletions .changeset/nervous-turtles-behave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"shadcn-ng": patch
---

change tailwind.config.ts to tailwind.config.js
2 changes: 1 addition & 1 deletion packages/cli/src/commands/init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export async function promptForConfig(
{
type: "text",
name: "tailwindConfig",
message: `Where is your ${highlight("tailwind.config.ts")} located?`,
message: `Where is your ${highlight("tailwind.config.js")} located?`,
initial: defaultConfig?.tailwind.config ?? DEFAULT_TAILWIND_CONFIG,
},
{
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/utils/get-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const DEFAULT_STYLE = "default";
export const DEFAULT_COMPONENTS = "@/components";
export const DEFAULT_UTILS = "@/lib/utils";
export const DEFAULT_TAILWIND_CSS = "src/styles.css";
export const DEFAULT_TAILWIND_CONFIG = "tailwind.config.ts";
export const DEFAULT_TAILWIND_CONFIG = "tailwind.config.js";
export const DEFAULT_TAILWIND_BASE_COLOR = "slate";

// TODO: Figure out if we want to support all cosmiconfig formats.
Expand Down
160 changes: 0 additions & 160 deletions packages/cli/test/commands/init.test.ts

This file was deleted.

92 changes: 0 additions & 92 deletions packages/cli/test/fixtures/colors/neutral.json

This file was deleted.

92 changes: 0 additions & 92 deletions packages/cli/test/fixtures/colors/slate.json

This file was deleted.

Loading

0 comments on commit 3934b13

Please sign in to comment.