Skip to content

Commit

Permalink
Merge branch 'canary' into fix/eng-1718-inert-value
Browse files Browse the repository at this point in the history
  • Loading branch information
wingkwong committed Jan 25, 2025
2 parents 2716f06 + cddba82 commit 13a5d41
Show file tree
Hide file tree
Showing 1,512 changed files with 28,261 additions and 25,421 deletions.
6 changes: 3 additions & 3 deletions .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "https://unpkg.com/@changesets/config@2.3.0/schema.json",
"changelog": [
"@changesets/changelog-github",
{ "repo": "nextui-org/nextui" }
{ "repo": "heroui-inc/heroui" }
],
"commit": false,
"fixed": [],
Expand All @@ -14,7 +14,7 @@
"onlyUpdatePeerDependentsWhenOutOfRange": true
},
"ignore": [
"@nextui-org/docs",
"@nextui-org/storybook"
"@heroui/docs",
"@heroui/storybook"
]
}
5 changes: 5 additions & 0 deletions .changeset/dry-kings-add.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@heroui/shared-utils": patch
---

update brand name
5 changes: 0 additions & 5 deletions .changeset/fair-pigs-tap.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/hip-ligers-rhyme.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/honest-waves-camp.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/little-apricots-rhyme.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/neat-badgers-beam.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/new-cups-tan.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/new-ladybugs-shop.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/nice-books-yell.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/nine-snails-sniff.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@heroui/calendar": patch
---

