fulldev-ui 0.5.0-beta.1 → 0.5.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fulldev-ui",
-  "version": "0.5.0-beta.1",
+  "version": "0.5.0-beta.2",
   "description": "A component library built for Astro",
   "homepage": "https://ui.full.dev",
   "bugs": "https://github.com/fulldotdev/ui/issues",
@@ -42,6 +42,7 @@
     "@astrolib/seo": "1.0.0-beta.8",
     "@iconify-json/tabler": "^1.2.5",
     "@radix-ui/colors": "^3.0.0",
+    "@rollup/plugin-yaml": "^4.1.2",
     "@types/js-yaml": "^4.0.9",
     "@unocss/reset": "^0.63.4",
     "astro": "^4.16.6",
@@ -66,8 +67,7 @@
     "url": "^0.11.4",
     "vite-plugin-virtual": "^0.3.0",
     "zod": "^3.23.8",
-    "zod-to-ts": "^1.2.0",
-    "@rollup/plugin-yaml": "^4.1.2"
+    "zod-to-ts": "^1.2.0"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.4",

package/src/integration/index.ts

@@ -1,6 +1,7 @@
 import viteYaml from '@rollup/plugin-yaml'
 import type { AstroIntegration } from 'astro'
 import favicons from 'astro-favicons'
+import type { CollectionEntry } from 'astro:content'
 import merge from 'deepmerge'
 import fs from 'fs/promises'
 import yaml from 'js-yaml'
@@ -18,8 +19,8 @@ interface Config {
   favicon?: string
   company?: string
   css?: string
+  basePreset?: CollectionEntry<'presets'>['id']
   injectRoutes?: boolean
-  overrideComponents?: boolean
   generateImageEntries?: boolean
   colors: {
     theme: 'light' | 'dark'

package/src/layouts/OverviewLayout.astro

@@ -11,7 +11,7 @@ import { getChildPages } from 'fulldev-ui/utils/getChildPages.ts'
 
 type Props = ComponentProps<typeof Layout>
 
-const { slug, render, sections, children, ...rest } = Astro.props
+const { slug, sections, title, description } = Astro.props
 
 const childPages = await getChildPages(slug)
 const categoryPages = await getCategoryPages(slug)
@@ -19,14 +19,17 @@ const categoryPages = await getCategoryPages(slug)
 ---
 
 <Layout {...Astro.props}>
-  <Intro {...rest} />
+  <Intro
+    heading={title}
+    text={description}
+  />
   <Categories
-    pages={childPages}
+    cards={childPages}
     structure="grid"
     panel
   />
   <Products
-    pages={categoryPages}
+    cards={categoryPages}
     structure="grid"
   />
   <Article style={{ '--screen': '768px' }} />

package/src/schemas/pageSchema.ts

@@ -1,6 +1,8 @@
 import { getEntries, getEntry, z } from 'astro:content'
 import { assign } from 'radash'
+import fulldevConfig from 'virtual:fulldev-ui/config'
 import image from './components/image'
+import images from './components/images'
 import sections from './components/sections'
 import categories from './utils/categories'
 import component from './utils/component'
@@ -25,12 +27,20 @@ const presets = z
   })
   .passthrough()
   .transform(async ({ presets, ...rest }) => {
-    if (!presets) return rest
-    const entries = await getEntries(presets)
     let mergedData = {}
-    entries.forEach(
-      (preset: any) => (mergedData = assign(mergedData, preset.data))
-    )
+
+    if (fulldevConfig.basePreset) {
+      const baseEntry = await getEntry('presets', fulldevConfig.basePreset)
+      mergedData = assign(mergedData, baseEntry?.data || {})
+    }
+
+    if (presets) {
+      const entries = await getEntries(presets)
+      entries.forEach(
+        (preset: any) => (mergedData = assign(mergedData, preset.data))
+      )
+    }
+
     mergedData = assign(mergedData, rest)
     return mergedData as typeof rest
   })
@@ -51,6 +61,7 @@ export default i18n.pipe(presets).pipe(
       title: z.string(),
       description: z.string().optional(),
       image,
+      images,
       sections,
       header: z.any(),
       footer: z.any(),