@octanejs/shadcn 0.0.37 → 0.0.39

package/{LICENSE → LICENSE.upstream}

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2026 Dominic Gannaway
+Copyright (c) 2023 shadcn
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -1,9 +1,7 @@
 # @octanejs/shadcn
 
-shadcn/ui for the [octane](https://github.com/octanejs/octane) renderer — a port
-of the **Radix base** of [shadcn-ui/ui](https://github.com/shadcn-ui/ui) onto
-octane's hooks and native events, built on
-[`@octanejs/radix`](../radix).
+shadcn/ui for the [octane](https://github.com/octanejs/octane) renderer, with
+Base UI, Radix, and React Aria bases adapted to octane's hooks and native events.
 
 ## Installation
 
@@ -12,11 +10,11 @@ npm install @octanejs/shadcn
 pnpm add @octanejs/shadcn
 ```
 
-Upstream pin: `shadcn-ui/ui@4baadbc6` + CLI `shadcn@4.14.1`.
+Upstream pin: `shadcn-ui/ui@7c9eaba1` + CLI `shadcn@4.21.0`.
 
 ## What ships
 
-- **40 component families (~185 exports)**: the full Tier-1 static set, all 24
+- **44 component families across three bases**: the full Tier-1 static set, all 24
   radix-backed Tier-2 components, and the first Tier-3 composites (Sidebar with
   `useSidebar`/`useIsMobile`, Field), plus `cn()` and the default neutral theme
   tokens (`@octanejs/shadcn/theme.css`).
@@ -34,13 +32,21 @@ Upstream pin: `shadcn-ui/ui@4baadbc6` + CLI `shadcn@4.14.1`.
 
 ## Component coverage
 
-Each primitive base ships the families its primitives support, exactly as upstream's do.
-Switching `style` changes which primitive a component is built on — the `data-slot` contract and
-component names stay identical.
+The coverage table tracks the families ported for each primitive base.
+Switching `style` changes which primitive a component uses. Each base retains its
+upstream API; for example, Base UI Navigation Menu exposes a Positioner that owns
+its viewport, and Base UI Select aliases its hostless Root.
+
+The Base UI wrappers target `@octanejs/base-ui`'s Base UI 1.8.0 API, including
+Select, Navigation Menu, and Scroll Area from the 4.21.0 registry with Nova
+utilities. Combobox is outside this package's current family inventory.
+
+All three bases use `cn@0.2.6`, matching the upstream update. Existing Octane
+adaptations and styling remain intact; `@octanejs/shadcn/cn` re-exports the same helper.
 
 <!-- BEGIN COVERAGE -->
 
-**44 families** — Radix 44/44 · React Aria 33/44 · Base UI 40/44
+**44 families** — Radix 44/44 · React Aria 33/44 · Base UI 43/44
 
 ✅ ported · — not ported yet (fair game) · ⛔ blocked, see notes below
 
@@ -69,13 +75,13 @@ component names stay identical.
 | `label` | ✅ | ✅ | ✅ |
 | `menubar` | ✅ | ⛔ | ✅ |
 | `native-select` | ✅ | ✅ | ✅ |
-| `navigation-menu` | ✅ | ⛔ | ⛔ |
+| `navigation-menu` | ✅ | ⛔ | ✅ |
 | `pagination` | ✅ | ✅ | ✅ |
 | `popover` | ✅ | ✅ | ✅ |
 | `progress` | ✅ | ⛔ | ✅ |
 | `radio-group` | ✅ | ✅ | ✅ |
-| `scroll-area` | ✅ | ✅ | ⛔ |
-| `select` | ✅ | ⛔ | ⛔ |
+| `scroll-area` | ✅ | ✅ | ✅ |
+| `select` | ✅ | ⛔ | ✅ |
 | `separator` | ✅ | ✅ | ✅ |
 | `sheet` | ✅ | ✅ | ✅ |
 | `sidebar` | ✅ | ⛔ | ✅ |
@@ -95,9 +101,6 @@ component names stay identical.
 
 | Base | Family | Reason |
 | --- | --- | --- |
-| Base UI | `navigation-menu` | @octanejs/base-ui has no navigation-menu primitive |
-| Base UI | `scroll-area` | @octanejs/base-ui has no scroll-area primitive |
-| Base UI | `select` | @octanejs/base-ui has no select primitive |
 | Base UI | `sonner` | needs next-themes, which has no octane binding |
 | React Aria | `context-menu` | no counterpart in upstream’s aria base |
 | React Aria | `dropdown-menu` | no counterpart in upstream’s aria base |
@@ -143,12 +146,12 @@ same mechanism shadcn uses upstream, where its own registry is
 
 | `style` | Primitives | Families |
 | --- | --- | --- |
-| `base-nova` *(default)* | `@octanejs/base-ui` | 21 |
+| `base-nova` *(default)* | `@octanejs/base-ui` | 43 |
 | `radix-nova` | `@octanejs/radix` | 44 |
 | `aria-nova` | `@octanejs/aria` | 33 |
 
-The bases deliberately ship different family counts, exactly as upstream's do — a base only
-has the families its primitives support. Switching `style` changes which primitive a component
+The bases currently ship different family counts; see the coverage table for remaining ports.
+Switching `style` changes which primitive a component
 is built on; the `data-slot` contract and component names stay identical, so your markup and
 styling do not change.
 

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@octanejs/shadcn",
-  "version": "0.0.37",
+  "version": "0.0.39",
   "license": "MIT",
   "type": "module",
   "engines": {
     "node": ">=22.22.2"
   },
-  "description": "shadcn/ui for the octane renderer — the Radix-base shadcn component distribution ported onto octane: cva-variant components preserving the upstream data-slot/class contract, built on @octanejs/radix, published as importable source with a shadcn-CLI-compatible registry planned.",
+  "description": "shadcn/ui components for Octane, with Base UI, Radix, and React Aria implementations and an installable source registry.",
   "author": {
     "name": "Dominic Gannaway",
     "email": "dg@domgan.com"
@@ -21,7 +21,8 @@
   },
   "files": [
     "src",
-    "README.md"
+    "README.md",
+    "LICENSE.upstream"
   ],
   "sideEffects": [
     "./src/styles/theme.css"
@@ -127,10 +128,13 @@
     "./base-ui/Label": "./src/bases/base-ui/ui/label.tsrx",
     "./base-ui/Menubar": "./src/bases/base-ui/ui/menubar.tsrx",
     "./base-ui/NativeSelect": "./src/bases/base-ui/ui/native-select.tsrx",
+    "./base-ui/NavigationMenu": "./src/bases/base-ui/ui/navigation-menu.tsrx",
     "./base-ui/Pagination": "./src/bases/base-ui/ui/pagination.tsrx",
     "./base-ui/Popover": "./src/bases/base-ui/ui/popover.tsrx",
     "./base-ui/Progress": "./src/bases/base-ui/ui/progress.tsrx",
     "./base-ui/RadioGroup": "./src/bases/base-ui/ui/radio-group.tsrx",
+    "./base-ui/ScrollArea": "./src/bases/base-ui/ui/scroll-area.tsrx",
+    "./base-ui/Select": "./src/bases/base-ui/ui/select.tsrx",
     "./base-ui/Separator": "./src/bases/base-ui/ui/separator.tsrx",
     "./base-ui/Sheet": "./src/bases/base-ui/ui/sheet.tsrx",
     "./base-ui/Sidebar": "./src/bases/base-ui/ui/sidebar.tsrx",
@@ -152,25 +156,27 @@
   "dependencies": {
     "class-variance-authority": "0.7.1",
     "clsx": "^2.1.1",
+    "cn": "0.2.6",
     "tailwind-merge": "3.6.0",
-    "@octanejs/aria": "0.0.46",
-    "@octanejs/base-ui": "0.1.50",
+    "@octanejs/aria": "0.0.47",
+    "@octanejs/base-ui": "0.1.52",
     "@octanejs/lucide": "0.1.47",
-    "@octanejs/radix": "0.1.51",
+    "@octanejs/radix": "0.1.52",
     "@octanejs/sonner": "0.1.47"
   },
   "peerDependencies": {
-    "octane": "^0.1.51 || ^0.2.0"
+    "octane": "^0.2.5"
   },
   "devDependencies": {
-    "@tsrx/react": "^0.2.63",
+    "@base-ui/react": "1.8.0",
+    "@tsrx/react": "^0.2.69",
     "esbuild": "^0.28.1",
     "lucide-react": "1.24.0",
     "radix-ui": "^1.6.4",
-    "react": "^19.2.7",
-    "react-dom": "^19.2.7",
+    "react": "19.2.7",
+    "react-dom": "19.2.7",
     "vitest": "^4.1.10",
-    "octane": "0.2.0"
+    "octane": "0.2.7"
   },
   "scripts": {
     "test": "vitest run",

package/src/bases/base-ui/ui/accordion.tsrx

@@ -12,7 +12,7 @@
 import { Accordion as AccordionPrimitive } from '@octanejs/base-ui/accordion';
 import { ChevronDownIcon, ChevronUpIcon } from '@octanejs/lucide';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 
 export function Accordion({ className, ...props }: Record<string, any>) @{
 	<AccordionPrimitive.Root

package/src/bases/base-ui/ui/alert-dialog.tsrx

@@ -17,7 +17,7 @@
 // props.children channel.
 import { AlertDialog as AlertDialogPrimitive } from '@octanejs/base-ui/alert-dialog';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { DivProps } from '../../../lib/types';
 import { Button } from './button.tsrx';
 

package/src/bases/base-ui/ui/alert.tsrx

@@ -10,7 +10,7 @@
 // interleave, so every part uses the `@{ … }` shorthand.
 import { cva, type VariantProps } from 'class-variance-authority';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { DivProps } from '../../../lib/types';
 
 export const alertVariants = cva(

package/src/bases/base-ui/ui/aspect-ratio.tsrx

@@ -5,7 +5,7 @@
 // `alert` was confirmed byte-identical between the two bases, which is why this is plausible —
 // but it is not proof, and the bases DO diverge elsewhere. Diff the class strings against the
 // upstream source before treating this as ported.
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { DivProps } from '../../../lib/types';
 
 export interface AspectRatioProps extends DivProps {

package/src/bases/base-ui/ui/avatar.tsrx

@@ -13,7 +13,7 @@
 // transcribed from upstream's Base UI source.
 import { Avatar as AvatarPrimitive } from '@octanejs/base-ui/avatar';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 
 type Props = { className?: string } & Record<string, unknown>;
 

package/src/bases/base-ui/ui/badge.tsrx

@@ -18,7 +18,7 @@
 // spread `badgeVariants({ variant })` onto it directly, which is what the class export is for.
 import { cva, type VariantProps } from 'class-variance-authority';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { HostProps } from '../../../lib/types';
 
 export const badgeVariants = cva(

package/src/bases/base-ui/ui/breadcrumb.tsrx

@@ -26,7 +26,7 @@
 import { ChevronRightIcon, MoreHorizontalIcon } from '@octanejs/lucide';
 import { type OctaneNode } from 'octane';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 
 type Props = { className?: string } & Record<string, unknown>;
 

package/src/bases/base-ui/ui/button.tsrx

@@ -15,7 +15,7 @@
 import { cva, type VariantProps } from 'class-variance-authority';
 import { Button as ButtonPrimitive } from '@octanejs/base-ui/button';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 
 export const buttonVariants = cva(
 	'group/button inline-flex shrink-0 items-center justify-center rounded-lg border border-transparent bg-clip-padding text-sm font-medium whitespace-nowrap transition-all outline-none select-none focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 active:not-aria-[haspopup]:translate-y-px disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*=\'size-\'])]:size-4',

package/src/bases/base-ui/ui/card.tsrx

@@ -3,7 +3,7 @@
 // UNVERIFIED PROVENANCE: derived from this package's React Aria base rather than transcribed
 // from upstream's `bases/base-ui/ui/card.tsx`, which was not available at port time.
 // Diff the class strings against the upstream source before treating this as ported.
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { DivProps } from '../../../lib/types';
 
 export interface CardProps extends DivProps {

package/src/bases/base-ui/ui/checkbox.tsrx

@@ -18,7 +18,7 @@
 import { Checkbox as CheckboxPrimitive } from '@octanejs/base-ui/checkbox';
 import { CheckIcon } from '@octanejs/lucide';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 
 export interface CheckboxProps extends Record<string, unknown> {
 	className?: string;

package/src/bases/base-ui/ui/context-menu.tsrx

@@ -26,25 +26,27 @@ import { type OctaneNode } from 'octane';
 import { ContextMenu as ContextMenuPrimitive } from '@octanejs/base-ui/context-menu';
 import { CheckIcon, ChevronRightIcon } from '@octanejs/lucide';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 
 type Props = { className?: string; children?: OctaneNode } & Record<string, unknown>;
 
-export interface BaseUiPositioningProps {
-	/** Forwarded to the Positioner; see the note at the top of this file. */
-	side?: 'top' | 'right' | 'bottom' | 'left';
-	sideOffset?: number;
-	align?: 'start' | 'center' | 'end';
-	alignOffset?: number;
-	anchor?: unknown;
-	positionMethod?: 'absolute' | 'fixed';
-	collisionBoundary?: unknown;
-	collisionPadding?: unknown;
-	collisionAvoidance?: unknown;
-	arrowPadding?: number;
-	sticky?: boolean;
-	disableAnchorTracking?: boolean;
-}
+/** Props routed to the Positioner rather than the popup. */
+export type BaseUiPositioningProps =
+	Pick<
+		ContextMenuPrimitive.Positioner.Props,
+		| 'side'
+		| 'sideOffset'
+		| 'align'
+		| 'alignOffset'
+		| 'anchor'
+		| 'positionMethod'
+		| 'collisionBoundary'
+		| 'collisionPadding'
+		| 'collisionAvoidance'
+		| 'arrowPadding'
+		| 'sticky'
+		| 'disableAnchorTracking'
+	>;
 
 export function ContextMenu(props: Record<string, unknown>) @{
 	<ContextMenuPrimitive.Root data-slot="context-menu" {...props} />
@@ -221,7 +223,10 @@ export function ContextMenuCheckboxItem(props: Props & {
 	</ContextMenuPrimitive.CheckboxItem>
 }
 
-export function ContextMenuRadioItem(props: Props & { inset?: boolean }) @{
+export function ContextMenuRadioItem(props: Omit<
+	ContextMenuPrimitive.RadioItem.Props,
+	'className'
+> & { className?: string; inset?: boolean }) @{
 	const { className, children: _children, inset, ...rest } = props;
 
 	<ContextMenuPrimitive.RadioItem

package/src/bases/base-ui/ui/dialog.tsrx

@@ -10,11 +10,11 @@
 //
 // UNVERIFIED PROVENANCE: class strings come from this package's radix base rather than
 // transcribed from upstream's Base UI source.
-import { createElement, type OctaneNode } from 'octane';
+import { type OctaneNode } from 'octane';
 import { Dialog as DialogPrimitive } from '@octanejs/base-ui/dialog';
 import { XIcon } from '@octanejs/lucide';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import { Button } from './button.tsrx';
 
 type Props = { className?: string; children?: OctaneNode } & Record<string, unknown>;
@@ -46,7 +46,8 @@ export function DialogOverlay({ className, ...props }: Props) @{
 	/>
 }
 
-export interface DialogContentProps extends Props {
+export interface DialogContentProps extends Omit<DialogPrimitive.Popup.Props, 'className'> {
+	className?: string;
 	showCloseButton?: boolean;
 }
 
@@ -55,38 +56,30 @@ export function DialogContent({
 	children,
 	showCloseButton = true,
 	...props
-}: DialogContentProps) {
-	return createElement(
-		DialogPrimitive.Portal,
-		{ 'data-slot': 'dialog-portal' },
-		createElement(DialogOverlay, { key: 'overlay' }),
-		createElement(
-			DialogPrimitive.Popup,
-			{
-				key: 'content',
-				'data-slot': 'dialog-content',
-				className: cn(
-					'fixed top-1/2 left-1/2 z-50 grid w-full max-w-[calc(100%-2rem)] -translate-x-1/2 -translate-y-1/2 gap-4 rounded-xl bg-popover p-4 text-sm text-popover-foreground ring-1 ring-foreground/10 duration-100 outline-none sm:max-w-sm data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95',
-					className,
-				),
-				...props,
-			},
-			children,
-			showCloseButton
-				? createElement(DialogPrimitive.Close, {
-						key: 'close',
-						'data-slot': 'dialog-close',
-						className: 'absolute top-2 right-2',
-						render: createElement(
-							Button,
-							{ variant: 'ghost', size: 'icon-sm' },
-							createElement(XIcon, { key: 'icon' }),
-							createElement('span', { key: 'sr', className: 'sr-only' }, 'Close'),
-						),
-					})
-				: null,
-		),
-	);
+}: DialogContentProps) @{
+	<DialogPrimitive.Portal data-slot="dialog-portal">
+		<DialogOverlay />
+		<DialogPrimitive.Popup
+			data-slot="dialog-content"
+			className={cn(
+				'fixed top-1/2 left-1/2 z-50 grid w-full max-w-[calc(100%-2rem)] -translate-x-1/2 -translate-y-1/2 gap-4 rounded-xl bg-popover p-4 text-sm text-popover-foreground ring-1 ring-foreground/10 duration-100 outline-none sm:max-w-sm data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95',
+				className,
+			)}
+			{...props}
+		>
+			{children}
+			@if (showCloseButton) {
+				<DialogPrimitive.Close
+					data-slot="dialog-close"
+					className="absolute top-2 right-2"
+					render={<Button variant="ghost" size="icon-sm">
+						<XIcon />
+						<span className="sr-only">Close</span>
+					</Button>}
+				/>
+			}
+		</DialogPrimitive.Popup>
+	</DialogPrimitive.Portal>
 }
 
 export function DialogHeader({ className, ...props }: Props) @{
@@ -109,11 +102,9 @@ export function DialogFooter(props: DialogFooterProps) @{
 		{...rest}
 	>
 		{props.children}
-		{showCloseButton
-			? createElement(DialogPrimitive.Close, {
-					render: createElement(Button, { variant: 'outline' }, 'Close'),
-				})
-			: null}
+		@if (showCloseButton) {
+			<DialogPrimitive.Close render={<Button variant="outline">Close</Button>} />
+		}
 	</div>
 }
 

package/src/bases/base-ui/ui/dropdown-menu.tsrx

@@ -41,7 +41,7 @@ import { type OctaneNode } from 'octane';
 import { Menu as MenuPrimitive } from '@octanejs/base-ui/menu';
 import { CheckIcon, ChevronRightIcon } from '@octanejs/lucide';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 
 type Props = { className?: string; children?: OctaneNode } & Record<string, unknown>;
 
@@ -57,21 +57,23 @@ export function DropdownMenuTrigger(props: Record<string, unknown>) @{
 	<MenuPrimitive.Trigger data-slot="dropdown-menu-trigger" {...props} />
 }
 
-export interface BaseUiPositioningProps {
-	/** Forwarded to the Positioner; see the note at the top of this file. */
-	side?: 'top' | 'right' | 'bottom' | 'left';
-	sideOffset?: number;
-	align?: 'start' | 'center' | 'end';
-	alignOffset?: number;
-	anchor?: unknown;
-	positionMethod?: 'absolute' | 'fixed';
-	collisionBoundary?: unknown;
-	collisionPadding?: unknown;
-	collisionAvoidance?: unknown;
-	arrowPadding?: number;
-	sticky?: boolean;
-	disableAnchorTracking?: boolean;
-}
+/** Props routed to the Positioner rather than the popup. */
+export type BaseUiPositioningProps =
+	Pick<
+		MenuPrimitive.Positioner.Props,
+		| 'side'
+		| 'sideOffset'
+		| 'align'
+		| 'alignOffset'
+		| 'anchor'
+		| 'positionMethod'
+		| 'collisionBoundary'
+		| 'collisionPadding'
+		| 'collisionAvoidance'
+		| 'arrowPadding'
+		| 'sticky'
+		| 'disableAnchorTracking'
+	>;
 
 export interface DropdownMenuContentProps extends Props, BaseUiPositioningProps {}
 
@@ -170,7 +172,10 @@ export function DropdownMenuRadioGroup(props: Record<string, unknown>) @{
 	<MenuPrimitive.RadioGroup data-slot="dropdown-menu-radio-group" {...props} />
 }
 
-export function DropdownMenuRadioItem(props: Props & { inset?: boolean }) @{
+export function DropdownMenuRadioItem(props: Omit<MenuPrimitive.RadioItem.Props, 'className'> & {
+	className?: string;
+	inset?: boolean;
+}) @{
 	const { className, children: _children, inset, ...rest } = props;
 
 	<MenuPrimitive.RadioItem

package/src/bases/base-ui/ui/empty.tsrx

@@ -5,7 +5,7 @@
 // Diff the class strings against the upstream source before treating this as ported.
 import { cva, type VariantProps } from 'class-variance-authority';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { DivProps, HostProps } from '../../../lib/types';
 
 export function Empty({ className, ...props }: DivProps) @{

package/src/bases/base-ui/ui/field.tsrx

@@ -19,7 +19,7 @@
 import { createElement, useMemo, type OctaneNode } from 'octane';
 import { cva, type VariantProps } from 'class-variance-authority';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import { Label } from './label.tsrx';
 import { Separator } from './separator.tsrx';
 

package/src/bases/base-ui/ui/hover-card.tsrx

@@ -26,23 +26,25 @@
 import { createElement } from 'octane';
 import { PreviewCard as PreviewCardPrimitive } from '@octanejs/base-ui/preview-card';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 
-export interface BaseUiPositioningProps {
-	/** Forwarded to the Positioner; see the note at the top of this file. */
-	side?: 'top' | 'right' | 'bottom' | 'left';
-	sideOffset?: number;
-	align?: 'start' | 'center' | 'end';
-	alignOffset?: number;
-	anchor?: unknown;
-	positionMethod?: 'absolute' | 'fixed';
-	collisionBoundary?: unknown;
-	collisionPadding?: unknown;
-	collisionAvoidance?: unknown;
-	arrowPadding?: number;
-	sticky?: boolean;
-	disableAnchorTracking?: boolean;
-}
+/** Props routed to the Positioner rather than the popup. */
+export type BaseUiPositioningProps =
+	Pick<
+		PreviewCardPrimitive.Positioner.Props,
+		| 'side'
+		| 'sideOffset'
+		| 'align'
+		| 'alignOffset'
+		| 'anchor'
+		| 'positionMethod'
+		| 'collisionBoundary'
+		| 'collisionPadding'
+		| 'collisionAvoidance'
+		| 'arrowPadding'
+		| 'sticky'
+		| 'disableAnchorTracking'
+	>;
 
 export function HoverCard(props: Record<string, unknown>) @{
 	<PreviewCardPrimitive.Root data-slot="hover-card" {...props} />

package/src/bases/base-ui/ui/input.tsrx

@@ -13,7 +13,7 @@
 // keeps its commit-on-blur meaning.
 import { Input as InputPrimitive } from '@octanejs/base-ui/input';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 
 export function Input({ className, type, ...props }: Record<string, any>) @{
 	<InputPrimitive

package/src/bases/base-ui/ui/item.tsrx

@@ -13,7 +13,7 @@
 // apply `itemVariants({ variant, size })` directly, which is what the class export is for.
 import { cva, type VariantProps } from 'class-variance-authority';
 
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import { Separator } from './separator.tsrx';
 
 type DivProps = { className?: string } & Record<string, unknown>;

package/src/bases/base-ui/ui/kbd.tsrx

@@ -4,7 +4,7 @@
 //
 // UNVERIFIED PROVENANCE: class strings taken from this package's React Aria base rather than
 // transcribed from upstream's Base UI source.
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { HostProps } from '../../../lib/types';
 
 export function Kbd({ className, ...props }: HostProps<'kbd'>) @{

package/src/bases/base-ui/ui/label.tsrx

@@ -16,7 +16,7 @@
 // UNVERIFIED PROVENANCE: the class string is taken from this package's React Aria base rather
 // than transcribed from upstream's Base UI source. It carries one utility the Radix base omits
 // (`peer-data-disabled:opacity-50`).
-import { cn } from '../../../lib/utils';
+import { cn } from 'cn';
 import type { HostProps } from '../../../lib/types';
 
 export function Label({ className, ...props }: HostProps<'label'>) @{