Merge branch 'main' of github.com:nextui-org/nextui into canary

This commit is contained in:
Junior Garcia 2025-01-17 08:41:22 -03:00
commit 057120be26
5 changed files with 60 additions and 10 deletions

View File

@ -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";
@ -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 />

View File

@ -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.

View File

@ -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

View File

@ -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:*",
@ -39,6 +35,10 @@
"@heroui/use-clipboard": "workspace:*",
"@heroui/use-infinite-scroll": "workspace:*",
"@heroui/use-is-mobile": "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",
@ -54,6 +54,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",

34
pnpm-lock.yaml generated
View File

@ -382,6 +382,9 @@ importers:
'@tanstack/react-virtual':
specifier: 3.11.2
version: 3.11.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
'@vercel/analytics':
specifier: ^1.4.1
version: 1.4.1(next@14.3.0-canary.43(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react@18.2.0)
canvas-confetti:
specifier: ^1.9.2
version: 1.9.3
@ -8032,6 +8035,32 @@ packages:
'@ungap/structured-clone@1.2.1':
resolution: {integrity: sha512-fEzPV3hSkSMltkw152tJKNARhOupqbH96MZWyRjNaYZOMIzbrTeQDG+MTc6Mr2pgzFQzFxAfmhGDNP5QK++2ZA==}
'@vercel/analytics@1.4.1':
resolution: {integrity: sha512-ekpL4ReX2TH3LnrRZTUKjHHNpNy9S1I7QmS+g/RQXoSUQ8ienzosuX7T9djZ/s8zPhBx1mpHP/Rw5875N+zQIQ==}
peerDependencies:
'@remix-run/react': ^2
'@sveltejs/kit': ^1 || ^2
next: '>= 13'
react: 18.2.0
svelte: '>= 4'
vue: ^3
vue-router: ^4
peerDependenciesMeta:
'@remix-run/react':
optional: true
'@sveltejs/kit':
optional: true
next:
optional: true
react:
optional: true
svelte:
optional: true
vue:
optional: true
vue-router:
optional: true
'@vitejs/plugin-react@4.3.4':
resolution: {integrity: sha512-SCCPBJtYLdE8PX/7ZQAs1QAZ8Jqwih+0VBLum1EGqmCCQal+MIUqLCzj3ZUy8ufbC0cAM4LRlSTm7IQJwWT4ug==}
engines: {node: ^14.18.0 || >=16.0.0}
@ -20635,6 +20664,11 @@ snapshots:
'@ungap/structured-clone@1.2.1': {}
'@vercel/analytics@1.4.1(next@14.3.0-canary.43(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react@18.2.0)':
optionalDependencies:
next: 14.3.0-canary.43(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
react: 18.2.0
'@vitejs/plugin-react@4.3.4(vite@5.4.11(@types/node@20.5.1)(lightningcss@1.28.2)(terser@5.37.0))':
dependencies:
'@babel/core': 7.26.0