Merge branch 'main' of https://github.com/askrjs/website

Author: smiggleworth

package-lock.json

@@ -1,5 +1,5 @@
 import type { SiteLink } from "../pages/shared/content";
-import { Badge } from "@askrjs/askr-ui/badge";
+import { Badge } from "@askrjs/askr-ui/primitives/badge";
 import { SiteAnchor } from "./site-link";
 
 export function LinkCard(props: SiteLink) {

src/components/cards.tsx

@@ -1,5 +1,5 @@
 import { route } from "@askrjs/askr/router";
-import { Separator } from "@askrjs/askr-ui/separator";
+import { Separator } from "@askrjs/askr-ui/primitives/separator";
 
 import type { Props } from "../types/props";
 import type { DocMeta, TocEntry } from "../pages/shared/doc-types";

src/components/doc-layout.tsx

@@ -1,5 +1,5 @@
 import type { Props } from "../types/props";
-import { Button } from "@askrjs/askr-ui/button";
+import { Button } from "@askrjs/askr-ui/primitives/button";
 import { primaryNav, type SiteLink } from "../pages/shared/content";
 import { SiteAnchor } from "./site-link";
 

src/components/site-shell.tsx

@@ -1,5 +1,5 @@
 import { DocLayout } from "../../components/doc-layout";
-import { Badge } from "@askrjs/askr-ui/badge";
+import { Badge } from "@askrjs/askr-ui/primitives/badge";
 import {
   docsFeatured,
   docsNavSections,

src/pages/docs/index.tsx

@@ -1,6 +1,6 @@
 import { state } from "@askrjs/askr";
-import { Button } from "@askrjs/askr-ui/button";
-import { Badge } from "@askrjs/askr-ui/badge";
+import { Button } from "@askrjs/askr-ui/primitives/button";
+import { Badge } from "@askrjs/askr-ui/primitives/badge";
 import {
   CatalogSection,
   HeroActionGrid,

src/pages/home/index.tsx

@@ -4,7 +4,7 @@ import {
   AccordionHeader,
   AccordionTrigger,
   AccordionContent,
-} from "@askrjs/askr-ui/accordion";
+} from "@askrjs/askr-ui/composites/accordion";
 
 export function AccordionDemo() {
   return (

src/pages/ui/demos/accordion-demo.tsx

@@ -1,4 +1,4 @@
-import { Badge } from "@askrjs/askr-ui/badge";
+import { Badge } from "@askrjs/askr-ui/primitives/badge";
 
 export function BadgeDemo() {
   return (

src/pages/ui/demos/badge-demo.tsx

@@ -1,5 +1,5 @@
 import { state } from "@askrjs/askr";
-import { Button } from "@askrjs/askr-ui/button";
+import { Button } from "@askrjs/askr-ui/primitives/button";
 
 export function ButtonDemo() {
   const clicks = state(0);

src/pages/ui/demos/button-demo.tsx

@@ -1,5 +1,5 @@
 import { state, derive } from "@askrjs/askr";
-import { Checkbox } from "@askrjs/askr-ui/checkbox";
+import { Checkbox } from "@askrjs/askr-ui/primitives/checkbox";
 
 export function CheckboxDemo() {
   const checked = state(false);