Skip to content

Commit

Permalink
Merge branch 'canary' of https://github.com/nextui-org/nextui into ca…
Browse files Browse the repository at this point in the history
…nary
  • Loading branch information
1amageek committed Dec 12, 2024
2 parents 5e2da7c + 77206bc commit 215eb51
Show file tree
Hide file tree
Showing 234 changed files with 5,287 additions and 4,534 deletions.
5 changes: 5 additions & 0 deletions .changeset/clever-teachers-live.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/shared-utils": patch
---

fix process is not defined
7 changes: 7 additions & 0 deletions .changeset/famous-avocados-run.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@nextui-org/checkbox": patch
"@nextui-org/switch": patch
"@nextui-org/radio": patch
---

bump `@nextui-org/theme` in peerDependencies
5 changes: 5 additions & 0 deletions .changeset/twelve-ducks-thank.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/system-rsc": patch
---

Fix data type returned by the extendVariants function (#4269)
13 changes: 11 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,18 @@ jobs:
run: pnpm test

- name: Build
run: pnpm build
id: build
continue-on-error: false
# Custom turbo build failure information
run: |
pnpm build || {
echo "Turbo build failed with exit code $?"
exit 1
}
- name: Create Release Pull Request or Publish to NPM
# Run only if the build is successful
if: steps.build.outcome == 'success'
id: changesets
uses: changesets/action@v1
with:
Expand All @@ -43,7 +52,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Create canary release
if: steps.changesets.outputs.published != 'true'
if: steps.build.outcome == 'success' && steps.changesets.outputs.published != 'true'
timeout-minutes: 15
run: |
git checkout canary
Expand Down
6 changes: 3 additions & 3 deletions apps/docs/app/examples/table/custom-styles/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -360,9 +360,9 @@ export default function Page() {
</Button>
</DropdownTrigger>
<DropdownMenu>
<DropdownItem>View</DropdownItem>
<DropdownItem>Edit</DropdownItem>
<DropdownItem>Delete</DropdownItem>
<DropdownItem key="view">View</DropdownItem>
<DropdownItem key="edit">Edit</DropdownItem>
<DropdownItem key="delete">Delete</DropdownItem>
</DropdownMenu>
</Dropdown>
</div>
Expand Down
6 changes: 3 additions & 3 deletions apps/docs/app/examples/table/use-case/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -352,9 +352,9 @@ export default function Page() {
</Button>
</DropdownTrigger>
<DropdownMenu>
<DropdownItem>View</DropdownItem>
<DropdownItem>Edit</DropdownItem>
<DropdownItem>Delete</DropdownItem>
<DropdownItem key="view">View</DropdownItem>
<DropdownItem key="edit">Edit</DropdownItem>
<DropdownItem key="delete">Delete</DropdownItem>
</DropdownMenu>
</Dropdown>
</div>
Expand Down
20 changes: 17 additions & 3 deletions apps/docs/components/mdx-components.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,20 @@ const Link = ({href, children}: {href?: string; children?: React.ReactNode}) =>
);
};

const InlineCodeChip = ({children}: {children?: React.ReactNode}) => {
const InlineCodeChip = ({
children,
className,
}: {
children?: React.ReactNode;
className?: string;
}) => {
return (
<InlineCode className="before:hidden after:hidden text-tiny rounded-md text-default-600 bg-default-100 dark:bg-default-100/80 px-1.5 py-0.5">
<InlineCode
className={clsx(
"before:hidden after:hidden text-tiny rounded-md text-default-600 bg-default-100 dark:bg-default-100/80 px-1.5 py-0.5",
className,
)}
>
{children}
</InlineCode>
);
Expand All @@ -218,6 +229,7 @@ interface APITableProps {
attribute: string;
type: string;
description: string;
deprecated?: boolean;
default?: string;
}[];
}
Expand All @@ -237,7 +249,9 @@ export const APITable: React.FC<APITableProps> = ({data}) => {
{data.map((item, index) => (
<TableRow key={index} className="[&>td]:px-2 [&>td]:py-1.5 [&>td]:first:pt-4">
<TableCell className="flex items-center gap-1 font-mono text-small whitespace-nowrap">
<InlineCodeChip>{item.attribute}</InlineCodeChip>
<InlineCodeChip className={item.deprecated ? "line-through" : ""}>
{item.attribute}
</InlineCodeChip>
{item.description && (
<>
{/* Desktop tooltip */}
Expand Down
8 changes: 4 additions & 4 deletions apps/docs/config/github-info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"stars": { "raw": 22002, "formatted": "22K" },
"forks": 1536,
"subscribers": 85,
"openIssues": 433
"stars": { "raw": 22226, "formatted": "22.2K" },
"forks": 1566,
"subscribers": 83,
"openIssues": 406
}
Loading

0 comments on commit 215eb51

Please sign in to comment.