Skip to content

Commit

Permalink
Merge branch 'main' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
shadcn committed Jun 22, 2023
2 parents eebd60f + f1de340 commit 38aab07
Show file tree
Hide file tree
Showing 42 changed files with 43 additions and 43 deletions.
4 changes: 2 additions & 2 deletions apps/www/content/docs/changelog.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ I've been working on a new CLI for the past few weeks. It's a complete rewrite.
### `init`

```bash
npx shadcn-ui init
npx shadcn-ui@latest init
```

When you run the `init` command, you will be asked a few questions to configure `components.json`:
Expand Down Expand Up @@ -68,7 +68,7 @@ This means you can now use the CLI with any directory structure including `src`
### `add`

```bash
npx shadcn-ui add
npx shadcn-ui@latest add
```

The `add` command is now much more capable. You can now add UI components but also import more complex components (coming soon).
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/cli.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Options:
Use the `add` command to add components and dependencies to your project.

```bash
npx shadcn-ui add [component]
npx shadcn-ui@latest add [component]
```

You will be presented with a list of components to choose from:
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/accordion.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ radix:
### Command

```bash
npx shadcn-ui add accordion
npx shadcn-ui@latest add accordion
```

### tailwind.config.js
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/alert-dialog.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ radix:
### Command

```bash
npx shadcn-ui add alert-dialog
npx shadcn-ui@latest add alert-dialog
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/alert.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ component: true
### Command

```bash
npx shadcn-ui add alert
npx shadcn-ui@latest add alert
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/aspect-ratio.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ radix:
### Command

```bash
npx shadcn-ui add aspect-ratio
npx shadcn-ui@latest add aspect-ratio
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/avatar.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ radix:
### Command

```bash
npx shadcn-ui add avatar
npx shadcn-ui@latest add avatar
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/badge.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ component: true
### Command

```bash
npx shadcn-ui add badge
npx shadcn-ui@latest add badge
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/button.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ component: true
### Command

```bash
npx shadcn-ui add button
npx shadcn-ui@latest add button
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/calendar.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The `Calendar` component is built on top of [React DayPicker](https://react-day-
### Command

```bash
npx shadcn-ui add calendar
npx shadcn-ui@latest add calendar
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/card.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ component: true
### Command

```bash
npx shadcn-ui add card
npx shadcn-ui@latest add card
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/checkbox.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ radix:
### Command

```bash
npx shadcn-ui add checkbox
npx shadcn-ui@latest add checkbox
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/collapsible.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ radix:
### Command

```bash
npx shadcn-ui add collapsible
npx shadcn-ui@latest add collapsible
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/command.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ The `<Command />` component uses the [`cmdk`](https://cmdk.paco.me) component by
### Command

```bash
npx shadcn-ui add command
npx shadcn-ui@latest add command
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/context-menu.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ radix:
### Command

```bash
npx shadcn-ui add context-menu
npx shadcn-ui@latest add context-menu
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/data-table.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ This guide will show you how to use [TanStack Table](https://tanstack.com/table)
1. Add the `<Table />` component to your project:

```bash
npx shadcn-ui add table
npx shadcn-ui@latest add table
```

2. Add `tanstack/react-table` dependency:
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/dialog.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ radix:
### Command

```bash
npx shadcn-ui add dialog
npx shadcn-ui@latest add dialog
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/dropdown-menu.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ radix:
### Command

```bash
npx shadcn-ui add dropdown-menu
npx shadcn-ui@latest add dropdown-menu
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/form.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const form = useForm()
### Command

```bash
npx shadcn-ui add form
npx shadcn-ui@latest add form
```

</Steps>
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/hover-card.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ radix:
### Command

```bash
npx shadcn-ui add hover-card
npx shadcn-ui@latest add hover-card
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/input.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ component: true
### Command

```bash
npx shadcn-ui add input
npx shadcn-ui@latest add input
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/label.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ radix:
### Command

```bash
npx shadcn-ui add label
npx shadcn-ui@latest add label
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/menubar.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ radix:
### Command

```bash
npx shadcn-ui add menubar
npx shadcn-ui@latest add menubar
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/navigation-menu.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ radix:
### Command

```bash
npx shadcn-ui add navigation-menu
npx shadcn-ui@latest add navigation-menu
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/popover.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ radix:
### Command

```bash
npx shadcn-ui add popover
npx shadcn-ui@latest add popover
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/progress.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ radix:
### Command

```bash
npx shadcn-ui add progress
npx shadcn-ui@latest add progress
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/radio-group.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ radix:
### Command

```bash
npx shadcn-ui add radio-group
npx shadcn-ui@latest add radio-group
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/scroll-area.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ radix:
### Command

```bash
npx shadcn-ui add scroll-area
npx shadcn-ui@latest add scroll-area
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/select.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ radix:
### Command

```bash
npx shadcn-ui add select
npx shadcn-ui@latest add select
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/separator.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ radix:
### CommandMenu

```bash
npx shadcn-ui add separator
npx shadcn-ui@latest add separator
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/sheet.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ radix:
### Command

```bash
npx shadcn-ui add sheet
npx shadcn-ui@latest add sheet
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/skeleton.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ component: true
### Command

```bash
npx shadcn-ui add skeleton
npx shadcn-ui@latest add skeleton
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/slider.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ radix:
### Command

```bash
npx shadcn-ui add slider
npx shadcn-ui@latest add slider
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/switch.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ radix:
### Command

```bash
npx shadcn-ui add switch
npx shadcn-ui@latest add switch
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/table.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ component: true
### Command

```bash
npx shadcn-ui add table
npx shadcn-ui@latest add table
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/tabs.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ radix:
### Command

```bash
npx shadcn-ui add tabs
npx shadcn-ui@latest add tabs
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/textarea.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ component: true
### Command

```bash
npx shadcn-ui add textarea
npx shadcn-ui@latest add textarea
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/toast.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ radix:
### Command

```bash
npx shadcn-ui add toast
npx shadcn-ui@latest add toast
```

### Toaster
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/toggle.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ radix:
### Command

```bash
npx shadcn-ui add toggle
npx shadcn-ui@latest add toggle
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/components/tooltip.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ radix:
### Command

```bash
npx shadcn-ui add tooltip
npx shadcn-ui@latest add tooltip
```

### Usage
Expand Down
2 changes: 1 addition & 1 deletion apps/www/content/docs/installation.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Here's how I structure my app. I use Next.js, but this is not required.
That's it. You can now start adding components to your project.

```bash
npx shadcn-ui add
npx shadcn-ui@latest add
```

## Other frameworks
Expand Down
2 changes: 1 addition & 1 deletion apps/www/public/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"properties": {
"style": {
"type": "string",
"enum": ["default"]
"enum": ["default", "new-york"]
},
"tailwind": {
"type": "object",
Expand Down

0 comments on commit 38aab07

Please sign in to comment.