Skip to content

Commit

Permalink
Merge branch 'canary' into feat/eng-363
Browse files Browse the repository at this point in the history
  • Loading branch information
wingkwong committed Jan 19, 2025
2 parents 60fae38 + 103519c commit d9835c0
Show file tree
Hide file tree
Showing 218 changed files with 1,397 additions and 476 deletions.
2 changes: 1 addition & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
"changelog": [
"@changesets/changelog-github",
{ "repo": "frontio-ai/heroui" }
{ "repo": "heroui-inc/heroui" }
],
"commit": false,
"fixed": [],
Expand Down
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/frontio-ai/heroui/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
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ body:
value: |
Thank you for reporting an issue :pray:.
This issue tracker is for reporting bugs found in [HeroUI github repository](https://github.com/frontio-ai/heroui/)
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:
- HeroUI's [Discussion's tab](https://github.com/frontio-ai/heroui/discussions)
- 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:
- HeroUI's [Issue's tab](https://github.com/frontio-ai/heroui/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc)
- HeroUI's [closed issues tab](https://github.com/frontio-ai/heroui/issues?q=is%3Aissue+sort%3Aupdated-desc+is%3Aclosed)
- HeroUI's [Discussions tab](https://github.com/frontio-ai/heroui/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
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
blank_issues_enabled: true
contact_links:
- name: 🤔 Long question or ideas?
url: https://github.com/frontio-ai/heroui/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
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/frontio-ai/heroui/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 apps/docs/app/blog/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default function DocsLayout({children}: DocsLayoutProps) {
/>
</div>

<ScriptProviders />
<ScriptProviders isKapaEnabled={false} />
</>
);
}
2 changes: 1 addition & 1 deletion apps/docs/app/docs/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default function DocsLayout({children}: DocsLayoutProps) {
/>
</div>

<ScriptProviders />
<ScriptProviders isKapaEnabled={false} />
</>
);
}
2 changes: 1 addition & 1 deletion apps/docs/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const metadata: Metadata = {
url: "https://x.com/hero_ui",
},
],
creator: "frontio-ai",
creator: "heroui-inc",
alternates: {
canonical: "https://heroui.com",
types: {
Expand Down
3 changes: 3 additions & 0 deletions apps/docs/app/providers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ const ProviderWrapper = ({children}: {children: React.ReactElement}) => {
api_host: "/ingest",
person_profiles: "identified_only",
ui_host: process.env.NEXT_PUBLIC_POSTHOG_HOST,
capture_pageview: false,
capture_pageleave: false,
capture_heatmaps: false,
});
}
}, []);
Expand Down
4 changes: 2 additions & 2 deletions apps/docs/components/blog/nextjs-templates.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ const frameworks = [
description:
"A Next.js 13 with app directory template pre-configured with HeroUI (v2) and Tailwind CSS.",
icon: <NewNextJSIcon height={40} width={40} />,
href: "https://github.com/frontio-ai/next-app-template",
href: "https://github.com/heroui-inc/next-app-template",
},
{
title: "Next.js 13 (Pages) Template",
isExternal: true,
description:
"A Next.js 13 with pages directory template pre-configured with HeroUI (v2) and Tailwind CSS.",
icon: <NewNextJSIcon height={40} width={40} />,
href: "https://github.com/frontio-ai/next-pages-template",
href: "https://github.com/heroui-inc/next-pages-template",
},
];

Expand Down
8 changes: 5 additions & 3 deletions apps/docs/components/scripts/script-providers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,18 @@ import * as React from "react";
import Script from "next/script";


export function ScriptProviders() {
export function ScriptProviders({isKapaEnabled}: {isKapaEnabled?: boolean}) {
if (!isKapaEnabled) return null;

return (
<>
<Script
defer
data-modal-disclaimer="This is a custom LLM for NextUI with access to all developer docs (heroui.com/docs) and GitHub Issues and PRs (github.com/frontio-ai/heroui)."
data-modal-disclaimer="This is a custom LLM for HeroUI with access to all developer docs (heroui.com/docs) and GitHub Issues and PRs (github.com/heroui-inc/heroui)."
data-modal-example-questions="How do I install for Next.js?,How do I customize primary color?"
data-project-color="#000000"
data-project-logo="https://avatars.githubusercontent.com/u/86160567?s=280&v=4"
data-project-name="NextUI"
data-project-name="HeroUI"
data-website-id="e733a73f-980e-4f7d-9e8b-91867453f899"
src="https://widget.kapa.ai/kapa-widget.bundle.js"
strategy="afterInteractive"
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/config/site.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const siteConfig = {
creator: "@hero_ui",
},
links: {
github: "https://github.com/frontio-ai/heroui",
github: "https://github.com/heroui-inc/heroui",
twitter: "https://x.com/hero_ui",
docs: "https://heroui.com",
discord: "https://discord.gg/9b6yyZKmH4",
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/content/blog/introducing-heroui.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,4 @@ Whether it's a feature request, bug report, or a project to showcase, please get

## Contributing

PR's on HeroUI are always welcome, please see our [contribution guidelines](https://github.com/frontio-ai/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
PR's on HeroUI are always welcome, please see our [contribution guidelines](https://github.com/heroui-inc/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
2 changes: 1 addition & 1 deletion apps/docs/content/blog/nextui-v2.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -327,4 +327,4 @@ Whether it's a feature request, bug report, or a project to showcase, please get

## Contributing

PR's on HeroUI are always welcome, please see our [contribution guidelines](https://github.com/frontio-ai/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
PR's on HeroUI are always welcome, please see our [contribution guidelines](https://github.com/heroui-inc/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
2 changes: 1 addition & 1 deletion apps/docs/content/blog/v2.1.0.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -164,4 +164,4 @@ Whether it's a feature request, bug report, or a project to showcase, please get

## Contributing

PR's on HeroUI are always welcome, please see our [contribution guidelines](https://github.com/frontio-ai/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
PR's on HeroUI are always welcome, please see our [contribution guidelines](https://github.com/heroui-inc/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
2 changes: 1 addition & 1 deletion apps/docs/content/blog/v2.2.0.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -440,4 +440,4 @@ Whether it's a feature request, bug report, or a project to showcase, please get

## Contributing

PR's on HeroUI are always welcome, please see our [contribution guidelines](https://github.com/frontio-ai/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
PR's on HeroUI are always welcome, please see our [contribution guidelines](https://github.com/heroui-inc/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
Loading

0 comments on commit d9835c0

Please sign in to comment.