function components cannot be given refs in calendar (#4606)
5 changes: 0 additions & 5 deletions .changeset/ninety-lobsters-deliver.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/quiet-geese-lay.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/rich-moles-compare.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/small-kids-walk.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/tame-glasses-press.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/witty-goats-trade.md

This file was deleted.

2 changes: 1 addition & 1 deletion .commitlintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const conventional = require("@commitlint/config-conventional");
module.exports = {
extends: ["@commitlint/config-conventional"],
plugins: ["commitlint-plugin-function-rules"],
helpUrl: "https://github.com/nextui-org/nextui/blob/main/CONTRIBUTING.md#commit-convention",
helpUrl: "https://github.com/heroui-inc/heroui/blob/main/CONTRIBUTING.md#commit-convention",
rules: {
...conventional.rules,
"type-enum": [
Expand Down
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: jrgarciadev
open_collective: nextui
open_collective: heroui
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
Expand Down
20 changes: 10 additions & 10 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,28 @@ body:
value: |
Thank you for reporting an issue :pray:.
This issue tracker is for reporting bugs found in [NextUI github repository](https://github.com/nextui-org/nextui/)
This issue tracker is for reporting bugs found in [HeroUI github repository](https://github.com/heroui-inc/heroui/)
If you have a question about how to achieve something and are struggling, please post a question
inside of either of the following places:
- NextUI's [Discussion's tab](https://github.com/nextui-org/nextui/discussions)
- NextUI's [Discord channel](https://discord.gg/9b6yyZKmH4)
- HeroUI's [Discussion's tab](https://github.com/heroui-inc/heroui/discussions)
- HeroUI's [Discord channel](https://discord.gg/9b6yyZKmH4)
Before submitting a new bug/issue, please check the links below to see if there is a solution or question posted there already:
- NextUI's [Issue's tab](https://github.com/nextui-org/nextui/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc)
- NextUI's [closed issues tab](https://github.com/nextui-org/nextui/issues?q=is%3Aissue+sort%3Aupdated-desc+is%3Aclosed)
- NextUI's [Discussions tab](https://github.com/nextui-org/nextui/discussions)
- HeroUI's [Issue's tab](https://github.com/heroui-inc/heroui/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc)
- HeroUI's [closed issues tab](https://github.com/heroui-inc/heroui/issues?q=is%3Aissue+sort%3Aupdated-desc+is%3Aclosed)
- HeroUI's [Discussions tab](https://github.com/heroui-inc/heroui/discussions)
The more information you fill in, the better the community can help you.
- type: input
id: version
attributes:
label: NextUI Version
label: HeroUI Version
description: |
Please provide the version of NextUI you are using.
Please provide the version of HeroUI you are using.
You can find the version number in the package.json file.
For global installation, please state the version only. (e.g. 2.4.2)
For individual installation, please state the package name as well. (e.g. @nextui-org/button@2.0.34)
For individual installation, please state the package name as well. (e.g. @heroui/button@2.0.34)
placeholder: ex. 2.4.2
validations:
required: true
Expand All @@ -47,7 +47,7 @@ body:
description: |
Which website or app were you using when the bug happened?
Note:
- Your bug will may get fixed much faster if we can run your code and it doesn't have dependencies other than the `@nextui-org/react` npm package.
- Your bug will may get fixed much faster if we can run your code and it doesn't have dependencies other than the `@heroui/react` npm package.
- To create a shareable code example you can use Stackblitz (https://stackblitz.com/). Please no localhost URLs.
- Please read these tips for providing a minimal example: https://stackoverflow.com/help/mcve.
placeholder: |
Expand Down
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
blank_issues_enabled: true
contact_links:
- name: 🤔 Long question or ideas?
url: https://github.com/nextui-org/nextui/discussions
url: https://github.com/heroui-inc/heroui/discussions
about: Ask long-form questions and discuss ideas.
- name: 💬 Discord Community Chat
url: https://discord.gg/9b6yyZKmH4
about: Ask quick questions or simply chat on the `NextUI` community Discord server.
about: Ask quick questions or simply chat on the `HeroUI` community Discord server.
- name: 💬 New Updates (X)
url: https://x.com/getnextui
about: Link to our X account if you want to follow us and stay up to date with NextUI news
url: https://x.com/hero_ui
about: Link to our X account if you want to follow us and stay up to date with HeroUI news
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Feature request
title: "[Feature Request] YOUR_FEATURE_TITLE_HERE_REPLACE_ME"
labels: [feature request]
description: |
💡 Suggest an idea for the `NextUI` project
💡 Suggest an idea for the `HeroUI` project
Examples
- propose a new component
- improve an exiting component
Expand All @@ -12,7 +12,7 @@ body:
attributes:
value: |
This issue form is for requesting features only! For example, requesting a new component, behavior ... etc
If you want to report a bug, please use the [bug report form](https://github.com/nextui-org/nextui/issues/new?assignees=&labels=&template=bug_report.yml).
If you want to report a bug, please use the [bug report form](https://github.com/heroui-inc/heroui/issues/new?assignees=&labels=&template=bug_report.yml).
- type: textarea
validations:
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ Closes # <!-- Github issue # here -->

## 💣 Is this a breaking change (Yes/No):

<!-- If Yes, please describe the impact and migration path for existing NextUI users. -->
<!-- If Yes, please describe the impact and migration path for existing HeroUI users. -->

## 📝 Additional Information
2 changes: 1 addition & 1 deletion .npmrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ enable-pre-post-scripts=true
public-hoist-pattern[]=*tailwind-variants*
public-hoist-pattern[]=*framer-motion*
public-hoist-pattern[]=*@react-aria/interactions*
public-hoist-pattern[]=*@nextui-org/theme*
public-hoist-pattern[]=*@heroui/theme*
24 changes: 12 additions & 12 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Next UI Contributing Guide
# HeroUI Contributing Guide

Hello!, I am very excited that you are interested in contributing with Next UI. However, before submitting your contribution, be sure to take a moment and read the following guidelines.
Hello!, I am very excited that you are interested in contributing with HeroUI. However, before submitting your contribution, be sure to take a moment and read the following guidelines.

- [Code of Conduct](https://github.com/jrgarciadev/nextui/blob/main/CODE_OF_CONDUCT.md)
- [Code of Conduct](https://github.com/heroui-inc/heroui/blob/canary/CODE_OF_CONDUCT.md)
- [Extraction request guidelines](#pull-request-guidelines)
- [Development Setup](#development-setup)
- [Tests](#tests)
Expand Down Expand Up @@ -71,15 +71,15 @@ https://www.conventionalcommits.org/ or check out the

### Steps to PR

1. Fork of the nextui repository and clone your fork
1. Fork of the heroui repository and clone your fork

2. Create a new branch out of the `canary` branch. We follow the convention
`[type/scope]`. For example `fix/dropdown-hook` or `docs/menu-typo`. `type`
can be either `docs`, `fix`, `feat`, `build`, or any other conventional
commit type. `scope` is just a short id that describes the scope of work.

3. Make and commit your changes following the
[commit convention](https://github.com/nextui-org/nextui/blob/main/CONTRIBUTING.md#commit-convention).
[commit convention](https://github.com/heroui-inc/heroui/blob/main/CONTRIBUTING.md#commit-convention).
As you canary, you can run `pnpm build --filter=<module>` and
`pnpm test packages/<module>/<pkg>` e.g. `pnpm build --filter=avatar & pnpm test packages/components/avatar` to make sure everything works as expected.

Expand Down Expand Up @@ -117,7 +117,7 @@ We use [Turbo Repo](https://turborepo.org/) for the project management.
2. If you will be working on the components source code, you can use the following command to start the webpack dev server:

```bash
## Start the dev babel server of NextUI core components
## Start the dev babel server of HeroUI core components
pnpm dev

## optional
Expand All @@ -128,10 +128,10 @@ pnpm dev:docs ## this will start the documentation next.js server and it will au
```

- If you will be working just on the documentation source code / mdx, you can use the following commands to build
NextUI components and then start the next.js dev server:
HeroUI components and then start the next.js dev server:

```bash
## Build NextUI source components
## Build HeroUI source components
pnpm build

## Start the next.js documentation dev server
Expand Down Expand Up @@ -210,21 +210,21 @@ When making a visual change, please provide screenshots
and/or screencasts of the proposed change. This will help us to understand the
desired change easier.

Until NextUI has a stable release new components will be created only for the core team.
Until HeroUI has a stable release new components will be created only for the core team.

## Documentation

Please update the docs with any API changes, the code and docs should always be in sync.

The main documentation lives in the `apps/docs/content` folder, the project uses MDX and all `NextUI` are already imported.
The main documentation lives in the `apps/docs/content` folder, the project uses MDX and all `HeroUI` are already imported.

## Breaking changes

Breaking changes should be accompanied with deprecations of removed functionality. The deprecated APIs themselves should not be removed until the minor release after that.

## Becoming a maintainer

If you are interested in becoming a NextUI maintainer, start by
If you are interested in becoming a HeroUI maintainer, start by
reviewing issues and pull requests. Answer questions for those in need of
troubleshooting. Join us in the
[Discord Community](https://discord.gg/9b6yyZKmH4) chat room.
Expand All @@ -235,7 +235,7 @@ best to be proactive in reaching out to those that are already helping out.
GitHub by default does not publicly state that you are a member of the
organization. Please feel free to change that setting for yourself so others
will know who's helping out. That can be configured on the [organization
list](https://github.com/orgs/nextui-org/people) page.
list](https://github.com/orgs/heroui-inc/people) page.

Being a maintainer is not an obligation. You can help when you have time and be
less active when you don't. If you get a new job and get busy, that's alright.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 Next UI
Copyright (c) 2020 Next UI Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
1 change: 1 addition & 0 deletions apps/docs/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ NEXT_PUBLIC_ALGOLIA_SEARCH_API_KEY=

# Vercel Env (is used for skipping typescript check)
IS_VERCEL_ENV=true/false
IGNORE_BUILD_CHECKS=true/false
IS_PREVIEW=true/false
ANALYZE_BUNDLE=true/false

Expand Down
5 changes: 5 additions & 0 deletions apps/docs/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,15 @@ yarn-error.log*
# local env files
.env
.env*.local
.dev.vars

# vercel
.vercel

# typescript
*.tsbuildinfo
next-env.d.ts

# cloudflare
.wrangler
/.open-next/
2 changes: 1 addition & 1 deletion apps/docs/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 Next UI
Copyright (c) 2020 Next UI Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/app/blog/[slug]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type {Metadata} from "next";

import {notFound} from "next/navigation";
import {allBlogPosts} from "contentlayer2/generated";
import {Link, User} from "@nextui-org/react";
import {Link, User} from "@heroui/react";
import {format, parseISO} from "date-fns";
import NextLink from "next/link";
import {Balancer} from "react-wrap-balancer";
Expand Down
4 changes: 2 additions & 2 deletions apps/docs/app/blog/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Image} from "@nextui-org/react";
import {Image} from "@heroui/react";

import {ScriptProviders} from "@/components/scripts/script-providers";

Expand Down Expand Up @@ -33,7 +33,7 @@ export default function DocsLayout({children}: DocsLayoutProps) {
/>
</div>

<ScriptProviders />
<ScriptProviders isKapaEnabled={false} />
</>
);
}
4 changes: 2 additions & 2 deletions apps/docs/app/blog/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ export default function Blog() {
return (
<div className="w-full lg:px-16 mt-12">
<div className="text-center">
<h1 className="mb-2 font-bold text-4xl">NextUI Latest Updates</h1>
<h5 className="text-default-500 text-lg">All the latest news about NextUI.</h5>
<h1 className="mb-2 font-bold text-4xl">HeroUI Latest Updates</h1>
<h5 className="text-default-500 text-lg">All the latest news about HeroUI.</h5>
</div>
<BlogPostList posts={posts} />
</div>
Expand Down
Loading

0 comments on commit 13a5d41

Please sign in to comment.