diff --git a/.changeset/ten-gifts-check.md b/.changeset/ten-gifts-check.md deleted file mode 100644 index c0cb133c59..0000000000 --- a/.changeset/ten-gifts-check.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"shadcn": patch ---- - -handling of apply directive inside utility diff --git a/.github/dependabot.yml b/.github/dependabot.yml index aff82a102d..126a5b5f83 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,3 +4,43 @@ updates: directory: "/" schedule: interval: "weekly" + - package-ecosystem: "npm" + directory: "/templates/astro-app" + schedule: + interval: "weekly" + - package-ecosystem: "npm" + directory: "/templates/astro-monorepo" + schedule: + interval: "weekly" + - package-ecosystem: "npm" + directory: "/templates/next-app" + schedule: + interval: "weekly" + - package-ecosystem: "npm" + directory: "/templates/next-monorepo" + schedule: + interval: "weekly" + - package-ecosystem: "npm" + directory: "/templates/react-router-app" + schedule: + interval: "weekly" + - package-ecosystem: "npm" + directory: "/templates/react-router-monorepo" + schedule: + interval: "weekly" + - package-ecosystem: "npm" + directory: "/templates/start-app" + schedule: + interval: "weekly" + - package-ecosystem: "npm" + directory: "/templates/start-monorepo" + schedule: + interval: "weekly" + - package-ecosystem: "npm" + directory: "/templates/vite-app" + schedule: + interval: "weekly" + - package-ecosystem: "npm" + directory: "/templates/vite-monorepo" + schedule: + interval: "weekly" diff --git a/.github/workflows/code-check.yml b/.github/workflows/code-check.yml index bfe6fc4525..61255b4d9f 100644 --- a/.github/workflows/code-check.yml +++ b/.github/workflows/code-check.yml @@ -77,6 +77,9 @@ jobs: - name: Install dependencies run: pnpm install + - name: Build packages + run: pnpm --filter=shadcn build + - run: pnpm format:check tsc: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 11bc27bb0d..3441008c1d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,7 @@ jobs: - name: Install Node.js uses: actions/setup-node@v3 with: - node-version: 20 + node-version: 22 - uses: pnpm/action-setup@v4 name: Install pnpm @@ -42,7 +42,4 @@ jobs: - name: Install dependencies run: pnpm install - - name: Build packages - run: pnpm build --filter=shadcn - - run: pnpm test diff --git a/.gitignore b/.gitignore index aecf372c10..c040854c9f 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ tsconfig.tsbuildinfo .notes .playwright-mcp +shadcn-workspace diff --git a/apps/v4/app/(app)/(root)/components/appearance-settings.tsx b/apps/v4/app/(app)/(root)/components/appearance-settings.tsx index 0b4c570bf3..216c89f3e0 100644 --- a/apps/v4/app/(app)/(root)/components/appearance-settings.tsx +++ b/apps/v4/app/(app)/(root)/components/appearance-settings.tsx @@ -93,7 +93,7 @@ export function AppearanceSettings() { value={gpuCount} onChange={handleGpuInputChange} size={3} - className="h-7 !w-14 font-mono" + className="h-7 w-14! font-mono" maxLength={3} /> -
+
{children}
diff --git a/apps/v4/app/(app)/colors/layout.tsx b/apps/v4/app/(app)/colors/layout.tsx index 58f99ba6a9..0ee9850ca4 100644 --- a/apps/v4/app/(app)/colors/layout.tsx +++ b/apps/v4/app/(app)/colors/layout.tsx @@ -62,7 +62,7 @@ export default function ColorsLayout({
- +
diff --git a/apps/v4/app/(app)/docs/[[...slug]]/page.tsx b/apps/v4/app/(app)/docs/[[...slug]]/page.tsx index d531d3acad..85bcfe394f 100644 --- a/apps/v4/app/(app)/docs/[[...slug]]/page.tsx +++ b/apps/v4/app/(app)/docs/[[...slug]]/page.tsx @@ -134,7 +134,7 @@ export default async function Page(props: {
{doc.description && ( -

+

{doc.description}

)} diff --git a/apps/v4/app/(app)/docs/changelog/page.tsx b/apps/v4/app/(app)/docs/changelog/page.tsx index eb32733b67..7d08c2be93 100644 --- a/apps/v4/app/(app)/docs/changelog/page.tsx +++ b/apps/v4/app/(app)/docs/changelog/page.tsx @@ -57,7 +57,7 @@ export default function ChangelogPage() { -

+

Latest updates and announcements.

@@ -91,9 +91,9 @@ export default function ChangelogPage() { - + {date} {title} @@ -110,7 +110,7 @@ export default function ChangelogPage() {
-

+

On This Page

{latestPages.map((page) => { @@ -119,7 +119,7 @@ export default function ChangelogPage() { {data.title} @@ -128,7 +128,7 @@ export default function ChangelogPage() { {olderPages.length > 0 && ( More Updates diff --git a/apps/v4/app/(app)/docs/layout.tsx b/apps/v4/app/(app)/docs/layout.tsx index 465f5d0665..b87d79c099 100644 --- a/apps/v4/app/(app)/docs/layout.tsx +++ b/apps/v4/app/(app)/docs/layout.tsx @@ -10,7 +10,7 @@ export default function DocsLayout({ return (
Login -
-
+
+
Create an account -

+

Enter your email below to create your account

diff --git a/apps/v4/app/(app)/examples/dashboard/components/app-sidebar.tsx b/apps/v4/app/(app)/examples/dashboard/components/app-sidebar.tsx index c4de911927..e9a10c0f2a 100644 --- a/apps/v4/app/(app)/examples/dashboard/components/app-sidebar.tsx +++ b/apps/v4/app/(app)/examples/dashboard/components/app-sidebar.tsx @@ -159,10 +159,10 @@ export function AppSidebar({ ...props }: React.ComponentProps) { - + Acme Inc. diff --git a/apps/v4/app/(app)/examples/dashboard/components/chart-area-interactive.tsx b/apps/v4/app/(app)/examples/dashboard/components/chart-area-interactive.tsx index 9e9880fbcf..6c3359d836 100644 --- a/apps/v4/app/(app)/examples/dashboard/components/chart-area-interactive.tsx +++ b/apps/v4/app/(app)/examples/dashboard/components/chart-area-interactive.tsx @@ -174,7 +174,7 @@ export function ChartAreaInteractive() { value={timeRange} onValueChange={setTimeRange} variant="outline" - className="hidden *:data-[slot=toggle-group-item]:!px-4 @[767px]/card:flex" + className="hidden *:data-[slot=toggle-group-item]:px-4! @[767px]/card:flex" > Last 3 months Last 30 days diff --git a/apps/v4/app/(app)/examples/dashboard/components/data-table.tsx b/apps/v4/app/(app)/examples/dashboard/components/data-table.tsx index 7a039c8161..def0a697fe 100644 --- a/apps/v4/app/(app)/examples/dashboard/components/data-table.tsx +++ b/apps/v4/app/(app)/examples/dashboard/components/data-table.tsx @@ -128,9 +128,9 @@ function DragHandle({ id }: { id: number }) { {...listeners} variant="ghost" size="icon" - className="text-muted-foreground size-7 hover:bg-transparent" + className="size-7 text-muted-foreground hover:bg-transparent" > - + Drag to reorder ) @@ -181,7 +181,7 @@ const columns: ColumnDef>[] = [ header: "Section Type", cell: ({ row }) => (
- + {row.original.type}
@@ -191,7 +191,7 @@ const columns: ColumnDef>[] = [ accessorKey: "status", header: "Status", cell: ({ row }) => ( - + {row.original.status === "Done" ? ( ) : ( @@ -219,7 +219,7 @@ const columns: ColumnDef>[] = [ Target @@ -244,7 +244,7 @@ const columns: ColumnDef>[] = [ Limit @@ -292,7 +292,7 @@ const columns: ColumnDef>[] = [