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 17, 2025
2 parents 8d5f350 + 057120b commit 5b02110
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 10 deletions.
2 changes: 2 additions & 0 deletions apps/docs/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import "@/styles/globals.css";
import "@/styles/sandpack.css";
import {Metadata, Viewport} from "next";
import {clsx} from "@heroui/shared-utils";
import {Analytics} from "@vercel/analytics/next";

import {Providers} from "./providers";

Expand Down Expand Up @@ -84,6 +85,7 @@ export default function RootLayout({children}: {children: React.ReactNode}) {
<ProBanner />
<Navbar mobileRoutes={manifest.mobileRoutes} routes={manifest.routes} />
{children}
<Analytics mode="production" />
<Footer />
</div>
<Cmdk />
Expand Down
13 changes: 10 additions & 3 deletions apps/docs/content/blog/introducing-heroui.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,16 @@ Additionally, we want to avoid any confusion about our library being created or

We've worked for months to make the migration as seamless as possible. You only need to run one command in your project's root folder:

```bash
npx @heroui/codemod@latest migrate
```

<PackageManagers
commands={{
npm: "npx @heroui/codemod@latest migrate",
pnpm: "pnpm dlx @heroui/codemod@latest migrate",
yarn: "yarn dlx @heroui/codemod@latest migrate",
bun: "bunx --bun @heroui/codemod@latest migrate"
}}
/>


This will automatically update your project to use HeroUI.

Expand Down
12 changes: 9 additions & 3 deletions apps/docs/content/docs/guide/nextui-to-heroui.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,15 @@ The easiest way to migrate your NextUI project to HeroUI is using our official c

Execute the codemod in your project directory:

```bash
npx @heroui/codemod@latest migrate
```
<PackageManagers
commands={{
npm: "npx @heroui/codemod@latest migrate",
pnpm: "pnpm dlx @heroui/codemod@latest migrate",
yarn: "yarn dlx @heroui/codemod@latest migrate",
bun: "bunx --bun @heroui/codemod@latest migrate"
}}
/>


> **Note:** If you're using a monorepo, run the codemod from the root directory
Expand Down
9 changes: 5 additions & 4 deletions apps/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
"dependencies": {
"@codesandbox/sandpack-react": "^2.6.4",
"@emotion/is-prop-valid": "^1.3.1",
"@iconify/icons-solar": "1.2.3",
"@iconify/react": "5.0.2",
"@internationalized/date": "3.6.0",
"@mapbox/rehype-prism": "^0.6.0",
"@heroui/aria-utils": "workspace:*",
"@heroui/badge": "workspace:*",
"@heroui/code": "workspace:*",
Expand All @@ -40,6 +36,10 @@
"@heroui/use-infinite-scroll": "workspace:*",
"@heroui/use-is-mobile": "workspace:*",
"@heroui/number-field": "workspace:*",
"@iconify/icons-solar": "1.2.3",
"@iconify/react": "5.0.2",
"@internationalized/date": "3.6.0",
"@mapbox/rehype-prism": "^0.6.0",
"@radix-ui/react-scroll-area": "^1.0.5",
"@react-aria/focus": "3.19.0",
"@react-aria/i18n": "3.12.4",
Expand All @@ -55,6 +55,7 @@
"@rehooks/local-storage": "^2.4.5",
"@stackblitz/sdk": "^1.11.0",
"@tanstack/react-virtual": "3.11.2",
"@vercel/analytics": "^1.4.1",
"canvas-confetti": "^1.9.2",
"clsx": "^1.2.1",
"cmdk": "^0.2.0",
Expand Down
34 changes: 34 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 5b02110

Please sign in to comment.