chore(release): v2.21.0

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.eslintignore

@@ -1,14 +0,0 @@
-node_modules
-dist
-.nuxt
-coverage
-*.log*
-.DS_Store
-.code
-*.iml
-package-lock.json
-templates/*
-sw.js
-
-# Templates
-src/templates

.eslintrc.cjs

@@ -1,46 +0,0 @@
-module.exports = {
-  root: true,
-  extends: ['@nuxt/eslint-config'],
-  rules: {
-    // General
-    semi: ['error', 'never'],
-    quotes: ['error', 'single'],
-    'comma-dangle': ['error', 'never'],
-    'comma-spacing': ['error', { before: false, after: true }],
-    'keyword-spacing': ['error', { before: true, after: true }],
-    'space-before-function-paren': ['error', 'always'],
-    'object-curly-spacing': ['error', 'always'],
-    'arrow-spacing': ['error', { before: true, after: true }],
-    'key-spacing': ['error', { beforeColon: false, afterColon: true, mode: 'strict' }],
-    'space-before-blocks': ['error', 'always'],
-    'space-infix-ops': ['error', { int32Hint: false }],
-    'no-multi-spaces': ['error', { ignoreEOLComments: true }],
-    'no-trailing-spaces': ['error'],
-
-    // Typescript
-    '@typescript-eslint/type-annotation-spacing': 'error',
-
-    // Vuejs
-    'vue/multi-word-component-names': 0,
-    'vue/html-indent': ['error', 2],
-    'vue/comma-spacing': ['error', { before: false, after: true }],
-    'vue/script-indent': ['error', 2, { baseIndent: 0 }],
-    'vue/keyword-spacing': ['error', { before: true, after: true }],
-    'vue/object-curly-spacing': ['error', 'always'],
-    'vue/key-spacing': ['error', { beforeColon: false, afterColon: true, mode: 'strict' }],
-    'vue/arrow-spacing': ['error', { before: true, after: true }],
-    'vue/array-bracket-spacing': ['error', 'never'],
-    'vue/block-spacing': ['error', 'always'],
-    'vue/brace-style': ['error', 'stroustrup', { allowSingleLine: true }],
-    'vue/space-infix-ops': ['error', { int32Hint: false }],
-    'vue/max-attributes-per-line': [
-      'error',
-      {
-        singleline: {
-          max: 5
-        }
-      }
-    ],
-    'vue/padding-line-between-blocks': ['error', 'always']
-  }
-}

.github/ISSUE_TEMPLATE/bug-v3.yml

@@ -5,8 +5,8 @@ body:
   - type: markdown
     attributes:
       value: |
-        > [!IMPORTANT]  
-        > As Nuxt UI v3 is currently in alpha, we recommend thorough testing before using it in production environments. We're actively working on stabilization and welcome feedback from early adopters to improve the library. 
+        > [!IMPORTANT]
+        > As Nuxt UI v3 is currently in alpha, we recommend thorough testing before using it in production environments. We're actively working on stabilization and welcome feedback from early adopters to improve the library.
   - type: markdown
     attributes:
       value: |
@@ -29,11 +29,20 @@ body:
         - Build Modules:    `-`
     validations:
       required: true
+  - type: dropdown
+    id: package
+    attributes:
+      label: Is this bug related to Nuxt or Vue?
+      options:
+        - Nuxt
+        - Vue
+    validations:
+      required: true
   - type: input
     id: version
     attributes:
       label: Version
-      placeholder: v3.0.0-alpha.5
+      placeholder: v3.0.0-alpha.x
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -6,6 +6,15 @@ body:
     attributes:
       value: |
         Before requesting a feature, please make sure that you have read through our [documentation](https://ui.nuxt.com) and existing [issues](https://github.com/nuxt/ui/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc).
+  - type: dropdown
+    id: version
+    attributes:
+      label: For what version of Nuxt UI are you suggesting this?
+      options:
+        - v2.x
+        - v3.0.0-alpha.x
+    validations:
+      required: true
   - type: textarea
     id: description
     attributes:

.github/ISSUE_TEMPLATE/question.yml

@@ -6,6 +6,15 @@ body:
     attributes:
       value: |
         Before asking a question, please make sure that you have read through our [documentation](https://ui.nuxt.com) and existing [issues](https://github.com/nuxt/ui/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc).
+  - type: dropdown
+    id: version
+    attributes:
+      label: For what version of Nuxt UI are you asking this question?
+      options:
+        - v2.x
+        - v3.0.0-alpha.x
+    validations:
+      required: true
   - type: textarea
     id: description
     attributes:

CHANGELOG.md

@@ -1,5 +1,92 @@
 # Changelog
 
+## [2.21.0](https://github.com/nuxt/ui/compare/v2.20.0...v2.21.0) (2025-01-14)
+
+### Features
+
+* **module:** handle `tailwindMerge` config from `app.config` ([#2902](https://github.com/nuxt/ui/issues/2902)) ([ea15e21](https://github.com/nuxt/ui/commit/ea15e21cdcba00e21302415829113e8c6def8a6e))
+
+### Bug Fixes
+
+* **Table:** `v-model` causing first column missing ([#2890](https://github.com/nuxt/ui/issues/2890)) ([d573fb6](https://github.com/nuxt/ui/commit/d573fb636f7f749ce95b93c5fb1ae2a053eeeeb0))
+* **Table:** remove `[@select](https://github.com/select)` event on checkbox ([#3042](https://github.com/nuxt/ui/issues/3042)) ([d9d4f19](https://github.com/nuxt/ui/commit/d9d4f1915aac586ae1abf3ebe67ca9aff65b9be0))
+* **tailwind:** use mjs template ([#2945](https://github.com/nuxt/ui/issues/2945)) ([8cf9f27](https://github.com/nuxt/ui/commit/8cf9f27d537bad5ffe4e136f52ff71548a451c5f))
+
+## [2.20.0](https://github.com/nuxt/ui/compare/v2.19.2...v2.20.0) (2024-12-09)
+
+### ⚠ BREAKING CHANGES
+
+* **Form:** resolve async validation in yup & issue directly mutate state (#2701)
+
+### Features
+
+* **Accordion:** add `close` event ([#2750](https://github.com/nuxt/ui/issues/2750)) ([419a24f](https://github.com/nuxt/ui/commit/419a24f7034cefda2c6669f3c26742552e500f63))
+* **Badge:** handle `icon` prop ([#2594](https://github.com/nuxt/ui/issues/2594)) ([0d1a76e](https://github.com/nuxt/ui/commit/0d1a76e3c69e08534abb295b96548e67cfbea00c))
+* **InputMenu/SelectMenu:** add support for `dot notation` in `by` prop ([#2607](https://github.com/nuxt/ui/issues/2607)) ([53df9d9](https://github.com/nuxt/ui/commit/53df9d9a8cd6850803bdafc7ef6efe4e7404d334))
+* **Link:** allow partial query match for `activeClass` ([#2663](https://github.com/nuxt/ui/issues/2663)) ([03e24f4](https://github.com/nuxt/ui/commit/03e24f45836bdddd94b30cbaecc2288a78b56b0b))
+* **Notification:** add `pauseTimeoutOnHover` prop ([#2661](https://github.com/nuxt/ui/issues/2661)) ([11b8c3d](https://github.com/nuxt/ui/commit/11b8c3d9db1ec62b1c3557703c7ab5c99cb42df5))
+* **Table:** add contextmenu handling to table rows ([#2283](https://github.com/nuxt/ui/issues/2283)) ([c9e6256](https://github.com/nuxt/ui/commit/c9e6256e7f2c06da8bfda13700f56f6994e76eab))
+* **Table:** add custom `[@select](https://github.com/select):all` event ([#2581](https://github.com/nuxt/ui/issues/2581)) ([ac323c4](https://github.com/nuxt/ui/commit/ac323c4cccd930f2cd8c1f54b325bd509acd40bf))
+* **Table:** allow dynamically render `checkbox` ([#2549](https://github.com/nuxt/ui/issues/2549)) ([d6daf46](https://github.com/nuxt/ui/commit/d6daf466ace42b828151c45b18cd47179e85d66d))
+
+### Bug Fixes
+
+* **AvatarGroup/ButtonGroup/MeterGroup:** allow deeply partial `ui` config ([#2542](https://github.com/nuxt/ui/issues/2542)) ([bf58086](https://github.com/nuxt/ui/commit/bf580863af11d6a1a4c6c6774b44ec37b082e933))
+* **Carousel:** wrong `ui` type with `strategy` ([07ef771](https://github.com/nuxt/ui/commit/07ef771b17c72e275508a273371454a5e8a62257))
+* **components:** replace `as const` with correct type in config ([#2652](https://github.com/nuxt/ui/issues/2652)) ([51c8b8e](https://github.com/nuxt/ui/commit/51c8b8e3e59d7eceff72625650a199fcf7c6feca))
+* **date-picker:** undefined `dayIndex` ([#2545](https://github.com/nuxt/ui/issues/2545)) ([ce955d2](https://github.com/nuxt/ui/commit/ce955d24f1dfd222e87ce88428c0612c3f13cd50))
+* **Form:** resolve async validation in yup & issue directly mutate state ([#2701](https://github.com/nuxt/ui/issues/2701)) ([f3632dd](https://github.com/nuxt/ui/commit/f3632ddee511f0fccb24d4fc37403421e84ffdae))
+* **Form:** use parsed value from `joi` instead of original state ([#2587](https://github.com/nuxt/ui/issues/2587)) ([acecff4](https://github.com/nuxt/ui/commit/acecff40ec0156e45b4934c5d10c4dfa7c135f8e))
+* **InputMenu/SelectMenu:** use `by` prop to compare objects & support dot notation in `value-attribute` ([#2566](https://github.com/nuxt/ui/issues/2566)) ([7154254](https://github.com/nuxt/ui/commit/7154254ac22830f651ec200f7f3af2f5577f2de0))
+* **Link:** `exactQuery` prop type ([#2781](https://github.com/nuxt/ui/issues/2781)) ([4cde571](https://github.com/nuxt/ui/commit/4cde571e387775a9b12759f6f8c99117c84cbcff))
+* **Notification:** element renders even when no `notification` is present ([#2561](https://github.com/nuxt/ui/issues/2561)) ([d4e408c](https://github.com/nuxt/ui/commit/d4e408cfd8e2ef26021519f2f30f57e9120e1939))
+* **Table:** data outdated when rows change ([#2600](https://github.com/nuxt/ui/issues/2600)) ([b23f2de](https://github.com/nuxt/ui/commit/b23f2decfc9607555a315d0d087d0a042f03a938))
+* **Table:** missing type on props `loadingState` ([#2551](https://github.com/nuxt/ui/issues/2551)) ([6e66990](https://github.com/nuxt/ui/commit/6e66990372ef6bd7c109a64c753d9b50e96a450b))
+* **Table:** prevent `onClick` while blocking element ([#2592](https://github.com/nuxt/ui/issues/2592)) ([9703786](https://github.com/nuxt/ui/commit/97037864b39749db228fa5f51981f19e4a9c29dd))
+* **types:** improve `DeepPartial` type for App Config ([#2621](https://github.com/nuxt/ui/issues/2621)) ([976b03f](https://github.com/nuxt/ui/commit/976b03f241ef9626a6338685e43c844a8b3953fd))
+
+## [2.19.2](https://github.com/nuxt/ui/compare/v2.19.1...v2.19.2) (2024-11-05)
+
+### Bug Fixes
+
+* **Button:** put back `target` override ([212f7df](https://github.com/nuxt/ui/commit/212f7df35b9f81d189e1ee3e34f6fd2234cf52fe))
+
+## [2.19.1](https://github.com/nuxt/ui/compare/v2.19.0...v2.19.1) (2024-11-05)
+
+### Bug Fixes
+
+* **InputMenu/SelectMenu:** regex breaks build ([cb6f5f2](https://github.com/nuxt/ui/commit/cb6f5f2d71ea8bb526a8f958daec8e9871469b63))
+
+## [2.19.0](https://github.com/nuxt/ui/compare/v2.18.7...v2.19.0) (2024-11-05)
+
+### Features
+
+* **Form:** add `superstruct` validation ([#2357](https://github.com/nuxt/ui/issues/2357)) ([3cda6c6](https://github.com/nuxt/ui/commit/3cda6c6478d5284a3ffcb973270831601e8e5657))
+* **Form:** apply transformations ([#2460](https://github.com/nuxt/ui/issues/2460)) ([ceecb60](https://github.com/nuxt/ui/commit/ceecb60c3bbd5507b1f54faed001818639d9269c))
+* **Input/Textarea:** nullify model modifier ([#2309](https://github.com/nuxt/ui/issues/2309)) ([9dd7e61](https://github.com/nuxt/ui/commit/9dd7e615e97b6bf3c4c4096edd35a86ca3cfd53c))
+* **InputMenu:** allows to customize labels ([#2295](https://github.com/nuxt/ui/issues/2295)) ([ddf67a0](https://github.com/nuxt/ui/commit/ddf67a060ba659f102673eff31eb2e30231c2d93))
+* **Pagination:** improve slot props ([#2522](https://github.com/nuxt/ui/issues/2522)) ([c71fdc8](https://github.com/nuxt/ui/commit/c71fdc8795812bed779ab247451efd3db031e4cd))
+* **SelectMenu:** allows to customize labels ([#2266](https://github.com/nuxt/ui/issues/2266)) ([54e713d](https://github.com/nuxt/ui/commit/54e713d31ae0b80b0f69dd507f71387100204ac3))
+* **Table:** improve `expanded` row ([#2485](https://github.com/nuxt/ui/issues/2485)) ([1acd01a](https://github.com/nuxt/ui/commit/1acd01a440db7a7fa765189d8bde424ade9074e9))
+
+### Bug Fixes
+
+* **Accordion:** improve `items` type ([#2487](https://github.com/nuxt/ui/issues/2487)) ([25378df](https://github.com/nuxt/ui/commit/25378df1d894546c4b08eb43a58b02b40ab9649b))
+* **Button:** wrong `to` type ([8ab4a14](https://github.com/nuxt/ui/commit/8ab4a14394e0890b33a610e6491d891e89386959)), closes [#1253](https://github.com/nuxt/ui/issues/1253)
+* **Divider:** default `type` from app config ([7846ca3](https://github.com/nuxt/ui/commit/7846ca35b5332a9e70f9990059f6041d60770e79)), closes [nuxt/ui#2398](https://github.com/nuxt/ui/issues/2398)
+* **HorizontalNavigation/VerticalNavigation:** handle `badge` in RTL mode ([#2420](https://github.com/nuxt/ui/issues/2420)) ([4bf81be](https://github.com/nuxt/ui/commit/4bf81be36463bf280f31099c97a751e65240dcf5))
+* **InputMenu/SelectMenu:** allow access nested object in `option-attribute` ([#2465](https://github.com/nuxt/ui/issues/2465)) ([ff18061](https://github.com/nuxt/ui/commit/ff1806143c45a7d83b00e78bec979a8f412a2827))
+* **InputMenu/SelectMenu:** escape regexp before search ([c68ba76](https://github.com/nuxt/ui/commit/c68ba76fd0eebf411ccd5f047ee9a01b8ec5f5de)), closes [nuxt/ui#2308](https://github.com/nuxt/ui/issues/2308)
+* **InputMenu/SelectMenu:** prevent unnecessary updates when modelValue is unchanged ([#2507](https://github.com/nuxt/ui/issues/2507)) ([1a94b55](https://github.com/nuxt/ui/commit/1a94b55caac91685f518ae4c24ca8dcbee827f86))
+* **module:** missing types in `ui` config ([#2467](https://github.com/nuxt/ui/issues/2467)) ([23971ef](https://github.com/nuxt/ui/commit/23971efdb007701352ce58412db597cd95b9996b))
+* **Progress:** handle `carousel` and `carousel-inverse` animations in RTL mode ([#2400](https://github.com/nuxt/ui/issues/2400)) ([20fb46a](https://github.com/nuxt/ui/commit/20fb46a3ba8d74fcaa1407b23d65b117cc9d6802))
+* **RadioGroup:** rendering empty slots ([#2456](https://github.com/nuxt/ui/issues/2456)) ([b6ed1c5](https://github.com/nuxt/ui/commit/b6ed1c59ffe8c8aaac78a34d8559ca793bb92eaa))
+* **Table:**  `checkbox` not checked while using props by ([#2401](https://github.com/nuxt/ui/issues/2401)) ([1b7e36c](https://github.com/nuxt/ui/commit/1b7e36cf70a7252915c58657bc878cb29c719a7f))
+* **Table:**  `indeterminate` checkbox with pagination ([#2439](https://github.com/nuxt/ui/issues/2439)) ([070d2f8](https://github.com/nuxt/ui/commit/070d2f89b6d1cb9c236eeb779cb3918ed5770434))
+* **Table:** export `TableRow` and `TableColumn` types ([c36964b](https://github.com/nuxt/ui/commit/c36964b5eacbd61a661f02953f0297a390fd1d34)), closes [nuxt/ui#2373](https://github.com/nuxt/ui/issues/2373)
+* **Table:** handle dot nation with `by` prop ([#2413](https://github.com/nuxt/ui/issues/2413)) ([b72d343](https://github.com/nuxt/ui/commit/b72d3434e9ab024e8622611d32b5a4467c8364b9))
+* **Tabs:** allow `aria-label` on items ([3cf19ea](https://github.com/nuxt/ui/commit/3cf19ea5afcf97ef226d8be231d3b297c5f23b9f)), closes [nuxt/ui#1934](https://github.com/nuxt/ui/issues/1934)
+
 ## [2.18.7](https://github.com/nuxt/ui/compare/v2.18.6...v2.18.7) (2024-10-09)
 
 

README.md

@@ -1,4 +1,4 @@
-[![nuxt-ui.png](https://repository-images.githubusercontent.com/428329515/43fec891-9030-4601-8233-5d45ba5c6013)](https://ui.nuxt.com)
+[![nuxt-ui.png](https://volta.s3.fr-par.scw.cloud/nuxt_ui_social_card_531d133fa2.png)](https://ui.nuxt.com)
 
 # Nuxt UI
 
@@ -20,7 +20,7 @@ Its goal is to provide everything related to UI when building a Nuxt app. This i
 - Keyboard shortcuts
 - Bundled icons
 - Fully typed
-- [Figma Kit](https://www.figma.com/community/file/1288455405058138934)
+- [Figma Kit](https://www.figma.com/community/file/1436401057300493073)
 
 Read more on [ui.nuxt.com](https://ui.nuxt.com)
 

docs/app.vue

@@ -50,20 +50,22 @@ const links = computed(() => {
     icon: 'i-heroicons-book-open',
     to: '/getting-started',
     active: route.path.startsWith('/getting-started') || route.path.startsWith('/components')
-  }, ...(navigation.value.find(item => item._path === '/pro') ? [{
-    label: 'Pro',
-    icon: 'i-heroicons-square-3-stack-3d',
-    to: '/pro',
-    active: route.path.startsWith('/pro/getting-started') || route.path.startsWith('/pro/components') || route.path.startsWith('/pro/prose')
-  }, {
-    label: 'Pricing',
-    icon: 'i-heroicons-ticket',
-    to: '/pro/pricing'
-  }, {
-    label: 'Templates',
-    icon: 'i-heroicons-computer-desktop',
-    to: '/pro/templates'
-  }] : []), {
+  }, ...(navigation.value.find(item => item._path === '/pro')
+    ? [{
+        label: 'Pro',
+        icon: 'i-heroicons-square-3-stack-3d',
+        to: '/pro',
+        active: route.path.startsWith('/pro/getting-started') || route.path.startsWith('/pro/components') || route.path.startsWith('/pro/prose')
+      }, {
+        label: 'Pricing',
+        icon: 'i-heroicons-ticket',
+        to: '/pro/pricing'
+      }, {
+        label: 'Templates',
+        icon: 'i-heroicons-computer-desktop',
+        to: '/pro/templates'
+      }]
+    : []), {
     label: 'Releases',
     icon: 'i-heroicons-rocket-launch',
     to: '/releases'

docs/components/Banner.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const id = 'nuxt-ui-banner-1'
+const id = 'nuxt-ui-banner-3'
 const to = '/pro/pricing'
 
 const hideBanner = () => {
@@ -25,7 +25,13 @@ if (import.meta.server) {
 <template>
   <div class="relative bg-primary hover:bg-primary/90 transition-[background] backdrop-blur z-50 app-banner">
     <UContainer class="py-2">
-      <NuxtLink v-if="to" :to="to" class="focus:outline-none" aria-label="Nuxt UI Pro pricing" tabindex="-1">
+      <NuxtLink
+        v-if="to"
+        :to="to"
+        class="focus:outline-none"
+        aria-label="20% off on all Nuxt UI Pro products for Black Friday week"
+        tabindex="-1"
+      >
         <span class="absolute inset-0 " aria-hidden="true" />
       </NuxtLink>
 
@@ -33,10 +39,20 @@ if (import.meta.server) {
         <div class="lg:flex-1 hidden lg:flex items-center" />
 
         <p class="text-sm font-medium text-white dark:text-gray-900 truncate">
-          <UIcon name="i-heroicons-rocket-launch" class="w-5 h-5 align-top flex-shrink-0 pointer-events-none mr-2" />
-          <span class="font-semibold">Nuxt UI Pro v1.0</span> is out with dashboard components!
+          <UIcon name="i-ri-discount-percent-fill" class="size-5 align-top flex-shrink-0 pointer-events-none mr-2" />
+          <span class="font-bold">Black Friday Week</span>: <UBadge label="20% off" color="white" class="ring-0 font-semibold" /> on all Nuxt UI Pro products from <span class="font-semibold">Nov 25</span> to <span class="font-semibold">Dec 2</span>!
         </p>
 
+        <!-- <UButton
+          :to="to"
+          target="_blank"
+          label="Buy now"
+          color="black"
+          variant="solid"
+          size="2xs"
+          trailing-icon="i-heroicons-arrow-right-20-solid"
+        /> -->
+
         <div class="flex items-center justify-end lg:flex-1">
           <button
             class="p-1.5 rounded-md inline-flex hover:bg-primary/90"

docs/components/Footer.vue

@@ -30,7 +30,7 @@ const { $ui } = useNuxtApp()
 const links = [{
   icon: 'i-simple-icons-figma',
   label: 'Figma Kit',
-  to: 'https://www.figma.com/community/file/1288455405058138934',
+  to: 'https://www.figma.com/community/file/1436401057300493073',
   target: '_blank'
 }, {
   label: 'Playground',

docs/components/Header.vue

@@ -10,12 +10,34 @@
     }"
   >
     <template #left>
-      <NuxtLink to="/" class="flex items-end gap-2 font-bold text-xl text-gray-900 dark:text-white min-w-0" aria-label="Nuxt UI">
+      <NuxtLink to="/" class="flex items-end gap-2 text-xl text-gray-900 dark:text-white min-w-0 shrink-0" aria-label="Nuxt UI">
         <LogoPro v-if="$route.path.startsWith('/pro')" class="w-auto h-6 shrink-0" />
         <Logo v-else class="w-auto h-6 shrink-0" />
-
-        <UBadge :label="$route.path.startsWith('/pro') ? `v${pkg.version.split('-')[0]}` : `v${config.version}`" variant="subtle" size="xs" class="-mb-[2px] rounded font-semibold truncate hidden sm:inline-flex" />
       </NuxtLink>
+
+      <UDropdown
+        :items="[[{ label: $route.path.startsWith('/pro') ? `v${pkg.version.split('-')[0]}` : `v${config.version}`, class: 'text-primary-500 dark:text-primary-400' }, { label: 'v3.0.0-alpha.x', to: 'https://ui3.nuxt.dev' }]]"
+        :popper="{ strategy: 'absolute', offsetDistance: 11, placement: 'bottom-start' }"
+        :ui="{
+          background: 'dark:bg-gray-900',
+          ring: 'dark:ring-gray-800',
+          width: 'w-auto',
+          item: {
+            padding: 'p-1',
+            size: 'text-xs',
+            active: 'dark:bg-gray-800/50'
+          }
+        }"
+      >
+        <UButton
+          :label="$route.path.startsWith('/pro') ? `v${pkg.version.split('-')[0]}` : `v${config.version}`"
+          trailing-icon="i-lucide-chevron-down"
+          variant="outline"
+          size="2xs"
+          truncate
+          class="-mb-[6px] font-semibold rounded-full truncate ring-primary-500/25 dark:ring-primary-400/25 bg-primary-500/10 dark:bg-primary-400/10 hover:bg-primary-500/15 dark:hover:bg-primary-400/15 transition-colors"
+        />
+      </UDropdown>
     </template>
 
     <template #right>
@@ -25,10 +47,10 @@
         <UContentSearchButton :label="null" />
       </UTooltip>
 
-      <UColorModeButton />
+      <UColorModeButton class="hidden lg:inline-flex" />
 
       <UButton
-        to="https://github.com/nuxt/ui"
+        to="https://github.com/nuxt/ui/tree/dev"
         target="_blank"
         icon="i-simple-icons-github"
         aria-label="GitHub"
@@ -48,8 +70,8 @@
 
 <script setup lang="ts">
 import type { NavItem } from '@nuxt/content'
-import type { HeaderLink } from '#ui-pro/types'
 import pkg from '@nuxt/ui-pro/package.json'
+import type { HeaderLink } from '#ui-pro/types'
 
 defineProps<{
   links: HeaderLink[]

docs/components/color-picker/ColorPicker.vue

@@ -32,10 +32,10 @@ const colorMode = useColorMode()
 
 const primaryColors = computed(() => appConfig.ui.colors.filter(color => color !== 'primary').map(color => ({ value: color, text: color, hex: colors[color][colorMode.value === 'dark' ? 400 : 500] })))
 const primary = computed({
-  get () {
+  get() {
     return primaryColors.value.find(option => option.value === appConfig.ui.primary)
   },
-  set (option) {
+  set(option) {
     appConfig.ui.primary = option.value
 
     window.localStorage.setItem('nuxt-ui-primary', appConfig.ui.primary)
@@ -44,10 +44,10 @@ const primary = computed({
 
 const grayColors = computed(() => ['slate', 'cool', 'zinc', 'neutral', 'stone'].map(color => ({ value: color, text: color, hex: colors[color][colorMode.value === 'dark' ? 400 : 500] })))
 const gray = computed({
-  get () {
+  get() {
     return grayColors.value.find(option => option.value === appConfig.ui.gray)
   },
-  set (option) {
+  set(option) {
     appConfig.ui.gray = option.value
 
     window.localStorage.setItem('nuxt-ui-gray', appConfig.ui.gray)

docs/components/color-picker/ColorPickerPill.vue

@@ -20,6 +20,6 @@
 </template>
 
 <script setup lang="ts">
-defineProps<{ color: { value: string, hex: string }, selected: { value: string} }>()
+defineProps<{ color: { value: string, hex: string }, selected: { value: string } }>()
 defineEmits(['select'])
 </script>

docs/components/content/ColorModeButton.vue

@@ -18,10 +18,10 @@
 const colorMode = useColorMode()
 
 const isDark = computed({
-  get () {
+  get() {
     return colorMode.value === 'dark'
   },
-  set () {
+  set() {
     colorMode.preference = colorMode.value === 'dark' ? 'light' : 'dark'
   }
 })

docs/components/content/ComponentCard.vue

@@ -51,11 +51,9 @@
 </template>
 
 <script setup lang="ts">
-import { transformContent } from '@nuxt/content/transformers'
 import { upperFirst, camelCase, kebabCase } from 'scule'
 import { useShikiHighlighter } from '~/composables/useShikiHighlighter'
 
-// eslint-disable-next-line vue/no-dupe-keys
 const props = defineProps({
   slug: {
     type: String,
@@ -90,7 +88,7 @@ const props = defineProps({
     default: () => []
   },
   options: {
-    type: Array as PropType<{ name: string; values: string[]; restriction: 'expected' | 'included' | 'excluded' | 'only' }[]>,
+    type: Array as PropType<{ name: string, values: string[], restriction: 'expected' | 'included' | 'excluded' | 'only' }[]>,
     default: () => []
   },
   backgroundClass: {
@@ -115,7 +113,6 @@ const props = defineProps({
   }
 })
 
-// eslint-disable-next-line vue/no-dupe-keys
 const baseProps = reactive({ ...props.baseProps })
 const componentProps = reactive({ ...props.props })
 
@@ -159,13 +156,13 @@ const generateOptions = (key: string, schema: { kind: string, schema: [], type:
   const schemaOptions = Object.values(schema?.schema || {})
 
   if (key.toLowerCase() === 'size' && schemaOptions?.length > 0) {
-    const baseSizeOrder = { 'xs': 1, 'sm': 2, 'md': 3, 'lg': 4, 'xl': 5 }
+    const baseSizeOrder = { xs: 1, sm: 2, md: 3, lg: 4, xl: 5 }
     schemaOptions.sort((a: string, b: string) => {
-      const aBase = a.match(/[a-zA-Z]+/)[0].toLowerCase()
-      const bBase = b.match(/[a-zA-Z]+/)[0].toLowerCase()
+      const aBase = a.match(/[a-z]+/i)[0].toLowerCase()
+      const bBase = b.match(/[a-z]+/i)[0].toLowerCase()
 
-      const aNum = parseInt(a.match(/\d+/)?.[0]) || 1
-      const bNum = parseInt(b.match(/\d+/)?.[0]) || 1
+      const aNum = Number.parseInt(a.match(/\d+/)?.[0]) || 1
+      const bNum = Number.parseInt(b.match(/\d+/)?.[0]) || 1
 
       if (aBase === bBase) {
         return aBase === 'xs' ? bNum - aNum : aNum - bNum
@@ -215,7 +212,6 @@ const propsToSelect = computed(() => Object.keys(componentProps).map((key) => {
   }
 }).filter(Boolean))
 
-// eslint-disable-next-line vue/no-dupe-keys
 const code = computed(() => {
   let code = `\`\`\`html
 <template>
@@ -254,7 +250,7 @@ const code = computed(() => {
   return code
 })
 
-function renderObject (obj: any) {
+function renderObject(obj: any) {
   if (Array.isArray(obj)) {
     return `[${obj.map(renderObject).join(', ')}]`
   }
@@ -270,27 +266,28 @@ function renderObject (obj: any) {
   return obj
 }
 
-const { data: ast } = await useAsyncData(
-  `${name}-ast-${JSON.stringify({ props: componentProps, slots: props.slots, code: props.code })}`,
-  async () => {
-    let formatted = ''
-    try {
-      formatted = await $prettier.format(code.value) || code.value
-    } catch (error) {
-      formatted = code.value
-    }
-
-    return transformContent('content:_markdown.md', formatted, {
-      markdown: {
-        highlight: {
-          highlighter,
-          theme: {
-            light: 'material-theme-lighter',
-            default: 'material-theme',
-            dark: 'material-theme-palenight'
-          }
-        }
-      }
+const { data: ast } = await useAsyncData(`${name}-ast-${JSON.stringify({ props: componentProps, slots: props.slots, code: props.code })}`, async () => {
+  let formatted = ''
+  try {
+    // @ts-ignore
+    formatted = await $prettier.format(code.value, {
+      trailingComma: 'none',
+      semi: false,
+      singleQuote: true
     })
-  }, { watch: [code] })
+  } catch {
+    formatted = code.value
+  }
+
+  return parseMarkdown(formatted, {
+    highlight: {
+      highlighter,
+      theme: {
+        light: 'material-theme-lighter',
+        default: 'material-theme',
+        dark: 'material-theme-palenight'
+      }
+    }
+  })
+}, { watch: [code] })
 </script>

docs/components/content/ComponentExample.vue

@@ -1,10 +1,6 @@
 <template>
   <div class="[&>div>pre]:!rounded-t-none [&>div>pre]:!mt-0">
-    <div
-      v-if="hasPreview"
-      class="flex border border-gray-200 dark:border-gray-700 relative rounded-t-md"
-      :class="[{ 'p-4': padding, 'rounded-b-md': !hasCode, 'border-b-0': hasCode, 'not-prose': !prose }, backgroundClass, extraClass]"
-    >
+    <div v-if="hasPreview" class="flex border border-gray-200 dark:border-gray-700 relative rounded-t-md" :class="[{ 'p-4': padding, 'rounded-b-md': !hasCode, 'border-b-0': hasCode, 'not-prose': !prose }, backgroundClass, extraClass]">
       <template v-if="component">
         <iframe v-if="iframe" :src="`/examples/${component}`" v-bind="iframeProps" :class="backgroundClass" class="w-full" />
         <component :is="camelName" v-else v-bind="componentProps" :class="componentClass" />
@@ -22,7 +18,6 @@
 <script setup lang="ts">
 import { camelCase } from 'scule'
 import { fetchContentExampleCode } from '~/composables/useContentExamplesCode'
-import { transformContent } from '@nuxt/content/transformers'
 import { useShikiHighlighter } from '~/composables/useShikiHighlighter'
 
 const props = defineProps({
@@ -86,15 +81,13 @@ const highlighter = useShikiHighlighter()
 const hasCode = computed(() => !props.hiddenCode && (data?.code || instance.slots.code))
 const hasPreview = computed(() => !props.hiddenPreview && (props.component || instance.slots.default))
 
-const { data: ast } = await useAsyncData(`content-example-${camelName}-ast`, () => transformContent('content:_markdown.md', `\`\`\`vue\n${data?.code ?? ''}\n\`\`\``, {
-  markdown: {
-    highlight: {
-      highlighter,
-      theme: {
-        light: 'material-theme-lighter',
-        default: 'material-theme',
-        dark: 'material-theme-palenight'
-      }
+const { data: ast } = await useAsyncData(`content-example-${camelName}-ast`, () => parseMarkdown(`\`\`\`vue\n${data?.code ?? ''}\n\`\`\``, {
+  highlight: {
+    highlighter,
+    theme: {
+      light: 'material-theme-lighter',
+      default: 'material-theme',
+      dark: 'material-theme-palenight'
     }
   }
 }))

docs/components/content/ComponentPreset.vue

@@ -3,11 +3,10 @@
 </template>
 
 <script setup lang="ts">
-import { transformContent } from '@nuxt/content/transformers'
 import { upperFirst, camelCase } from 'scule'
 import json5 from 'json5'
-import { useShikiHighlighter } from '~/composables/useShikiHighlighter'
 import * as config from '#ui/ui.config'
+import { useShikiHighlighter } from '~/composables/useShikiHighlighter'
 
 const props = defineProps({
   slug: {
@@ -18,26 +17,24 @@ const props = defineProps({
 
 const route = useRoute()
 const highlighter = useShikiHighlighter()
-// eslint-disable-next-line vue/no-dupe-keys
+
 const slug = props.slug || route.params.slug[route.params.slug.length - 1]
 const camelName = camelCase(slug)
 const name = `U${upperFirst(camelName)}`
 
 const preset = config[camelName]
 
-const { data: ast } = await useAsyncData(`${name}-preset`, () => transformContent('content:_markdown.md', `
+const { data: ast } = await useAsyncData(`${name}-preset`, () => parseMarkdown(`
 \`\`\`yml
-${json5.stringify(preset, null, 2)}
+${json5.stringify(preset, null, 2).replace(/,([ |\t\n]+[}|\])])/g, '$1')}
 \`\`\`\
 `, {
-  markdown: {
-    highlight: {
-      highlighter,
-      theme: {
-        light: 'material-theme-lighter',
-        default: 'material-theme',
-        dark: 'material-theme-palenight'
-      }
+  highlight: {
+    highlighter,
+    theme: {
+      light: 'material-theme-lighter',
+      default: 'material-theme',
+      dark: 'material-theme-palenight'
     }
   }
 }))

docs/components/content/ComponentPropsField.vue

@@ -36,7 +36,7 @@ defineProps({
   }
 })
 
-function startsWithCapital (word) {
+function startsWithCapital(word) {
   if (word.charAt(0).startsWith('"')) {
     return false
   }

docs/components/content/examples/BreadcrumbExampleIconSlot.vue

@@ -13,7 +13,7 @@ const links = [{
   <UBreadcrumb :links="links" :divider="null" :ui="{ ol: 'gap-x-3' }">
     <template #icon="{ link, index, isActive }">
       <UAvatar
-        :alt="(index + 1 ).toString()"
+        :alt="(index + 1).toString()"
         :ui="{
           background: isActive ? 'bg-primary-500 dark:bg-primary-400' : undefined,
           placeholder: isActive ? 'text-white dark:text-gray-900' : !!link.to ? 'group-hover:text-gray-700 dark:group-hover:text-gray-200' : ''

docs/components/content/examples/CommandPaletteExampleGroups.vue

@@ -18,19 +18,21 @@ const actions = [
 ]
 
 const groups = computed(() =>
-  [commandPaletteRef.value?.query ? {
-    key: 'users',
-    commands: users
-  } : {
-    key: 'recent',
-    label: 'Recent searches',
-    commands: users.slice(0, 1)
-  }, {
+  [commandPaletteRef.value?.query
+    ? {
+        key: 'users',
+        commands: users
+      }
+    : {
+        key: 'recent',
+        label: 'Recent searches',
+        commands: users.slice(0, 1)
+      }, {
     key: 'actions',
     commands: actions
   }].filter(Boolean))
 
-function onSelect (option) {
+function onSelect(option) {
   if (option.click) {
     option.click()
   } else if (option.to) {

docs/components/content/examples/CommandPaletteExampleThemeAlgolia.vue

@@ -71,7 +71,7 @@ const ui = {
     :autoselect="false"
     command-attribute="title"
     :fuse="{
-      fuseOptions: { keys: ['title', 'category'] },
+      fuseOptions: { keys: ['title', 'category'] }
     }"
     placeholder="Search docs"
   />

docs/components/content/examples/CommandPaletteExampleThemeRaycast.vue

@@ -45,7 +45,7 @@ const ui = {
         inactive: 'text-gray-400 dark:text-gray-500'
       },
       avatar: {
-        size: '2xs' as const
+        size: '2xs'
       }
     }
   }

docs/components/content/examples/ContextMenuExample.vue

@@ -7,7 +7,7 @@ const { y: windowY } = useWindowScroll()
 const isOpen = ref(false)
 const virtualElement = ref({ getBoundingClientRect: () => ({}) })
 
-function onContextMenu () {
+function onContextMenu() {
   const top = unref(y) - unref(windowY)
   const left = unref(x)
 

docs/components/content/examples/ContextMenuExampleArrow.vue

@@ -7,7 +7,7 @@ const { y: windowY } = useWindowScroll()
 const isOpen = ref(false)
 const virtualElement = ref({ getBoundingClientRect: () => ({}) })
 
-function onContextMenu () {
+function onContextMenu() {
   const top = unref(y) - unref(windowY)
   const left = unref(x)
 

docs/components/content/examples/ContextMenuExampleOffset.vue

@@ -7,7 +7,7 @@ const { y: windowY } = useWindowScroll()
 const isOpen = ref(false)
 const virtualElement = ref({ getBoundingClientRect: () => ({}) })
 
-function onContextMenu () {
+function onContextMenu() {
   const top = unref(y) - unref(windowY)
   const left = unref(x)
 

docs/components/content/examples/ContextMenuExamplePlacement.vue

@@ -7,7 +7,7 @@ const { y: windowY } = useWindowScroll()
 const isOpen = ref(false)
 const virtualElement = ref({ getBoundingClientRect: () => ({}) })
 
-function onContextMenu () {
+function onContextMenu() {
   const top = unref(y) - unref(windowY)
   const left = unref(x)
 

docs/components/content/examples/DatePickerRangeExample.vue

@@ -11,11 +11,11 @@ const ranges = [
 ]
 const selected = ref({ start: sub(new Date(), { days: 14 }), end: new Date() })
 
-function isRangeSelected (duration: Duration) {
+function isRangeSelected(duration: Duration) {
   return isSameDay(selected.value.start, sub(new Date(), duration)) && isSameDay(selected.value.end, new Date())
 }
 
-function selectRange (duration: Duration) {
+function selectRange(duration: Duration) {
   selected.value = { start: sub(new Date(), duration), end: new Date() }
 }
 </script>

docs/components/content/examples/FormExampleBasic.vue

@@ -13,7 +13,7 @@ const validate = (state: any): FormError[] => {
   return errors
 }
 
-async function onSubmit (event: FormSubmitEvent<any>) {
+async function onSubmit(event: FormSubmitEvent<any>) {
   // Do something with data
   console.log(event.data)
 }

docs/components/content/examples/FormExampleElements.vue

@@ -53,7 +53,7 @@ type Schema = z.infer<typeof schema>
 
 const form = ref()
 
-async function onSubmit (event: FormSubmitEvent<Schema>) {
+async function onSubmit(event: FormSubmitEvent<Schema>) {
   // Do something with event.data
   console.log(event.data)
 }

docs/components/content/examples/FormExampleJoi.vue

@@ -14,7 +14,7 @@ const state = reactive({
   password: undefined
 })
 
-async function onSubmit (event: FormSubmitEvent<any>) {
+async function onSubmit(event: FormSubmitEvent<any>) {
   // Do something with event.data
   console.log(event.data)
 }

docs/components/content/examples/FormExampleOnError.vue

@@ -13,12 +13,12 @@ const validate = (state: any): FormError[] => {
   return errors
 }
 
-async function onSubmit (event: FormSubmitEvent<any>) {
+async function onSubmit(event: FormSubmitEvent<any>) {
   // Do something with data
   console.log(event.data)
 }
 
-async function onError (event: FormErrorEvent) {
+async function onError(event: FormErrorEvent) {
   const element = document.getElementById(event.errors[0].id)
   element?.focus()
   element?.scrollIntoView({ behavior: 'smooth', block: 'center' })

docs/components/content/examples/FormExampleSuperstruct.vue

@@ -0,0 +1,36 @@
+<script setup lang="ts">
+import { object, string, nonempty, type Infer } from 'superstruct'
+import type { FormSubmitEvent } from '#ui/types'
+
+const schema = object({
+  email: nonempty(string()),
+  password: nonempty(string())
+})
+
+const state = reactive({
+  email: '',
+  password: ''
+})
+
+type Schema = Infer<typeof schema>
+
+async function onSubmit(event: FormSubmitEvent<Schema>) {
+  console.log(event.data)
+}
+</script>
+
+<template>
+  <UForm :schema="schema" :state="state" class="space-y-4" @submit="onSubmit">
+    <UFormGroup label="Email" name="email">
+      <UInput v-model="state.email" />
+    </UFormGroup>
+
+    <UFormGroup label="Password" name="password">
+      <UInput v-model="state.password" type="password" />
+    </UFormGroup>
+
+    <UButton type="submit">
+      Submit
+    </UButton>
+  </UForm>
+</template>

docs/components/content/examples/FormExampleValibot.vue

@@ -14,7 +14,7 @@ const state = reactive({
   password: ''
 })
 
-async function onSubmit (event: FormSubmitEvent<Schema>) {
+async function onSubmit(event: FormSubmitEvent<Schema>) {
   // Do something with event.data
   console.log(event.data)
 }

docs/components/content/examples/FormExampleYup.vue

@@ -16,7 +16,7 @@ const state = reactive({
   password: undefined
 })
 
-async function onSubmit (event: FormSubmitEvent<Schema>) {
+async function onSubmit(event: FormSubmitEvent<Schema>) {
   // Do something with event.data
   console.log(event.data)
 }

docs/components/content/examples/FormExampleZod.vue

@@ -14,7 +14,7 @@ const state = reactive({
   password: undefined
 })
 
-async function onSubmit (event: FormSubmitEvent<Schema>) {
+async function onSubmit(event: FormSubmitEvent<Schema>) {
   // Do something with data
   console.log(event.data)
 }

docs/components/content/examples/InputMenuExampleSearchAsync.vue

@@ -2,7 +2,7 @@
 const loading = ref(false)
 const selected = ref()
 
-async function search (q: string) {
+async function search(q: string) {
   loading.value = true
 
   const users: any[] = await $fetch('https://jsonplaceholder.typicode.com/users', { params: { q } })

docs/components/content/examples/ModalExampleComponent.vue

@@ -8,7 +8,7 @@ defineProps({
 
 const emit = defineEmits(['success'])
 
-function onSuccess () {
+function onSuccess() {
   emit('success')
 }
 </script>

docs/components/content/examples/ModalExampleComposable.vue

@@ -5,11 +5,11 @@ const toast = useToast()
 const modal = useModal()
 const count = ref(0)
 
-function openModal () {
+function openModal() {
   count.value += 1
   modal.open(ModalExampleComponent, {
     count: count.value,
-    onSuccess () {
+    onSuccess() {
       toast.add({
         title: 'Success !',
         id: 'modal-success'

docs/components/content/examples/NotificationExampleCallback.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 const toast = useToast()
 
-function onCallback () {
+function onCallback() {
   alert('Notification expired!')
 }
 </script>

docs/components/content/examples/NotificationExampleClick.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 const toast = useToast()
 
-function onClick () {
+function onClick() {
   alert('Clicked!')
 }
 </script>

docs/components/content/examples/PaginationExampleFirstLastSlots.vue

@@ -5,15 +5,29 @@ const items = ref(Array(55))
 
 <template>
   <UPagination v-model="page" :total="items.length" :ui="{ rounded: 'first-of-type:rounded-s-md last-of-type:rounded-e-md' }">
-    <template #first="{ onClick }">
+    <template #first="{ onClick, canGoFirst }">
       <UTooltip text="First page">
-        <UButton icon="i-heroicons-arrow-uturn-left" color="primary" :ui="{ rounded: 'rounded-full' }" class="rtl:[&_span:first-child]:rotate-180 me-2" @click="onClick" />
+        <UButton
+          icon="i-heroicons-arrow-uturn-left"
+          color="primary"
+          :ui="{ rounded: 'rounded-full' }"
+          class="rtl:[&_span:first-child]:rotate-180 me-2"
+          :disabled="!canGoFirst"
+          @click="onClick"
+        />
       </UTooltip>
     </template>
 
-    <template #last="{ onClick }">
+    <template #last="{ onClick, canGoLast }">
       <UTooltip text="Last page">
-        <UButton icon="i-heroicons-arrow-uturn-right-20-solid" color="primary" :ui="{ rounded: 'rounded-full' }" class="rtl:[&_span:last-child]:rotate-180 ms-2" @click="onClick" />
+        <UButton
+          icon="i-heroicons-arrow-uturn-right-20-solid"
+          color="primary"
+          :ui="{ rounded: 'rounded-full' }"
+          class="rtl:[&_span:last-child]:rotate-180 ms-2"
+          :disabled="!canGoLast"
+          @click="onClick"
+        />
       </UTooltip>
     </template>
   </UPagination>

docs/components/content/examples/PaginationExamplePrevNextSlots.vue

@@ -5,15 +5,29 @@ const items = ref(Array(55))
 
 <template>
   <UPagination v-model="page" :total="items.length" :ui="{ rounded: 'first-of-type:rounded-s-md last-of-type:rounded-e-md' }">
-    <template #prev="{ onClick }">
+    <template #prev="{ onClick, canGoPrev }">
       <UTooltip text="Previous page">
-        <UButton icon="i-heroicons-arrow-small-left-20-solid" color="primary" :ui="{ rounded: 'rounded-full' }" class="rtl:[&_span:first-child]:rotate-180 me-2" @click="onClick" />
+        <UButton
+          icon="i-heroicons-arrow-small-left-20-solid"
+          color="primary"
+          :ui="{ rounded: 'rounded-full' }"
+          class="rtl:[&_span:first-child]:rotate-180 me-2"
+          :disabled="!canGoPrev"
+          @click="onClick"
+        />
       </UTooltip>
     </template>
 
-    <template #next="{ onClick }">
+    <template #next="{ onClick, canGoNext }">
       <UTooltip text="Next page">
-        <UButton icon="i-heroicons-arrow-small-right-20-solid" color="primary" :ui="{ rounded: 'rounded-full' }" class="rtl:[&_span:last-child]:rotate-180 ms-2" @click="onClick" />
+        <UButton
+          icon="i-heroicons-arrow-small-right-20-solid"
+          color="primary"
+          :ui="{ rounded: 'rounded-full' }"
+          class="rtl:[&_span:last-child]:rotate-180 ms-2"
+          :disabled="!canGoNext"
+          @click="onClick"
+        />
       </UTooltip>
     </template>
   </UPagination>

docs/components/content/examples/PaginationExampleTo.vue

@@ -11,7 +11,7 @@ const items = ref(Array(50))
     :to="(page: number) => ({
       query: { page },
       // Hash is specified here to prevent the page from scrolling to the top
-      hash: '#links',
+      hash: '#links'
     })"
   />
 </template>

docs/components/content/examples/ProgressExampleSlotIndicator.vue

@@ -3,10 +3,10 @@ const temp = ref(35)
 
 const color = computed(() => {
   switch (true) {
-  case temp.value < 10: return 'blue'
-  case temp.value < 20: return 'amber'
-  case temp.value < 30: return 'orange'
-  default: return 'red'
+    case temp.value < 10: return 'blue'
+    case temp.value < 20: return 'amber'
+    case temp.value < 30: return 'orange'
+    default: return 'red'
   }
 })
 </script>

docs/components/content/examples/SelectMenuExampleCreatable.vue

@@ -37,7 +37,7 @@ const labels = computed({
   }
 })
 
-function hashCode (str) {
+function hashCode(str) {
   let hash = 0
   for (let i = 0; i < str.length; i++) {
     hash = str.charCodeAt(i) + ((hash << 5) - hash)
@@ -45,7 +45,7 @@ function hashCode (str) {
   return hash
 }
 
-function intToRGB (i) {
+function intToRGB(i) {
   const c = (i & 0x00FFFFFF)
     .toString(16)
     .toUpperCase()
@@ -53,7 +53,7 @@ function intToRGB (i) {
   return '00000'.substring(0, 6 - c.length) + c
 }
 
-function generateColorFromString (str) {
+function generateColorFromString(str) {
   return intToRGB(hashCode(str))
 }
 </script>

docs/components/content/examples/SelectMenuExampleCreatableFunction.vue

@@ -38,7 +38,7 @@ const labels = computed({
 
 const showCreateOption = (query, results) => {
   const lowercaseQuery = String.prototype.toLowerCase.apply(query || '')
-  return lowercaseQuery.length >= 3 && !results.find(option => {
+  return lowercaseQuery.length >= 3 && !results.find((option) => {
     return String.prototype.toLowerCase.apply(option['name'] || '') === lowercaseQuery
   })
 }

docs/components/content/examples/SelectMenuExampleSearchAsync.vue

@@ -2,7 +2,7 @@
 const loading = ref(false)
 const selected = ref([])
 
-async function search (q: string) {
+async function search(q: string) {
   loading.value = true
 
   const users: any[] = await $fetch('https://jsonplaceholder.typicode.com/users', { params: { q } })

docs/components/content/examples/SlideoverExampleComponent.vue

@@ -1,5 +1,4 @@
 <script lang="ts" setup>
-
 const props = defineProps({
   count: {
     type: Number,
@@ -8,7 +7,7 @@ const props = defineProps({
 })
 
 const emits = defineEmits<{
-  close: [];
+  close: []
 }>()
 </script>
 
@@ -27,4 +26,4 @@ const emits = defineEmits<{
       <Placeholder class="h-full" />
     </UCard>
   </USlideover>
-</template>
+</template>

docs/components/content/examples/SlideoverExampleComposable.vue

@@ -3,7 +3,7 @@ import { SlideoverExampleComponent } from '#components'
 
 const slideover = useSlideover()
 const count = ref(0)
-function openSlideover () {
+function openSlideover() {
   count.value += 1
   slideover.open(SlideoverExampleComponent, {
     count: count.value,

docs/components/content/examples/TableExampleAdvanced.vue

@@ -1,6 +1,9 @@
 <script lang="ts" setup>
 // Columns
 const columns = [{
+  key: 'select',
+  class: 'w-2'
+}, {
   key: 'id',
   label: '#',
   sortable: true
@@ -19,13 +22,14 @@ const columns = [{
 }]
 
 const selectedColumns = ref(columns)
-const columnsTable = computed(() => columns.filter((column) => selectedColumns.value.includes(column)))
+const columnsTable = computed(() => columns.filter(column => selectedColumns.value.includes(column)))
+const excludeSelectColumn = computed(() => columns.filter(v => v.key !== 'select'))
 
 // Selected Rows
 const selectedRows = ref([])
 
-function select (row) {
-  const index = selectedRows.value.findIndex((item) => item.id === row.id)
+function select(row) {
+  const index = selectedRows.value.findIndex(item => item.id === row.id)
   if (index === -1) {
     selectedRows.value.push(row)
   } else {
@@ -92,10 +96,10 @@ const { data: todos, status } = await useLazyAsyncData<{
 }[]>('todos', () => ($fetch as any)(`https://jsonplaceholder.typicode.com/todos${searchStatus.value}`, {
   query: {
     q: search.value,
-    '_page': page.value,
-    '_limit': pageCount.value,
-    '_sort': sort.value.column,
-    '_order': sort.value.direction
+    _page: page.value,
+    _limit: pageCount.value,
+    _sort: sort.value.column,
+    _order: sort.value.direction
   }
 }), {
   default: () => [],
@@ -153,7 +157,7 @@ const { data: todos, status } = await useLazyAsyncData<{
           </UButton>
         </UDropdown>
 
-        <USelectMenu v-model="selectedColumns" :options="columns" multiple>
+        <USelectMenu v-model="selectedColumns" :options="excludeSelectColumn" multiple>
           <UButton
             icon="i-heroicons-view-columns"
             color="gray"

docs/components/content/examples/TableExampleClickable.vue

@@ -31,8 +31,8 @@ const people = [{
   role: 'Owner'
 }]
 
-function select (row) {
-  const index = selected.value.findIndex((item) => item.id === row.id)
+function select(row) {
+  const index = selected.value.findIndex(item => item.id === row.id)
   if (index === -1) {
     selected.value.push(row)
   } else {

docs/components/content/examples/TableExampleContextmenu.vue

@@ -0,0 +1,66 @@
+<script setup lang="ts">
+const people = [{
+  id: 1,
+  name: 'Lindsay Walton',
+  title: 'Front-end Developer',
+  email: 'lindsay.walton@example.com',
+  role: 'Member'
+}, {
+  id: 2,
+  name: 'Courtney Henry',
+  title: 'Designer',
+  email: 'courtney.henry@example.com',
+  role: 'Admin'
+}, {
+  id: 3,
+  name: 'Tom Cook',
+  title: 'Director of Product',
+  email: 'tom.cook@example.com',
+  role: 'Member'
+}, {
+  id: 4,
+  name: 'Whitney Francis',
+  title: 'Copywriter',
+  email: 'whitney.francis@example.com',
+  role: 'Admin'
+}, {
+  id: 5,
+  name: 'Leonard Krasner',
+  title: 'Senior Designer',
+  email: 'leonard.krasner@example.com',
+  role: 'Owner'
+}]
+
+const virtualElement = ref({ getBoundingClientRect: () => ({}) })
+const contextMenuRow = ref()
+
+function contextmenu(event: MouseEvent, row: any) {
+  // Prevent the default context menu
+  event.preventDefault()
+
+  virtualElement.value.getBoundingClientRect = () => ({
+    width: 0,
+    height: 0,
+    top: event.clientY,
+    left: event.clientX
+  })
+
+  contextMenuRow.value = row
+}
+</script>
+
+<template>
+  <div>
+    <UTable :rows="people" @contextmenu.stop="contextmenu" />
+
+    <UContextMenu
+      :virtual-element="virtualElement"
+      :model-value="!!contextMenuRow"
+      @update:model-value="contextMenuRow = null"
+    >
+      <div class="p-4">
+        {{ contextMenuRow.id }} - {{ contextMenuRow.name }}
+      </div>
+    </UContextMenu>
+  </div>
+</template>

docs/components/content/examples/TableExampleDisabledExpandable.vue

@@ -0,0 +1,75 @@
+<script setup>
+const people = [{
+  id: 1,
+  name: 'Lindsay Walton',
+  title: 'Front-end Developer',
+  email: 'lindsay.walton@example.com',
+  role: 'Member'
+}, {
+  id: 2,
+  name: 'Courtney Henry',
+  title: 'Designer',
+  email: 'courtney.henry@example.com',
+  role: 'Admin',
+  disabledExpand: true
+}, {
+  id: 3,
+  name: 'Tom Cook',
+  title: 'Director of Product',
+  email: 'tom.cook@example.com',
+  role: 'Member'
+}, {
+  id: 4,
+  name: 'Whitney Francis',
+  title: 'Copywriter',
+  email: 'whitney.francis@example.com',
+  role: 'Admin',
+  disabledExpand: true
+}, {
+  id: 5,
+  name: 'Leonard Krasner',
+  title: 'Senior Designer',
+  email: 'leonard.krasner@example.com',
+  role: 'Owner'
+}, {
+  id: 6,
+  name: 'Floyd Miles',
+  title: 'Principal Designer',
+  email: 'floyd.miles@example.com',
+  role: 'Member',
+  disabledExpand: true
+}]
+const columns = [
+  {
+    label: 'Name',
+    key: 'name'
+  },
+  {
+    label: 'title',
+    key: 'title'
+  },
+  {
+    label: 'Email',
+    key: 'email'
+  },
+  {
+    label: 'role',
+    key: 'role'
+  }
+]
+
+const expand = ref({
+  openedRows: [],
+  row: null
+})
+</script>
+
+<template>
+  <UTable v-model:expand="expand" :rows="people" :columns="columns">
+    <template #expand="{ row }">
+      <div class="p-4">
+        <pre>{{ row }}</pre>
+      </div>
+    </template>
+  </UTable>
+</template>

docs/components/content/examples/TableExampleDynamicallyRenderSelectable.vue

@@ -0,0 +1,64 @@
+<script setup lang="ts">
+const people = [{
+  id: 1,
+  name: 'Lindsay Walton',
+  title: 'Front-end Developer',
+  email: 'lindsay.walton@example.com',
+  role: 'Member'
+}, {
+  id: 2,
+  name: 'Courtney Henry',
+  title: 'Designer',
+  email: 'courtney.henry@example.com',
+  role: 'Admin'
+}, {
+  id: 3,
+  name: 'Tom Cook',
+  title: 'Director of Product',
+  email: 'tom.cook@example.com',
+  role: 'Member'
+}, {
+  id: 4,
+  name: 'Whitney Francis',
+  title: 'Copywriter',
+  email: 'whitney.francis@example.com',
+  role: 'Admin'
+}, {
+  id: 5,
+  name: 'Leonard Krasner',
+  title: 'Senior Designer',
+  email: 'leonard.krasner@example.com',
+  role: 'Owner'
+}, {
+  id: 6,
+  name: 'Floyd Miles',
+  title: 'Principal Designer',
+  email: 'floyd.miles@example.com',
+  role: 'Member'
+}]
+
+const selected = ref([people[1]])
+
+const columns = [{
+  key: 'id',
+  label: 'ID'
+}, {
+  key: 'name',
+  label: 'User name'
+}, {
+  key: 'title',
+  label: 'Job position'
+}, {
+  key: 'email',
+  label: 'Email'
+}, {
+  key: 'role'
+}, {
+  key: 'select',
+  class: 'w-2'
+}]
+</script>
+
+<template>
+  <UTable v-model="selected" :rows="people" :columns="columns" />
+</template>

docs/components/content/examples/TableExampleExpandActionSlot.vue

@@ -0,0 +1,65 @@
+<script setup lang='ts'>
+const people = [{
+  id: 1,
+  name: 'Lindsay Walton',
+  title: 'Front-end Developer',
+  email: 'lindsay.walton@example.com',
+  role: 'Member',
+  hasExpand: false
+}, {
+  id: 2,
+  name: 'Courtney Henry',
+  title: 'Designer',
+  email: 'courtney.henry@example.com',
+  role: 'Admin',
+  hasExpand: true
+}, {
+  id: 3,
+  name: 'Tom Cook',
+  title: 'Director of Product',
+  email: 'tom.cook@example.com',
+  role: 'Member',
+  hasExpand: false
+}, {
+  id: 4,
+  name: 'Whitney Francis',
+  title: 'Copywriter',
+  email: 'whitney.francis@example.com',
+  role: 'Admin',
+  hasExpand: true
+}, {
+  id: 5,
+  name: 'Leonard Krasner',
+  title: 'Senior Designer',
+  email: 'leonard.krasner@example.com',
+  role: 'Owner',
+  hasExpand: false
+}, {
+  id: 6,
+  name: 'Floyd Miles',
+  title: 'Principal Designer',
+  email: 'floyd.miles@example.com',
+  role: 'Member',
+  hasExpand: true
+}]
+
+const expand = ref({
+  openedRows: [people.find(v => v.hasExpand)],
+  row: {}
+})
+</script>
+
+<template>
+  <UTable v-model:expand="expand" :rows="people">
+    <template #expand="{ row }">
+      <div class="p-4">
+        <pre>{{ row }}</pre>
+      </div>
+    </template>
+    <template #expand-action="{ row, isExpanded, toggle }">
+      <UButton v-if="row.hasExpand" @click="toggle">
+        {{ isExpanded ? 'collapse' : 'expand' }}
+      </UButton>
+    </template>
+  </UTable>
+</template>

docs/components/content/examples/TableExampleExpandable.vue

@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang='ts'>
 const people = [{
   id: 1,
   name: 'Lindsay Walton',
@@ -36,10 +36,15 @@ const people = [{
   email: 'floyd.miles@example.com',
   role: 'Member'
 }]
+
+const expand = ref({
+  openedRows: [people[0]],
+  row: {}
+})
 </script>
 
 <template>
-  <UTable :rows="people">
+  <UTable v-model:expand="expand" :rows="people">
     <template #expand="{ row }">
       <div class="p-4">
         <pre>{{ row }}</pre>

docs/components/content/examples/TableExampleLoadingSlot.vue

@@ -34,53 +34,55 @@ const pending = ref(true)
 /* https://codepen.io/jenning/pen/YzNmzaV */
 
 .loader {
-	--color: rgb(var(--color-primary-400));
-	--size-mid: 6vmin;
-	--size-dot: 1.5vmin;
-	--size-bar: 0.4vmin;
-	--size-square: 3vmin;
+  --color: rgb(var(--color-primary-400));
+  --size-mid: 6vmin;
+  --size-dot: 1.5vmin;
+  --size-bar: 0.4vmin;
+  --size-square: 3vmin;
 
-	display: block;
-	position: relative;
-	width: 50%;
-	display: grid;
-	place-items: center;
+  display: block;
+  position: relative;
+  width: 50%;
+  display: grid;
+  place-items: center;
 }
 
 .loader::before,
 .loader::after {
-	content: '';
-	box-sizing: border-box;
-	position: absolute;
+  content: '';
+  box-sizing: border-box;
+  position: absolute;
 }
 
 /**
-	loader --6
+loader --6
 **/
 .loader.--6::before {
-	width: var(--size-square);
-	height: var(--size-square);
-	background-color: var(--color);
-	top: calc(50% - var(--size-square));
-	left: calc(50% - var(--size-square));
-	animation: loader-6 2.4s cubic-bezier(0, 0, 0.24, 1.21) infinite;
+  width: var(--size-square);
+  height: var(--size-square);
+  background-color: var(--color);
+  top: calc(50% - var(--size-square));
+  left: calc(50% - var(--size-square));
+  animation: loader-6 2.4s cubic-bezier(0, 0, 0.24, 1.21) infinite;
 }
 
 @keyframes loader-6 {
-	0%, 100% {
-		transform: none;
-	}
 
-	25% {
-		transform: translateX(100%);
-	}
+  0%,
+  100% {
+    transform: none;
+  }
 
-	50% {
-		transform: translateX(100%) translateY(100%);
-	}
+  25% {
+    transform: translateX(100%);
+  }
 
-	75% {
-		transform: translateY(100%);
-	}
+  50% {
+    transform: translateX(100%) translateY(100%);
+  }
+
+  75% {
+    transform: translateY(100%);
+  }
 }
 </style>

docs/components/content/examples/TableExampleSlots.vue

@@ -53,7 +53,7 @@ const people = [{
   role: 'Member'
 }]
 
-const items = (row) => [
+const items = row => [
   [{
     label: 'Edit',
     icon: 'i-heroicons-pencil-square-20-solid',

docs/components/content/examples/TabsExampleChange.vue

@@ -13,7 +13,7 @@ const items = [{
   content: 'Finally, this is the content for Tab3'
 }]
 
-function onChange (index) {
+function onChange(index) {
   const item = items[index]
 
   alert(`${item.label} was clicked!`)

docs/components/content/examples/TabsExampleItemCustomSlot.vue

@@ -10,11 +10,11 @@ const items = [{
 const accountForm = reactive({ name: 'Benjamin', username: 'benjamincanac' })
 const passwordForm = reactive({ currentPassword: '', newPassword: '' })
 
-function onSubmitAccount () {
+function onSubmitAccount() {
   console.log('Submitted form:', accountForm)
 }
 
-function onSubmitPassword () {
+function onSubmitPassword() {
   console.log('Submitted form:', passwordForm)
 }
 </script>

docs/components/content/examples/TabsExampleItemSlot.vue

@@ -12,7 +12,7 @@ const items = [{
 const accountForm = reactive({ name: 'Benjamin', username: 'benjamincanac' })
 const passwordForm = reactive({ currentPassword: '', newPassword: '' })
 
-function onSubmit (form) {
+function onSubmit(form) {
   console.log('Submitted form:', form)
 }
 </script>

docs/components/content/examples/TabsExampleVModel.vue

@@ -17,15 +17,15 @@ const route = useRoute()
 const router = useRouter()
 
 const selected = computed({
-  get () {
-    const index = items.findIndex((item) => item.label === route.query.tab)
+  get() {
+    const index = items.findIndex(item => item.label === route.query.tab)
     if (index === -1) {
       return 0
     }
 
     return index
   },
-  set (value) {
+  set(value) {
     // Hash is specified here to prevent the page from scrolling to the top
     router.replace({ query: { tab: items[value].label }, hash: '#control-the-selected-index' })
   }

docs/components/date-picker/DatePicker.vue

@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import { useBreakpoints, breakpointsTailwind } from '@vueuse/core'
 import { DatePicker as VCalendarDatePicker } from 'v-calendar'
 // @ts-ignore
 import type { DatePickerDate, DatePickerRangeObject } from 'v-calendar/dist/types/src/use/datePicker'
@@ -26,22 +25,34 @@ const date = computed({
   }
 })
 
-const breakpoints = useBreakpoints(breakpointsTailwind)
-
-const smallerThanSm = breakpoints.smaller('sm')
-
 const attrs = {
-  transparent: true,
-  borderless: true,
-  color: 'primary',
+  'transparent': true,
+  'borderless': true,
+  'color': 'primary',
   'is-dark': { selector: 'html', darkClass: 'dark' },
   'first-day-of-week': 2
 }
+
+function onDayClick(_: any, event: MouseEvent): void {
+  const target = event.target as HTMLElement
+  target.blur()
+}
 </script>
 
 <template>
-  <VCalendarDatePicker v-if="date && (date as DatePickerRangeObject)?.start && (date as DatePickerRangeObject)?.end" v-model.range="date" :columns="smallerThanSm ? 1 : 2" :rows="smallerThanSm ? 2 : 1" v-bind="{ ...attrs, ...$attrs }" />
-  <VCalendarDatePicker v-else v-model="date" v-bind="{ ...attrs, ...$attrs }" />
+  <VCalendarDatePicker
+    v-if="date && (date as DatePickerRangeObject)?.start && (date as DatePickerRangeObject)?.end"
+    v-model.range="date"
+    :columns="2"
+    v-bind="{ ...attrs, ...$attrs }"
+    @dayclick="onDayClick"
+  />
+  <VCalendarDatePicker
+    v-else
+    v-model="date"
+    v-bind="{ ...attrs, ...$attrs }"
+    @dayclick="onDayClick"
+  />
 </template>
 
 <style>

docs/components/home/HomeProDemoBlock.vue

@@ -29,7 +29,7 @@
       v-else
       class="font-semibold flex flex-col gap-1 text-center"
       :class="[
-        !block.slot && (block.inactive || block.inactive === undefined ? 'text-gray-900 dark:text-white' : 'text-white dark:text-gray-900'),
+        !block.slot && (block.inactive || block.inactive === undefined ? 'text-gray-900 dark:text-white' : 'text-white dark:text-gray-900')
       ]"
     >
       {{ block.name }}

docs/components/home/HomeTetris.vue

@@ -36,21 +36,22 @@ const cols = ref(0)
 
 const { width, height } = useElementSize(el)
 
-function createGrid () {
+function createGrid() {
   grid.value = []
 
   for (let i = 0; i <= rows.value; i++) {
+    // eslint-disable-next-line unicorn/no-new-array
     grid.value.push(new Array(cols.value).fill(null))
   }
 }
 
-function createNewCell () {
+function createNewCell() {
   const x = Math.floor(Math.random() * cols.value)
 
   grid.value[0][x] = true
 }
 
-function moveCellsDown () {
+function moveCellsDown() {
   for (let row = rows.value - 1; row >= 0; row--) {
     for (let col = 0; col < cols.value; col++) {
       if (grid.value[row][col] !== null && grid.value[row + 1][col] === null) {
@@ -69,11 +70,11 @@ function moveCellsDown () {
   }, 500)
 }
 
-function removeCell (row, col) {
+function removeCell(row, col) {
   grid.value[row][col] = null
 }
 
-function calcGrid () {
+function calcGrid() {
   const base = Math.ceil(width.value / 60)
   const cell = width.value / base
 

docs/composables/useComponentMeta.ts

@@ -1,13 +1,15 @@
 const useComponentsMetaState = () => useState('components-meta', () => ({}))
 
-export async function fetchComponentMeta (name: string) {
+export async function fetchComponentMeta(name: string) {
   const state = useComponentsMetaState()
 
   if (state.value[name]?.then) {
     await state.value[name]
     return state.value[name]
   }
-  if (state.value[name]) { return state.value[name] }
+  if (state.value[name]) {
+    return state.value[name]
+  }
 
   // Store promise to avoid multiple calls
 

docs/composables/useContentExamplesCode.ts

@@ -1,6 +1,6 @@
 const useContentExamplesCodeState = () => useState('content-examples-code', () => ({}))
 
-export async function fetchContentExampleCode (name?: string) {
+export async function fetchContentExampleCode(name?: string) {
   if (!name) return
   const state = useContentExamplesCodeState()
 
@@ -8,7 +8,9 @@ export async function fetchContentExampleCode (name?: string) {
     await state.value[name]
     return state.value[name]
   }
-  if (state.value[name]) { return state.value[name] }
+  if (state.value[name]) {
+    return state.value[name]
+  }
 
   // add to nitro prerender
   if (import.meta.server) {

docs/content/1.getting-started/1.index.md

@@ -16,7 +16,7 @@ Its goal is to provide everything related to UI when building a Nuxt app. This i
 - Keyboard shortcuts
 - Bundled icons
 - Fully typed
-- [Figma Kit](https://www.figma.com/community/file/1288455405058138934)
+- [Figma Kit](https://www.figma.com/community/file/1436401057300493073)
 
 ## Credits
 

docs/content/1.getting-started/3.theming.md

@@ -221,6 +221,52 @@ export default defineAppConfig({
 })
 ```
 
+### Extend Tailwind Merge
+
+Tailwind Merge is a library that allows you to efficiently merge Tailwind CSS classes. It is used by this module to merge the classes from the `ui` prop, the `class` attribute, and the default classes.
+
+::callout{icon="i-heroicons-light-bulb" to="https://github.com/dcastil/tailwind-merge" target="_blank"}
+Learn more about Tailwind Merge.
+::
+
+By default, Tailwind Merge doesn't handle custom Tailwind CSS configuration like custom colors, spacing, or other utilities you may have defined. You'll need to extend it to handle your custom configuration.
+
+You can extend Tailwind Merge by using the `tailwindMerge` option in your `app.config.ts`:
+
+::code-group
+```ts [app.config.ts]
+export default defineAppConfig({
+  ui: {
+    tailwindMerge: {
+      extend: {
+        theme: {
+          spacing: ['sm', 'md', 'lg', 'xl', '2xl']
+        }
+      }
+    }
+  }
+})
+```
+
+```ts [tailwind.config.ts]
+import type { Config } from 'tailwindcss'
+
+export default <Partial<Config>>{
+  theme: {
+    extend: {
+      spacing: {
+        sm: '0.5rem',
+        md: '1rem',
+        lg: '1.5rem',
+        xl: '2rem',
+        '2xl': '2.5rem'
+      }
+    }
+  }
+}
+```
+::
+
 ## Dark mode
 
 All the components are styled with dark mode in mind.

docs/content/2.components/badge.md

@@ -141,6 +141,74 @@ Badge
 You can customize the whole [preset](#preset) by using the `ui` prop.
 ::
 
+### Icon
+
+Use any icon from [Iconify](https://icones.js.org) by setting the `icon` prop by using this pattern: `i-{collection_name}-{icon_name}`.
+
+Use the `leading` and `trailing` props to set the icon position or the `leading-icon` and `trailing-icon` props to set a different icon for each position.
+
+::component-card
+---
+props:
+  icon: 'i-heroicons-rocket-launch'
+  size: 'sm'
+  color: 'primary'
+  variant: 'solid'
+  label: Badge
+  trailing: false
+options:
+  - name: variant
+    restriction: only
+    values:
+      - solid
+excludedProps:
+  - icon
+  - label
+---
+::
+
+## Slots
+
+### `leading`
+
+Use the `#leading` slot to set the content of the leading icon.
+
+::component-card
+---
+slots:
+  leading: <UAvatar src="https://avatars.githubusercontent.com/u/739984?v=4" size="3xs" />
+baseProps:
+  color: 'gray'
+props:
+  label: Badge
+  color: 'gray'
+excludedProps:
+  - color
+---
+
+#leading
+  :u-avatar{src="https://avatars.githubusercontent.com/u/739984?v=4" size="3xs"}
+::
+
+### `trailing`
+
+Use the `#trailing` slot to set the content of the trailing icon.
+
+::component-card
+---
+slots:
+  trailing: <UIcon name="i-heroicons-rocket-launch" class="w-4 h-4" />
+props:
+  label: Badge
+  color: 'gray'
+excludedProps:
+  - color
+---
+
+#trailing
+  :u-icon{name="i-heroicons-rocket-launch" class="w-4 h-4"}
+::
+
 ## Props
 
 :component-props

docs/content/2.components/checkbox.md

@@ -87,7 +87,7 @@ slots:
   [Label]{.italic}
 ::
 
-### `help` :u-badge{label="New" class="align-middle ml-2 !rounded-full" variant="subtle"}
+### `help`
 
 Like the `#label` slot, use the `#help` slot to override the content of the help text.
 

docs/content/2.components/date-picker.md

@@ -38,9 +38,14 @@ The following example is styled based on the `primary` and `gray` colors and sup
 ```vue [components/DatePicker.vue]
 <script setup lang="ts">
 import { DatePicker as VCalendarDatePicker } from 'v-calendar'
+// @ts-ignore
 import type { DatePickerDate, DatePickerRangeObject } from 'v-calendar/dist/types/src/use/datePicker'
 import 'v-calendar/dist/style.css'
 
+defineOptions({
+  inheritAttrs: false
+})
+
 const props = defineProps({
   modelValue: {
     type: [Date, Object] as PropType<DatePickerDate | DatePickerRangeObject | null>,
@@ -59,17 +64,33 @@ const date = computed({
 })
 
 const attrs = {
-  transparent: true,
-  borderless: true,
-  color: 'primary',
+  'transparent': true,
+  'borderless': true,
+  'color': 'primary',
   'is-dark': { selector: 'html', darkClass: 'dark' },
-  'first-day-of-week': 2,
+  'first-day-of-week': 2
+}
+
+function onDayClick(_: any, event: MouseEvent): void {
+  const target = event.target as HTMLElement
+  target.blur()
 }
 </script>
 
 <template>
-  <VCalendarDatePicker v-if="date && (typeof date === 'object')" v-model.range="date" :columns="2" v-bind="{ ...attrs, ...$attrs }" />
-  <VCalendarDatePicker v-else v-model="date" v-bind="{ ...attrs, ...$attrs }" />
+  <VCalendarDatePicker
+    v-if="date && (date as DatePickerRangeObject)?.start && (date as DatePickerRangeObject)?.end"
+    v-model.range="date"
+    :columns="2"
+    v-bind="{ ...attrs, ...$attrs }"
+    @dayclick="onDayClick"
+  />
+  <VCalendarDatePicker
+    v-else
+    v-model="date"
+    v-bind="{ ...attrs, ...$attrs }"
+    @dayclick="onDayClick"
+  />
 </template>
 
 <style>

docs/content/2.components/form.md

@@ -8,13 +8,13 @@ links:
 
 ## Usage
 
-Use the Form component to validate form data using schema libraries such as [Yup](https://github.com/jquense/yup), [Zod](https://github.com/colinhacks/zod), [Joi](https://github.com/hapijs/joi), [Valibot](https://github.com/fabian-hiller/valibot), or your own validation logic.
+Use the Form component to validate form data using schema libraries such as [Yup](https://github.com/jquense/yup), [Zod](https://github.com/colinhacks/zod), [Joi](https://github.com/hapijs/joi), [Valibot](https://github.com/fabian-hiller/valibot), [Superstruct](https://github.com/ianstormtaylor/superstruct), or your own validation logic.
 
 It works with the [FormGroup](/components/form-group) component to display error messages around form elements automatically.
 
 The form component requires two props:
 - `state` - a reactive object holding the form's state.
-- `schema` - a schema object from a validation library like [Yup](https://github.com/jquense/yup), [Zod](https://github.com/colinhacks/zod), [Joi](https://github.com/hapijs/joi) or [Valibot](https://github.com/fabian-hiller/valibot).
+- `schema` - a schema object from a validation library like [Yup](https://github.com/jquense/yup), [Zod](https://github.com/colinhacks/zod), [Joi](https://github.com/hapijs/joi), [Valibot](https://github.com/fabian-hiller/valibot) or [Superstruct](https://github.com/ianstormtaylor/superstruct).
 
 ::callout{icon="i-heroicons-light-bulb"}
 Note that **no validation library is included** by default, so ensure you **install the one you need**.
@@ -52,6 +52,13 @@ Note that **no validation library is included** by default, so ensure you **inst
     class: 'w-60'
   ---
   ::
+  ::component-example{label="Superstruct"}
+  ---
+  component: 'form-example-superstruct'
+  componentProps:
+    class: 'w-60'
+  ---
+  ::
 ::
 
 ## Custom validation

docs/content/2.components/input-menu.md

@@ -32,7 +32,7 @@ This component does not support multiple values. Use the [SelectMenu](/component
 
 ### Objects
 
-You can pass an array of objects to `options` and either compare on the whole object or use the `by` prop to compare on a specific key. You can configure which field will be used to display the label through the `option-attribute` prop that defaults to `label`.
+You can pass an array of objects to `options` and either compare on the whole object or use the `by` prop to compare on a specific key. You can configure which field will be used to display the label through the `option-attribute` prop that defaults to `label`. Additionally, you can use dot notation (e.g., `user.name`) to access nested object properties.
 
 ::component-example
 ---
@@ -174,6 +174,8 @@ componentProps:
 
 Use the `#option-empty` slot to customize the content displayed when the `searchable` prop is `true` and there is no options. You will have access to the `query` property in the slot scope.
 
+You can also configure this globally through the `ui.inputMenu.default.optionEmpty.label` config. The token `{query}` will be replaced by `query` property. Defaults to `No results for "{query}".`.
+
 ::component-example
 ---
 component: 'input-menu-example-option-empty-slot'
@@ -186,6 +188,8 @@ componentProps:
 
 Use the `#empty` slot to customize the content displayed when there is no options. Defaults to `No options.`.
 
+You can also configure this globally through the `ui.inputMenu.default.empty.label` config. Defaults to `No options.`.
+
 ::component-example
 ---
 component: 'input-menu-example-empty-slot'

docs/content/2.components/input.md

@@ -142,7 +142,7 @@ props:
 
 ### Loading
 
-Use the `loading` prop to show a loading icon and disable the Input.
+Use the `loading` prop to show a loading icon in the Input.
 
 Use the `loading-icon` prop to set a different icon or change it globally in `ui.input.default.loadingIcon`. Defaults to `i-heroicons-arrow-path-20-solid`.
 

docs/content/2.components/link.md

@@ -14,6 +14,7 @@ The Link component is a wrapper around [`<NuxtLink>`](https://nuxt.com/docs/api/
 - `inactive-class` prop to set a class when the link is inactive, `active-class` is used when active.
 - `exact` prop to style with `active-class` when the link is active and the route is exactly the same as the current route.
 - `exact-query` and `exact-hash` props to style with `active-class` when the link is active and the query or hash is exactly the same as the current query or hash.
+  - use `exact-query="partial"` to style with `active-class` when the link is active and the query partially match the current query. 
 
 The incentive behind this is to provide the same API as NuxtLink back in Nuxt 2 / Vue 2. You can read more about it in the Vue Router [migration from Vue 2](https://router.vuejs.org/guide/migration/#removal-of-the-exact-prop-in-router-link) guide.
 

docs/content/2.components/notification.md

@@ -29,12 +29,16 @@ export default defineAppConfig({
   ui: {
     notifications: {
       // Show toasts at the top right of the screen
-      position: 'top-0 right-0'
+      position: 'top-0 bottom-[unset]'
     }
   }
 })
 ```
 
+::callout{icon="i-heroicons-light-bulb"}
+The `position` defaults to `bottom-0 end-0`, the `bottom-[unset]` class overrides `bottom-0` so the result is `top-0 end-0`.
+::
+
 Then, you can use the `useToast` composable to add notifications to your app:
 
 :component-example{component="notification-example-basic"}
@@ -133,9 +137,9 @@ excludedProps:
 
 ### Timeout
 
-Use the `timeout` prop to configure how long the Notification will remain. The default value is  `5000`, set it to `0` to disable the timeout.
+Use the `timeout` prop to configure how long the Notification will remain. The default value is  `5000`, set it to `0` to disable the timeout. The `pauseTimeoutOnHover` prop (`true` by default) controls whether hovering the notification should pause the timeout.
 
-You will see a progress bar at the bottom of the Notification which will indicate the remaining time. When hovering the Notification, the progress bar will be paused.
+You will see a progress bar at the bottom of the Notification which will indicate the remaining time. When hovering the Notification, the progress bar will be paused if `pauseTimeoutOnHover` is enabled; otherwise, it won't stop.
 
 ::component-card
 ---
@@ -145,6 +149,7 @@ baseProps:
   description: 'This is a notification.'
 props:
   timeout: 60000
+  pauseTimeoutOnHover: true
 ---
 ::
 

docs/content/2.components/radio-group.md

@@ -126,7 +126,7 @@ slots:
   [Label]{.italic}
 ::
 
-### `help` :u-badge{label="New" class="align-middle ml-2 !rounded-full" variant="subtle"}
+### `help`
 
 Like the `#label` slot, use the `#help` slot to override the content of the help text.
 

docs/content/2.components/select-menu.md

@@ -40,7 +40,7 @@ componentProps:
 
 ### Objects
 
-You can pass an array of objects to `options` and either compare on the whole object or use the `by` prop to compare on a specific key. You can configure which field will be used to display the label through the `option-attribute` prop that defaults to `label`.
+You can pass an array of objects to `options` and either compare on the whole object or use the `by` prop to compare on a specific key. You can configure which field will be used to display the label through the `option-attribute` prop that defaults to `label`. Additionally, you can use dot notation (e.g., `user.name`) to access nested object properties.
 
 ::component-example
 ---
@@ -85,7 +85,7 @@ Learn how to customize icons from the [Select](/components/select#icon) componen
 
 Use the `searchable` prop to enable search.
 
-Use the `searchable-placeholder` prop to set a different placeholder.
+Use the `searchable-placeholder` prop to set a different placeholder or globally through the `ui.selectMenu.default.searchablePlaceholder.label` config. Defaults to `Search...`.
 
 This will use Headless UI [Combobox](https://headlessui.com/v1/vue/combobox) component instead of [Listbox](https://headlessui.com/v1/vue/listbox).
 
@@ -188,7 +188,7 @@ componentProps:
 ---
 ::
 
-Pass a function to the `show-create-option-when` prop to control wether or not to show the create option. This function takes two arguments: the query (as the first argument) and an array of current results (as the second argument). It should return true to display the create option. :u-badge{label="New" class="!rounded-full" variant="subtle"}
+Pass a function to the `show-create-option-when` prop to control wether or not to show the create option. This function takes two arguments: the query (as the first argument) and an array of current results (as the second argument). It should return true to display the create option.
 
 The example below shows how to make the create option visible when the query is at least three characters long and does not exactly match any of the current results (case insensitive).
 
@@ -258,6 +258,8 @@ componentProps:
 
 Use the `#option-empty` slot to customize the content displayed when the `searchable` prop is `true` and there is no options. You will have access to the `query` property in the slot scope.
 
+You can also configure this globally through the `ui.selectMenu.default.optionEmpty.label` config. The token `{query}` will be replaced by `query` property. Defaults to `No results for "{query}".`.
+
 ::component-example
 ---
 component: 'select-menu-example-option-empty-slot'
@@ -276,7 +278,9 @@ An example is available in the [Creatable](#creatable) section.
 
 ### `empty`
 
-Use the `#empty` slot to customize the content displayed when there is no options. Defaults to `No options.`.
+Use the `#empty` slot to customize the content displayed when there is no options.
+
+You can also configure this globally through the `ui.selectMenu.default.empty.label` config. Defaults to `No options.`.
 
 ::component-example
 ---

docs/content/2.components/table.md

@@ -29,8 +29,8 @@ Use the `columns` prop to configure which columns to display. It's an array of o
 - `sortable` - Whether the column is sortable. Defaults to `false`.
 - `direction` - The sort direction to use on first click. Defaults to `asc`.
 - `class` - The class to apply to the column cells.
-- `rowClass` - The class to apply to the data column cells. :u-badge{label="New" class="!rounded-full" variant="subtle"}
-- `sort` - Pass your own `sort` function. Defaults to a simple _greater than_ / _less than_ comparison. 
+- `rowClass` - The class to apply to the data column cells.
+- `sort` - Pass your own `sort` function. Defaults to a simple _greater than_ / _less than_ comparison.
 
 Arguments for the `sort` function are: Value A, Value B, Direction - 'asc' or 'desc'
 
@@ -62,7 +62,7 @@ extraClass: 'overflow-hidden'
 padding: false
 component: 'table-example-columns-selectable'
 componentProps:
-  class: 'flex-1 flex-col overflow-hidden'
+  class: 'flex-1 flex-col overflow-hidden min-h-[230px]'
 ---
 ::
 
@@ -285,6 +285,81 @@ componentProps:
 ---
 ::
 
+
+#### Event Selectable
+The `UTable` component provides two key events for handling row selection:
+
+##### ***@select:all***
+The `@select:all` event is emitted when the header checkbox in a selectable table is toggled. This event returns a boolean value indicating whether all rows are selected (true) or deselected (false).
+
+##### ***@update:modelValue***
+The `@update:modelValue` event is emitted whenever the selection state changes, including both individual row selection and bulk selection. This event returns an array containing the currently selected rows.
+
+Here's how to implement both events:
+
+```vue
+<script setup lang="ts">
+const selected = ref([])
+
+const onHandleSelectAll = (isSelected: boolean) => {
+  console.log('All rows selected:', isSelected)
+}
+
+const onUpdateSelection = (selectedRows: any[]) => {
+  console.log('Currently selected rows:', selectedRows)
+}
+</script>
+
+<template>
+  <UTable 
+    v-model="selected" 
+    :rows="people" 
+    @select:all="onHandleSelectAll"
+    @update:modelValue="onUpdateSelection"
+  />
+</template>
+```
+
+
+#### Single Select Mode
+Control how the select function allows only one row to be selected at a time.
+
+```vue
+<template>
+  <!-- Allow only one row to be selectable at a time -->
+  <UTable :single-select="true" />
+</template>
+```
+
+#### Checkbox Placement
+You can customize the checkbox column position by using the `select` key in the `columns` configuration.
+
+::component-example{class="grid"}
+---
+extraClass: 'overflow-hidden'
+padding: false
+component: 'table-example-dynamically-render-selectable'
+componentProps:
+  class: 'flex-1'
+---
+::
+
+### Contextmenu
+
+Use the `contextmenu` listener on your Table to make the rows right-clickable. The function will receive the original event as the first argument and the row as the second argument.
+
+You can use this to open a [ContextMenu](/components/context-menu) for that row.
+
+::component-example{class="grid"}
+---
+extraClass: 'overflow-hidden'
+padding: false
+component: 'table-example-contextmenu'
+componentProps:
+  class: 'flex-1 flex-col overflow-hidden'
+---
+::
+
 ### Searchable
 
 You can easily use the [Input](/components/input) component to filter the rows.
@@ -313,12 +388,15 @@ componentProps:
 ---
 ::
 
-### Expandable :u-badge{label="New" class="align-middle ml-2 !rounded-full" variant="subtle"}
+### Expandable
 
-You can use the `expand` slot to display extra information about a row. You will have access to the `row` property in the slot scope.
+You can use the `v-model:expand` to enables row expansion functionality in the table component. It maintains an object containing an `openedRows` an array and `row` an object, which tracks the indices of currently expanded rows.
+
+When using the expand slot, you have access to the `row` property in the slot scope, which contains the data of the row that triggered the expand/collapse action. This allows you to customize the expanded content based on the row's data.
 
 ::component-example{class="grid"}
 ---
+extraClass: 'overflow-hidden'
 padding: false
 component: 'table-example-expandable'
 componentProps:
@@ -326,6 +404,72 @@ componentProps:
 ---
 ::
 
+#### Event expand
+
+The `@update:expand` event is emitted when a row is expanded. This event provides the current state of expanded rows and the data of the row that triggered the event.
+
+To use the `@update:expand` event, add it to your `UTable` component. The event handler will receive an object with the following properties:
+- `openedRows`: An array of indices of the currently expanded rows.
+- `row`: The row data that triggered the expand/collapse action.
+
+```vue
+<script setup lang="ts">
+const { data, pending } = await useLazyFetch(() => `/api/users`)
+
+const handleExpand = ({ openedRows, row }) => {
+  console.log('opened Rows:', openedRows);
+  console.log('Row Data:', row);
+};
+
+const expand = ref({
+  openedRows: [],
+  row: null
+})
+
+</script>
+<template>
+  <UTable v-model="expand" :loading="pending" :rows="data" @update:expand="handleExpand">
+    <template #expand="{ row }">
+        <div class="p-4">
+          <pre>{{ row }}</pre>
+        </div>
+      </template>
+  </UTable>
+</template>
+```
+
+#### Multiple expand
+Controls whether multiple rows can be expanded simultaneously in the table.
+
+```vue
+<template>
+  <!-- Allow only one row to be expanded at a time -->
+  <UTable :multiple-expand="false" />
+
+  <!-- Default behavior: Allow multiple rows to be expanded simultaneously -->
+  <UTable :multiple-expand="true" />
+
+  <!-- Or simply -->
+  <UTable />
+</template>
+```
+
+#### Disable Row Expansion
+
+You can disable the expansion functionality for specific rows in the UTable component by adding the `disabledExpand` property to your row data.
+
+> Important: When using `disabledExpand`, you must define the `columns` prop for the UTable component. Otherwise, the table will render all properties as columns, including the `disabledExpand` property.
+
+::component-example{class="grid"}
+---
+extraClass: 'overflow-hidden'
+padding: false
+component: 'table-example-disabled-expandable'
+componentProps:
+  class: 'flex-1'
+---
+::
+
 ### Loading
 
 Use the `loading` prop to indicate that data is currently loading with an indeterminate [Progress](/components/progress#indeterminate) bar.
@@ -448,6 +592,119 @@ componentProps:
 ---
 ::
 
+### `select-header`
+This slot allows you to customize the checkbox appearance in the table header for selecting all rows at once while using feature [Selectable](#selectable).
+
+#### Usage
+```vue
+<template>
+  <UTable v-model="selectable"> 
+    <template #select-header="{ checked, change, indeterminate }">
+      <!-- Place your custom component here -->
+    </template>
+  </UTable>
+</template>
+```
+
+#### Props
+
+| Prop | Type | Description |
+|------|------|-------------|
+| `checked` | `Boolean` | Indicates if all rows are selected |
+| `change` | `Function` | Function to handle selection state changes. Must receive a boolean value (true/false) |
+| `indeterminate` | `Boolean` | Indicates partial selection (when some rows are selected) |
+
+#### Example
+```vue
+<template>
+  <UTable>
+    <!-- Header checkbox customization -->
+    <template #select-header="{ indeterminate, checked, change }">
+      <input 
+        type="checkbox"
+        :indeterminate="indeterminate"
+        :checked="checked"
+        @change="e => change(e.target.checked)"
+      />
+    </template>
+  </UTable>
+</template>
+```
+
+### `select-data`
+This slot allows you to customize the checkbox appearance for each row in the table while using feature [Selectable](#selectable).
+
+#### Usage
+```vue
+<template>
+  <UTable v-model="selectable">
+    <template #select-data="{ checked, change }">
+      <!-- Place your custom component here -->
+    </template>
+  </UTable>
+</template>
+```
+
+#### Props
+
+| Prop | Type | Description |
+|------|------|-------------|
+| `checked` | `Boolean` | Indicates if the current row is selected |
+| `change` | `Function` | Function to handle selection state changes. Must receive a boolean value (true/false) |
+
+#### Example
+```vue
+<template>
+  <UTable>
+    <!-- Row checkbox customization -->
+    <template #select-data="{ checked, change }">
+      <input 
+        type="checkbox"
+        :checked="checked"
+        @change="e => change(e.target.checked)"
+      />
+    </template>
+  </UTable>
+</template>
+```
+
+### `expand-action`
+
+The `#expand-action` slot allows you to customize the expansion control interface for expandable table rows. This feature provides a flexible way to implement custom expand/collapse functionality while maintaining access to essential row data and state.
+
+#### Usage
+
+```vue
+<template>
+  <UTable>
+    <template #expand-action="{ row, toggle, isExpanded }">
+    <!-- Your custom expand action content -->
+    </template>
+  </UTable>
+</template>
+```
+
+#### Slot Props
+
+The slot provides three key props:
+
+| Prop | Type | Description |
+|------|------|-------------|
+| `row` | `Object` | Contains the current row's data |
+| `toggle` | `Function` | Function to toggle the expanded state |
+| `isExpanded` | `Boolean` | Current expansion state of the row |
+
+::component-example{class="grid"}
+---
+extraClass: 'overflow-hidden'
+padding: false
+component: 'table-example-expand-action-slot'
+componentProps:
+  class: 'flex-1'
+---
+::
+
+
 ### `loading-state`
 
 Use the `#loading-state` slot to customize the loading state.

docs/content/2.components/tabs.md

@@ -92,7 +92,7 @@ Use the `#default` slot to customize the content of the trigger buttons. You wil
 
 :component-example{component="tabs-example-default-slot"}
 
-### `icon` :u-badge{label="New" class="align-middle ml-2 !rounded-full" variant="subtle"}
+### `icon`
 
 Use the `#icon` slot to customize the icon of the trigger buttons. You will have access to the `item`, `index`, `selected` and `disabled` in the slot scope.
 

docs/error.vue

@@ -29,8 +29,8 @@
 </template>
 
 <script setup lang="ts">
-import type { NuxtError } from '#app'
 import type { ParsedContent } from '@nuxt/content'
+import type { NuxtError } from '#app'
 
 useSeoMeta({
   title: 'Page not found',
@@ -57,20 +57,22 @@ const links = computed(() => {
     icon: 'i-heroicons-book-open',
     to: '/getting-started',
     active: route.path.startsWith('/getting-started') || route.path.startsWith('/components')
-  }, ...(navigation.value.find(item => item._path === '/pro') ? [{
-    label: 'Pro',
-    icon: 'i-heroicons-square-3-stack-3d',
-    to: '/pro',
-    active: route.path.startsWith('/pro/getting-started') || route.path.startsWith('/pro/components') || route.path.startsWith('/pro/prose')
-  }, {
-    label: 'Pricing',
-    icon: 'i-heroicons-ticket',
-    to: '/pro/pricing'
-  }, {
-    label: 'Templates',
-    icon: 'i-heroicons-computer-desktop',
-    to: '/pro/templates'
-  }] : []), {
+  }, ...(navigation.value.find(item => item._path === '/pro')
+    ? [{
+        label: 'Pro',
+        icon: 'i-heroicons-square-3-stack-3d',
+        to: '/pro',
+        active: route.path.startsWith('/pro/getting-started') || route.path.startsWith('/pro/components') || route.path.startsWith('/pro/prose')
+      }, {
+        label: 'Pricing',
+        icon: 'i-heroicons-ticket',
+        to: '/pro/pricing'
+      }, {
+        label: 'Templates',
+        icon: 'i-heroicons-computer-desktop',
+        to: '/pro/templates'
+      }]
+    : []), {
     label: 'Releases',
     icon: 'i-heroicons-rocket-launch',
     to: '/releases'

docs/modules/content-examples-code.ts

@@ -1,3 +1,6 @@
+import { existsSync, readFileSync } from 'node:fs'
+import fsp from 'node:fs/promises'
+import { dirname, join } from 'pathe'
 import {
   defineNuxtModule,
   addTemplate,
@@ -5,28 +8,24 @@ import {
   createResolver
 } from '@nuxt/kit'
 
-import { existsSync, readFileSync } from 'fs'
-import { dirname, join } from 'pathe'
-import fsp from 'fs/promises'
-
 export default defineNuxtModule({
   meta: {
     name: 'content-examples-code'
   },
-  async setup (_options, nuxt) {
+  async setup(_options, nuxt) {
     const resolver = createResolver(import.meta.url)
     let _configResolved: any
     let components: Record<string, any>
     const outputPath = join(nuxt.options.buildDir, 'content-examples-code')
 
-    async function stubOutput () {
+    async function stubOutput() {
       if (existsSync(outputPath + '.mjs')) {
         return
       }
       await updateOutput('export default {}')
     }
 
-    async function fetchComponent (component: string | any) {
+    async function fetchComponent(component: string | any) {
       if (typeof component === 'string') {
         if (components[component]) {
           component = components[component]
@@ -57,7 +56,7 @@ export default defineNuxtModule({
     const getVirtualModuleContent = () =>
       `export default ${getStringifiedComponents()}`
 
-    async function updateOutput (content?: string) {
+    async function updateOutput(content?: string) {
       const path = outputPath + '.mjs'
       if (!existsSync(dirname(path))) {
         await fsp.mkdir(dirname(path), { recursive: true })
@@ -68,13 +67,13 @@ export default defineNuxtModule({
       await fsp.writeFile(path, content || getVirtualModuleContent(), 'utf-8')
     }
 
-    async function fetchComponents () {
+    async function fetchComponents() {
       await Promise.all(Object.keys(components).map(fetchComponent))
     }
 
     nuxt.hook('components:extend', async (_components) => {
       components = _components
-        .filter((v) => v.shortPath.includes('components/content/examples/'))
+        .filter(v => v.shortPath.includes('components/content/examples/'))
         .reduce((acc, component) => {
           acc[component.pascalName] = component
           return acc
@@ -93,17 +92,17 @@ export default defineNuxtModule({
       vite.config.plugins.push({
         name: 'content-examples-code',
         enforce: 'post',
-        async buildStart () {
+        async buildStart() {
           if (_configResolved?.build.ssr) {
             return
           }
           await fetchComponents()
           await updateOutput()
         },
-        configResolved (config) {
+        configResolved(config) {
           _configResolved = config
         },
-        async handleHotUpdate ({ file }) {
+        async handleHotUpdate({ file }) {
           if (
             Object.entries(components).some(
               ([, comp]: any) => comp.filePath === file

docs/nuxt.config.ts

@@ -8,13 +8,15 @@ const { resolve } = createResolver(import.meta.url)
 
 export default defineNuxtConfig({
   // @ts-ignore
-  extends: process.env.NUXT_UI_PRO_PATH ? [
-    process.env.NUXT_UI_PRO_PATH,
-    resolve(process.env.NUXT_UI_PRO_PATH, '.docs')
-  ] : [
-    '@nuxt/ui-pro',
-    process.env.NUXT_GITHUB_TOKEN && ['github:nuxt/ui-pro/.docs#dev', { giget: { auth: process.env.NUXT_GITHUB_TOKEN } }]
-  ].filter(Boolean),
+  extends: process.env.NUXT_UI_PRO_PATH
+    ? [
+        process.env.NUXT_UI_PRO_PATH,
+        resolve(process.env.NUXT_UI_PRO_PATH, '.docs')
+      ]
+    : [
+        '@nuxt/ui-pro',
+        process.env.NUXT_GITHUB_TOKEN && ['github:nuxt/ui-pro/.docs#dev', { giget: { auth: process.env.NUXT_GITHUB_TOKEN } }]
+      ].filter(Boolean),
 
   modules: [
     '@nuxt/content',
@@ -25,19 +27,11 @@ export default defineNuxtConfig({
     '@nuxtjs/plausible',
     '@vueuse/nuxt',
     'nuxt-component-meta',
-    'nuxt-cloudflare-analytics',
-    'modules/content-examples-code'
+    'nuxt-cloudflare-analytics'
   ],
 
-  runtimeConfig: {
-    public: {
-      version: pkg.version
-    }
-  },
-
-  ui: {
-    global: true,
-    safelistColors: excludeColors(colors)
+  site: {
+    url: 'https://ui.nuxt.com'
   },
 
   content: {
@@ -48,31 +42,42 @@ export default defineNuxtConfig({
       ]
     },
     sources: {
-      pro: process.env.NUXT_UI_PRO_PATH ? {
-        prefix: '/pro',
-        driver: 'fs',
-        base: resolve(process.env.NUXT_UI_PRO_PATH, '.docs/content/pro')
-      } : process.env.NUXT_GITHUB_TOKEN ? {
-        prefix: '/pro',
-        driver: 'github',
-        repo: 'nuxt/ui-pro',
-        branch: 'dev',
-        dir: '.docs/content/pro',
-        token: process.env.NUXT_GITHUB_TOKEN || ''
-      } : undefined
+      pro: process.env.NUXT_UI_PRO_PATH
+        ? {
+            prefix: '/pro',
+            driver: 'fs',
+            base: resolve(process.env.NUXT_UI_PRO_PATH, '.docs/content/pro')
+          }
+        : process.env.NUXT_GITHUB_TOKEN
+          ? {
+              prefix: '/pro',
+              driver: 'github',
+              repo: 'nuxt/ui-pro',
+              branch: 'dev',
+              dir: '.docs/content/pro',
+              token: process.env.NUXT_GITHUB_TOKEN || ''
+            }
+          : undefined
     }
   },
 
-  image: {
-    provider: 'ipx'
+  ui: {
+    global: true,
+    safelistColors: excludeColors(colors)
   },
 
-  icon: {
-    clientBundle: {
-      scan: true
+  runtimeConfig: {
+    public: {
+      version: pkg.version
     }
   },
 
+  routeRules: {
+    '/components': { redirect: '/components/accordion', prerender: false }
+  },
+
+  compatibilityDate: '2024-07-23',
+
   nitro: {
     prerender: {
       routes: [
@@ -86,8 +91,32 @@ export default defineNuxtConfig({
     }
   },
 
-  routeRules: {
-    '/components': { redirect: '/components/accordion', prerender: false }
+  vite: {
+    optimizeDeps: {
+      include: ['date-fns']
+    }
+  },
+
+  typescript: {
+    strict: false
+  },
+
+  hooks: {
+    // Related to https://github.com/nuxt/nuxt/pull/22558
+    'components:extend': (components) => {
+      components.forEach((component) => {
+        if (component.shortPath.includes(process.env.NUXT_UI_PRO_PATH || '@nuxt/ui-pro')) {
+          component.global = true
+        } else if (component.global) {
+          component.global = 'sync'
+        }
+      })
+    }
+  },
+
+  cloudflareAnalytics: {
+    token: '1e2b0c5e9a214f0390b9b94e043d8d4c',
+    scriptPath: false
   },
 
   componentMeta: {
@@ -111,37 +140,13 @@ export default defineNuxtConfig({
     }
   },
 
-  cloudflareAnalytics: {
-    token: '1e2b0c5e9a214f0390b9b94e043d8d4c',
-    scriptPath: false
-  },
-
-  hooks: {
-    // Related to https://github.com/nuxt/nuxt/pull/22558
-    'components:extend': (components) => {
-      components.forEach((component) => {
-        if (component.shortPath.includes(process.env.NUXT_UI_PRO_PATH || '@nuxt/ui-pro')) {
-          component.global = true
-        } else if (component.global) {
-          component.global = 'sync'
-        }
-      })
+  icon: {
+    clientBundle: {
+      scan: true
     }
   },
 
-  typescript: {
-    strict: false
-  },
-
-  site: {
-    url: 'https://ui.nuxt.com'
-  },
-
-  vite: {
-    optimizeDeps: {
-      include: ['date-fns']
-    }
-  },
-
-  compatibilityDate: '2024-07-23'
+  image: {
+    provider: 'ipx'
+  }
 })

docs/package.json

@@ -3,30 +3,29 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "@iconify-json/heroicons": "^1.2.1",
-    "@iconify-json/simple-icons": "^1.2.7",
-    "@iconify-json/vscode-icons": "^1.2.2",
-    "@nuxt/content": "^2.13.2",
-    "@nuxt/eslint-config": "^0.4.0",
-    "@nuxt/fonts": "^0.10.0",
-    "@nuxt/image": "^1.8.1",
+    "@iconify-json/heroicons": "^1.2.2",
+    "@iconify-json/lucide": "^1.2.23",
+    "@iconify-json/simple-icons": "^1.2.19",
+    "@iconify-json/vscode-icons": "^1.2.10",
+    "@nuxt/content": "^2.13.4",
+    "@nuxt/fonts": "^0.10.3",
+    "@nuxt/image": "^1.9.0",
     "@nuxt/ui": "latest",
-    "@nuxt/ui-pro": "^1.4.3",
-    "@nuxtjs/plausible": "^1.0.3",
-    "@octokit/rest": "^21.0.2",
-    "@vueuse/nuxt": "^11.1.0",
+    "@nuxt/ui-pro": "^1.6.0",
+    "@nuxtjs/plausible": "^1.2.0",
+    "@octokit/rest": "^21.1.0",
+    "@vueuse/nuxt": "^12.4.0",
     "date-fns": "^4.1.0",
-    "eslint": "^8.57.0",
     "joi": "^17.13.3",
-    "nuxt": "^3.13.2",
+    "nuxt": "^3.15.1",
     "nuxt-cloudflare-analytics": "^1.0.8",
-    "nuxt-component-meta": "^0.8.2",
-    "nuxt-og-image": "^3.0.4",
-    "prettier": "^3.3.3",
+    "nuxt-component-meta": "^0.9.0",
+    "nuxt-og-image": "^4.0.2",
+    "prettier": "^3.4.2",
     "ufo": "^1.5.4",
     "v-calendar": "^3.1.2",
     "valibot": "^0.42.1",
-    "yup": "^1.4.0",
-    "zod": "^3.23.8"
+    "yup": "^1.6.1",
+    "zod": "^3.24.1"
   }
 }

docs/pages/[...slug].vue

@@ -98,7 +98,7 @@ const communityLinks = computed(() => [{
 const resourcesLinks = [{
   icon: 'i-simple-icons-figma',
   label: 'Figma Kit',
-  to: 'https://www.figma.com/community/file/1288455405058138934',
+  to: 'https://www.figma.com/community/file/1436401057300493073',
   target: '_blank'
 }, {
   label: 'Playground',

docs/pages/index.vue

@@ -295,7 +295,7 @@
                     wrapper: 'px-4 py-2.5 border-gray-800/10 dark:border-gray-200/10 cursor-pointer',
                     icon: {
                       wrapper: 'mb-2 p-1',
-                      base: 'h-4 w-4',
+                      base: 'h-4 w-4'
                     },
                     title: 'text-sm',
                     description: 'text-xs'
@@ -466,188 +466,212 @@ const steps = {
 
 const inc = computed(() => (height.value - 32 - 64 - 32 - 32) / 4)
 
-const landingBlocks = computed(() => isAfterStep(steps.landing) && isBeforeStep(steps.docs) ? [{
-  class: 'inset-x-0 top-20 bottom-20 overflow-hidden',
-  inactive: true,
-  children: [{
-    name: 'ULandingHero',
-    to: '/pro/components/landing-hero',
-    class: [
-      'inset-4',
-      isAfterStep(steps.landing + 2) && '-top-[calc(var(--y)-var(--step-y)-1rem)] bottom-[calc(var(--y)-var(--step-y)+1rem)]'
-    ].filter(Boolean).join(' '),
-    style: {
-      '--step-y': `${getStepY(steps.landing + 2)}px`
-    },
-    inactive: isAfterStep(steps.landing + 1),
-    children: [{
-      slot: 'landing-hero',
-      class: 'inset-4'
-    }]
-  }, isAfterStep(steps.landing + 2) && {
-    name: 'ULandingSection',
-    to: '/pro/components/landing-section',
-    class: [
-      'inset-4',
-      isBeforeStep(steps.landing + 6) && '-top-[calc(var(--y)-var(--prev-step-y)-var(--height)-1rem)] bottom-[calc(var(--y)-var(--prev-step-y)-var(--height)+1rem)]',
-      isAfterStep(steps.landing + 10) && '-top-[calc(var(--y)-var(--step-y)-1rem)] bottom-[calc(var(--y)-var(--step-y)+1rem)]'
-    ].filter(Boolean).join(' '),
-    style: {
-      '--height': (inc.value * 4) + 'px',
-      '--step-y': `${getStepY(steps.landing + 10)}px`,
-      '--prev-step-y': `${getStepY(steps.landing + 2)}px`
-    },
-    inactive: isAfterStep(steps.landing + 7),
-    children: [{
-      slot: 'landing-section',
-      class: 'inset-x-4 top-16'
-    }, {
-      name: 'ULandingGrid',
-      to: '/pro/components/landing-grid',
-      class: ['inset-x-4 bottom-4 top-48', isAfterStep(steps.landing + 8) && 'grid grid-cols-4 gap-4 p-4'].filter(Boolean).join(' '),
-      inactive: isAfterStep(steps.landing + 8),
-      children: [isAfterStep(steps.landing + 9) ? {
-        slot: 'landing-card-1',
-        class: '!relative'
-      } : {
-        name: 'ULandingCard',
-        to: '/pro/components/landing-card',
-        class: '!relative h-full',
-        inactive: false
-      }, isAfterStep(steps.landing + 9) ? {
-        slot: 'landing-card-2',
-        class: '!relative h-full'
-      } : {
-        name: 'ULandingCard',
-        to: '/pro/components/landing-card',
-        class: '!relative h-full',
-        inactive: false
-      }, isAfterStep(steps.landing + 9) ? {
-        slot: 'landing-card-3',
-        class: '!relative h-full'
-      } : {
-        name: 'ULandingCard',
-        to: '/pro/components/landing-card',
-        class: '!relative h-full',
-        inactive: false
-      }, isAfterStep(steps.landing + 9) ? {
-        slot: 'landing-card-4',
-        class: '!relative h-full'
-      } : {
-        name: 'ULandingCard',
-        to: '/pro/components/landing-card',
-        class: '!relative h-full',
-        inactive: false
-      }]
-    }]
-  }, isAfterStep(steps.landing + 10) && {
-    name: 'ULandingSection',
-    to: '/pro/components/landing-section',
-    class: [
-      'inset-4',
-      isBeforeStep(steps.landing + 14) && '-top-[calc(var(--y)-var(--prev-step-y)-var(--height)-1rem)] bottom-[calc(var(--y)-var(--prev-step-y)-var(--height)+1rem)]'
-    ].filter(Boolean).join(' '),
-    style: {
-      '--height': (inc.value * 4) + 'px',
-      '--step-y': `${getStepY(steps.landing + 18)}px`,
-      '--prev-step-y': `${getStepY(steps.landing + 10)}px`
-    },
-    inactive: isAfterStep(steps.landing + 15),
-    children: [{
-      name: 'ULandingCTA',
-      class: 'inset-4',
-      inactive: isAfterStep(steps.landing + 16),
+const landingBlocks = computed(() => isAfterStep(steps.landing) && isBeforeStep(steps.docs)
+  ? [{
+      class: 'inset-x-0 top-20 bottom-20 overflow-hidden',
+      inactive: true,
       children: [{
-        slot: 'landing-cta',
-        class: 'inset-0'
-      }]
+        name: 'ULandingHero',
+        to: '/pro/components/landing-hero',
+        class: [
+          'inset-4',
+          isAfterStep(steps.landing + 2) && '-top-[calc(var(--y)-var(--step-y)-1rem)] bottom-[calc(var(--y)-var(--step-y)+1rem)]'
+        ].filter(Boolean).join(' '),
+        style: {
+          '--step-y': `${getStepY(steps.landing + 2)}px`
+        },
+        inactive: isAfterStep(steps.landing + 1),
+        children: [{
+          slot: 'landing-hero',
+          class: 'inset-4'
+        }]
+      }, isAfterStep(steps.landing + 2) && {
+        name: 'ULandingSection',
+        to: '/pro/components/landing-section',
+        class: [
+          'inset-4',
+          isBeforeStep(steps.landing + 6) && '-top-[calc(var(--y)-var(--prev-step-y)-var(--height)-1rem)] bottom-[calc(var(--y)-var(--prev-step-y)-var(--height)+1rem)]',
+          isAfterStep(steps.landing + 10) && '-top-[calc(var(--y)-var(--step-y)-1rem)] bottom-[calc(var(--y)-var(--step-y)+1rem)]'
+        ].filter(Boolean).join(' '),
+        style: {
+          '--height': (inc.value * 4) + 'px',
+          '--step-y': `${getStepY(steps.landing + 10)}px`,
+          '--prev-step-y': `${getStepY(steps.landing + 2)}px`
+        },
+        inactive: isAfterStep(steps.landing + 7),
+        children: [{
+          slot: 'landing-section',
+          class: 'inset-x-4 top-16'
+        }, {
+          name: 'ULandingGrid',
+          to: '/pro/components/landing-grid',
+          class: ['inset-x-4 bottom-4 top-48', isAfterStep(steps.landing + 8) && 'grid grid-cols-4 gap-4 p-4'].filter(Boolean).join(' '),
+          inactive: isAfterStep(steps.landing + 8),
+          children: [isAfterStep(steps.landing + 9)
+            ? {
+                slot: 'landing-card-1',
+                class: '!relative'
+              }
+            : {
+                name: 'ULandingCard',
+                to: '/pro/components/landing-card',
+                class: '!relative h-full',
+                inactive: false
+              }, isAfterStep(steps.landing + 9)
+            ? {
+                slot: 'landing-card-2',
+                class: '!relative h-full'
+              }
+            : {
+                name: 'ULandingCard',
+                to: '/pro/components/landing-card',
+                class: '!relative h-full',
+                inactive: false
+              }, isAfterStep(steps.landing + 9)
+            ? {
+                slot: 'landing-card-3',
+                class: '!relative h-full'
+              }
+            : {
+                name: 'ULandingCard',
+                to: '/pro/components/landing-card',
+                class: '!relative h-full',
+                inactive: false
+              }, isAfterStep(steps.landing + 9)
+            ? {
+                slot: 'landing-card-4',
+                class: '!relative h-full'
+              }
+            : {
+                name: 'ULandingCard',
+                to: '/pro/components/landing-card',
+                class: '!relative h-full',
+                inactive: false
+              }]
+        }]
+      }, isAfterStep(steps.landing + 10) && {
+        name: 'ULandingSection',
+        to: '/pro/components/landing-section',
+        class: [
+          'inset-4',
+          isBeforeStep(steps.landing + 14) && '-top-[calc(var(--y)-var(--prev-step-y)-var(--height)-1rem)] bottom-[calc(var(--y)-var(--prev-step-y)-var(--height)+1rem)]'
+        ].filter(Boolean).join(' '),
+        style: {
+          '--height': (inc.value * 4) + 'px',
+          '--step-y': `${getStepY(steps.landing + 18)}px`,
+          '--prev-step-y': `${getStepY(steps.landing + 10)}px`
+        },
+        inactive: isAfterStep(steps.landing + 15),
+        children: [{
+          name: 'ULandingCTA',
+          class: 'inset-4',
+          inactive: isAfterStep(steps.landing + 16),
+          children: [{
+            slot: 'landing-cta',
+            class: 'inset-0'
+          }]
+        }]
+      }].filter(Boolean)
     }]
-  }].filter(Boolean)
-}] : [])
+  : [])
 
 const docsBlocks = computed(() => [isAfterStep(steps.docs) && {
   name: 'UPage',
   to: '/pro/components/page',
   class: 'inset-x-0 top-20 bottom-20',
   inactive: isAfterStep(steps.docs + 1),
-  children: [isAfterStep(steps.docs + 2) ? {
-    name: 'UAside',
-    to: '/pro/components/aside',
-    class: 'left-4 inset-y-4 w-64',
-    inactive: isAfterStep(steps.docs + 3),
-    children: [isAfterStep(steps.docs + 4) ? {
-      slot: 'aside-top',
-      class: 'inset-x-4 top-4'
-    } : {
-      name: '#top',
-      class: 'inset-x-4 top-4 h-9'
-    }, isAfterStep(steps.docs + 5) ? {
-      name: 'UNavigationTree',
-      to: '/pro/components/navigation-tree',
-      class: ['inset-x-4 top-[4.25rem] bottom-4', isAfterStep(steps.docs + 6) && '!bg-transparent !border-0'].join(' '),
-      inactive: isAfterStep(steps.docs + 6),
-      children: [{
-        slot: 'aside-default',
-        class: 'inset-0'
+  children: [isAfterStep(steps.docs + 2)
+    ? {
+        name: 'UAside',
+        to: '/pro/components/aside',
+        class: 'left-4 inset-y-4 w-64',
+        inactive: isAfterStep(steps.docs + 3),
+        children: [isAfterStep(steps.docs + 4)
+          ? {
+              slot: 'aside-top',
+              class: 'inset-x-4 top-4'
+            }
+          : {
+              name: '#top',
+              class: 'inset-x-4 top-4 h-9'
+            }, isAfterStep(steps.docs + 5)
+          ? {
+              name: 'UNavigationTree',
+              to: '/pro/components/navigation-tree',
+              class: ['inset-x-4 top-[4.25rem] bottom-4', isAfterStep(steps.docs + 6) && '!bg-transparent !border-0'].join(' '),
+              inactive: isAfterStep(steps.docs + 6),
+              children: [{
+                slot: 'aside-default',
+                class: 'inset-0'
+              }]
+            }
+          : {
+              name: '#default',
+              class: 'inset-x-4 top-[4.25rem] bottom-4'
+            }]
+      }
+    : {
+        name: '#left',
+        class: 'left-4 inset-y-4 w-64'
+      }, isAfterStep(steps.docs + 7)
+    ? {
+        name: 'UPage',
+        to: '/pro/components/page',
+        class: 'left-72 right-4 inset-y-4',
+        inactive: isAfterStep(steps.docs + 8),
+        children: [...(isAfterStep(steps.docs + 9)
+          ? [{
+              name: 'UPageHeader',
+              to: '/pro/components/page-header',
+              class: 'top-4 left-4 right-72 h-32',
+              inactive: isAfterStep(steps.docs + 10),
+              children: [{
+                slot: 'page-header',
+                class: 'inset-4 justify-start'
+              }]
+            }, {
+              name: 'UPageBody',
+              to: '/pro/components/page-body',
+              class: 'top-40 left-4 right-72 bottom-4 overflow-y-auto',
+              inactive: isAfterStep(steps.docs + 11),
+              children: [{
+                slot: 'page-body',
+                class: 'inset-x-4 top-4 justify-start'
+              }, isAfterStep(steps.docs + 12)
+                ? {
+                    slot: 'content-surround',
+                    class: 'bottom-4 inset-x-4 h-28'
+                  }
+                : {
+                    name: 'UContentSurround',
+                    to: '/pro/components/content-surround',
+                    class: 'bottom-4 inset-x-4 h-28',
+                    inactive: false
+                  }]
+            }]
+          : [{
+              name: '#default',
+              class: 'left-4 right-72 inset-y-4'
+            }]), isAfterStep(steps.docs + 13)
+          ? {
+              name: 'UContentToc',
+              to: '/pro/components/content-toc',
+              class: 'right-4 inset-y-4 w-64',
+              inactive: isAfterStep(steps.docs + 14),
+              children: [{
+                slot: 'content-toc',
+                class: 'inset-4 overflow-y-auto'
+              }]
+            }
+          : {
+              name: '#right',
+              class: 'right-4 inset-y-4 w-64'
+            }]
+      }
+    : {
+        name: '#default',
+        class: 'left-72 right-4 inset-y-4'
       }]
-    } : {
-      name: '#default',
-      class: 'inset-x-4 top-[4.25rem] bottom-4'
-    }]
-  } : {
-    name: '#left',
-    class: 'left-4 inset-y-4 w-64'
-  }, isAfterStep(steps.docs + 7) ? {
-    name: 'UPage',
-    to: '/pro/components/page',
-    class: 'left-72 right-4 inset-y-4',
-    inactive: isAfterStep(steps.docs + 8),
-    children: [...(isAfterStep(steps.docs + 9) ? [{
-      name: 'UPageHeader',
-      to: '/pro/components/page-header',
-      class: 'top-4 left-4 right-72 h-32',
-      inactive: isAfterStep(steps.docs + 10),
-      children: [{
-        slot: 'page-header',
-        class: 'inset-4 justify-start'
-      }]
-    }, {
-      name: 'UPageBody',
-      to: '/pro/components/page-body',
-      class: 'top-40 left-4 right-72 bottom-4 overflow-y-auto',
-      inactive: isAfterStep(steps.docs + 11),
-      children: [{
-        slot: 'page-body',
-        class: 'inset-x-4 top-4 justify-start'
-      }, isAfterStep(steps.docs + 12) ? {
-        slot: 'content-surround',
-        class: 'bottom-4 inset-x-4 h-28'
-      } : {
-        name: 'UContentSurround',
-        to: '/pro/components/content-surround',
-        class: 'bottom-4 inset-x-4 h-28',
-        inactive: false
-      }]
-    }] : [{
-      name: '#default',
-      class: 'left-4 right-72 inset-y-4'
-    }]), isAfterStep(steps.docs + 13) ? {
-      name: 'UContentToc',
-      to: '/pro/components/content-toc',
-      class: 'right-4 inset-y-4 w-64',
-      inactive: isAfterStep(steps.docs + 14),
-      children: [{
-        slot: 'content-toc',
-        class: 'inset-4 overflow-y-auto'
-      }]
-    } : {
-      name: '#right',
-      class: 'right-4 inset-y-4 w-64'
-    }]
-  } : {
-    name: '#default',
-    class: 'left-72 right-4 inset-y-4'
-  }]
 }].filter(Boolean))
 
 const blocks = computed(() => [isAfterStep(steps.header) && {
@@ -655,62 +679,74 @@ const blocks = computed(() => [isAfterStep(steps.header) && {
   to: '/pro/components/header',
   class: 'h-16 inset-x-0 top-0',
   inactive: isAfterStep(steps.header + 1),
-  children: [isAfterStep(steps.header + 2) ? {
-    slot: 'header-left',
-    class: 'left-4 top-4'
-  } : {
-    name: '#left',
-    class: 'left-4 inset-y-4 w-64'
-  }, isAfterStep(steps.header + 3) ? {
-    slot: 'header-center',
-    class: 'inset-x-72 top-5'
-  } : {
-    name: '#center',
-    class: 'inset-x-72 inset-y-4'
-  }, isAfterStep(steps.header + 4) ? {
-    slot: 'header-right',
-    class: 'right-4 top-4'
-  } : {
-    name: '#right',
-    class: 'right-4 inset-y-4 w-64'
-  }]
+  children: [isAfterStep(steps.header + 2)
+    ? {
+        slot: 'header-left',
+        class: 'left-4 top-4'
+      }
+    : {
+        name: '#left',
+        class: 'left-4 inset-y-4 w-64'
+      }, isAfterStep(steps.header + 3)
+    ? {
+        slot: 'header-center',
+        class: 'inset-x-72 top-5'
+      }
+    : {
+        name: '#center',
+        class: 'inset-x-72 inset-y-4'
+      }, isAfterStep(steps.header + 4)
+    ? {
+        slot: 'header-right',
+        class: 'right-4 top-4'
+      }
+    : {
+        name: '#right',
+        class: 'right-4 inset-y-4 w-64'
+      }]
 }, isAfterStep(steps.footer) && {
   name: 'UFooter',
   to: '/pro/components/footer',
   class: 'h-16 inset-x-0 bottom-0',
   inactive: isAfterStep(steps.footer + 1),
-  children: [isAfterStep(steps.footer + 2) ? {
-    slot: 'footer-left',
-    class: 'left-4 bottom-5'
-  } : {
-    name: '#left',
-    class: 'left-4 inset-y-4 w-64'
-  }, isAfterStep(steps.footer + 3) ? {
-    slot: 'footer-center',
-    class: 'inset-x-72 bottom-5'
-  } : {
-    name: '#center',
-    class: 'inset-x-72 inset-y-4'
-  }, isAfterStep(steps.footer + 4) ? {
-    slot: 'footer-right',
-    class: 'right-4 bottom-4'
-  } : {
-    name: '#right',
-    class: 'right-4 inset-y-4 w-64'
-  }]
+  children: [isAfterStep(steps.footer + 2)
+    ? {
+        slot: 'footer-left',
+        class: 'left-4 bottom-5'
+      }
+    : {
+        name: '#left',
+        class: 'left-4 inset-y-4 w-64'
+      }, isAfterStep(steps.footer + 3)
+    ? {
+        slot: 'footer-center',
+        class: 'inset-x-72 bottom-5'
+      }
+    : {
+        name: '#center',
+        class: 'inset-x-72 inset-y-4'
+      }, isAfterStep(steps.footer + 4)
+    ? {
+        slot: 'footer-right',
+        class: 'right-4 bottom-4'
+      }
+    : {
+        name: '#right',
+        class: 'right-4 inset-y-4 w-64'
+      }]
 }, ...landingBlocks.value, ...docsBlocks.value].filter(Boolean))
 
 // Methods
 
-function isBeforeStep (i = 0) {
+function isBeforeStep(i = 0) {
   return y.value < (start.value + (i * inc.value))
 }
 
-function isAfterStep (i = 0) {
+function isAfterStep(i = 0) {
   return y.value >= (start.value + (i * inc.value))
 }
 
-function getStepY (step: number) {
+function getStepY(step: number) {
   return start.value + (step * inc.value)
 }
 

docs/pages/releases.vue

@@ -50,7 +50,7 @@ const dates = computed(() => {
 
   const days = eachDayOfInterval({ start: new Date(first.published_at), end: new Date() })
 
-  return days.reverse().map(day => {
+  return days.reverse().map((day) => {
     return {
       day,
       release: releases.value.find(release => isSameDay(new Date(release.published_at), day)),

docs/plugins/prettier.ts

@@ -1,13 +1,14 @@
 import type { Options } from 'prettier'
+import { defu } from 'defu'
 import PrettierWorker from '@/workers/prettier.js?worker&inline'
 
 export interface SimplePrettier {
-  format: (source: string, options?: Options) => Promise<string>;
+  format: (source: string, options?: Options) => Promise<string>
 }
 
-function createPrettierWorkerApi (worker: Worker): SimplePrettier {
+function createPrettierWorkerApi(worker: Worker): SimplePrettier {
   let counter = 0
-  const handlers = {}
+  const handlers: any = {}
 
   worker.addEventListener('message', (event) => {
     const { uid, message, error } = event.data
@@ -17,6 +18,7 @@ function createPrettierWorkerApi (worker: Worker): SimplePrettier {
     }
 
     const [resolve, reject] = handlers[uid]
+    // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
     delete handlers[uid]
 
     if (error) {
@@ -26,7 +28,7 @@ function createPrettierWorkerApi (worker: Worker): SimplePrettier {
     }
   })
 
-  function postMessage<T> (message) {
+  function postMessage<T>(message: any) {
     const uid = ++counter
     return new Promise<T>((resolve, reject) => {
       handlers[uid] = [resolve, reject]
@@ -35,33 +37,31 @@ function createPrettierWorkerApi (worker: Worker): SimplePrettier {
   }
 
   return {
-    format (source: string, options?: Options) {
+    format(source: string, options?: Options) {
       return postMessage({ type: 'format', source, options })
     }
   }
 }
 
-export default defineNuxtPlugin({
-  async setup () {
-    let prettier: SimplePrettier
-    if (import.meta.server) {
-      const prettierModule = await import('prettier')
-      prettier = {
-        format (source, options = {
+export default defineNuxtPlugin(async () => {
+  let prettier: SimplePrettier
+  if (import.meta.server) {
+    const prettierModule = await import('prettier')
+    prettier = {
+      format(source, options = {}) {
+        return prettierModule.format(source, defu(options, {
           parser: 'markdown'
-        }) {
-          return prettierModule.format(source, options)
-        }
+        }))
       }
-    } else {
-      const worker = new PrettierWorker()
-      prettier = createPrettierWorkerApi(worker)
     }
+  } else {
+    const worker = new PrettierWorker()
+    prettier = createPrettierWorkerApi(worker)
+  }
 
-    return {
-      provide: {
-        prettier
-      }
+  return {
+    provide: {
+      prettier
     }
   }
 })

docs/plugins/ui.ts

@@ -3,7 +3,7 @@ import colors from '#tailwind-config/theme/colors'
 
 export default defineNuxtPlugin({
   enforce: 'post',
-  setup () {
+  setup() {
     const appConfig = useAppConfig()
 
     const root = computed(() => {

docs/server/api/pulls.json.get.ts

@@ -1,6 +1,6 @@
 import { Octokit } from '@octokit/rest'
 
-function isUserABot (user) {
+function isUserABot(user) {
   return user?.login?.endsWith('-bot') || user?.login?.endsWith('[bot]')
 }
 

docs/workers/prettier.js

@@ -1,8 +1,4 @@
 /* eslint-disable no-undef */
-import('https://unpkg.com/prettier@3.0.3/standalone.js')
-import('https://unpkg.com/prettier@3.0.3/plugins/html.js')
-import('https://unpkg.com/prettier@3.0.3/plugins/markdown.js')
-
 self.onmessage = async function (event) {
   self.postMessage({
     uid: event.data.uid,
@@ -10,14 +6,22 @@ self.onmessage = async function (event) {
   })
 }
 
-function handleMessage (message) {
+function handleMessage(message) {
   switch (message.type) {
     case 'format':
       return handleFormatMessage(message)
   }
 }
 
-async function handleFormatMessage (message) {
+async function handleFormatMessage(message) {
+  if (!globalThis.prettier) {
+    await Promise.all([
+      import('https://unpkg.com/prettier@3.3.3/standalone.js'),
+      import('https://unpkg.com/prettier@3.3.3/plugins/html.js'),
+      import('https://unpkg.com/prettier@3.3.3/plugins/markdown.js')
+    ])
+  }
+
   const { options, source } = message
   const formatted = await prettier.format(source, {
     parser: 'markdown',

eslint.config.mjs

@@ -0,0 +1,19 @@
+import { createConfigForNuxt } from '@nuxt/eslint-config/flat'
+
+export default createConfigForNuxt({
+  features: {
+    tooling: true,
+    stylistic: {
+      commaDangle: 'never',
+      braceStyle: '1tbs'
+    }
+  }
+}).overrideRules({
+  'vue/multi-word-component-names': 'off',
+  'vue/max-attributes-per-line': ['error', { singleline: 5 }],
+  '@typescript-eslint/ban-types': 'off',
+  '@typescript-eslint/ban-ts-comment': 'off',
+  '@typescript-eslint/no-unsafe-function-type': 'off',
+  '@typescript-eslint/no-empty-object-type': 'off',
+  '@typescript-eslint/no-explicit-any': 'off'
+})

package.json

@@ -1,8 +1,8 @@
 {
   "name": "@nuxt/ui",
   "description": "A UI Library for Modern Web Apps, powered by Vue & Tailwind CSS.",
-  "version": "2.18.7",
-  "packageManager": "pnpm@9.12.1",
+  "version": "2.21.0",
+  "packageManager": "pnpm@9.15.3",
   "repository": "nuxt/ui",
   "homepage": "https://ui.nuxt.com",
   "type": "module",
@@ -34,50 +34,55 @@
   "dependencies": {
     "@headlessui/tailwindcss": "^0.2.1",
     "@headlessui/vue": "^1.7.23",
-    "@iconify-json/heroicons": "^1.2.1",
-    "@nuxt/icon": "^1.5.5",
-    "@nuxt/kit": "^3.13.2",
-    "@nuxtjs/color-mode": "^3.5.1",
-    "@nuxtjs/tailwindcss": "^6.12.1",
+    "@iconify-json/heroicons": "^1.2.2",
+    "@nuxt/icon": "^1.10.3",
+    "@nuxt/kit": "^3.15.1",
+    "@nuxtjs/color-mode": "^3.5.2",
+    "@nuxtjs/tailwindcss": "^6.13.1",
     "@popperjs/core": "^2.11.8",
     "@tailwindcss/aspect-ratio": "^0.4.2",
     "@tailwindcss/container-queries": "^0.1.1",
-    "@tailwindcss/forms": "^0.5.9",
-    "@tailwindcss/typography": "^0.5.15",
-    "@vueuse/core": "^11.1.0",
-    "@vueuse/integrations": "^11.1.0",
-    "@vueuse/math": "^11.1.0",
+    "@tailwindcss/forms": "^0.5.10",
+    "@tailwindcss/typography": "^0.5.16",
+    "@vueuse/core": "^12.4.0",
+    "@vueuse/integrations": "^12.4.0",
+    "@vueuse/math": "^12.4.0",
     "defu": "^6.1.4",
     "fuse.js": "^7.0.0",
     "ohash": "^1.1.4",
-    "pathe": "^1.1.2",
+    "pathe": "^2.0.1",
     "scule": "^1.3.0",
-    "tailwind-merge": "^2.5.3",
-    "tailwindcss": "^3.4.13"
+    "tailwind-merge": "^2.6.0",
+    "tailwindcss": "^3.4.17"
   },
   "devDependencies": {
-    "@nuxt/eslint-config": "^0.4.0",
+    "@nuxt/eslint-config": "^0.7.5",
     "@nuxt/module-builder": "^0.8.4",
-    "@nuxt/test-utils": "^3.14.3",
-    "@release-it/conventional-changelog": "^8.0.2",
+    "@nuxt/test-utils": "^3.15.4",
+    "@release-it/conventional-changelog": "^10.0.0",
     "@vue/test-utils": "^2.4.6",
-    "eslint": "^8.57.0",
+    "eslint": "^9.18.0",
     "happy-dom": "^14.12.3",
     "joi": "^17.13.3",
-    "nuxt": "^3.13.2",
-    "release-it": "^17.7.0",
-    "unbuild": "^2.0.0",
+    "nuxt": "^3.15.1",
+    "release-it": "^18.1.1",
+    "superstruct": "^2.0.2",
+    "typescript": "^5.6.3",
     "valibot": "^0.42.1",
     "valibot30": "npm:valibot@0.30.0",
     "valibot31": "npm:valibot@0.31.0",
-    "vitest": "^2.1.2",
+    "vitest": "^2.1.8",
     "vitest-environment-nuxt": "^1.0.1",
-    "vue-tsc": "^2.1.6",
-    "yup": "^1.4.0",
-    "zod": "^3.23.8"
+    "vue-tsc": "^2.1.10",
+    "yup": "^1.6.1",
+    "zod": "^3.24.1"
   },
   "resolutions": {
     "@nuxt/ui": "workspace:*",
-    "@nuxtjs/mdc": "0.9.0"
+    "@nuxt/content": "2.13.2",
+    "@nuxtjs/mdc": "0.9.0",
+    "chokidar": "3.6.0",
+    "vue-tsc": "2.1.10",
+    "typescript": "5.6.3"
   }
 }

playground/nuxt.config.ts

@@ -4,4 +4,4 @@ export default defineNuxtConfig({
   ],
 
   compatibilityDate: '2024-07-23'
-})
+})

playground/package.json

@@ -9,6 +9,6 @@
   },
   "dependencies": {
     "@nuxt/ui": "latest",
-    "nuxt": "^3.13.2"
+    "nuxt": "^3.15.1"
   }
 }

renovate.json

@@ -6,8 +6,6 @@
     "enabled": true
   },
   "ignoreDeps": [
-    "@nuxt/eslint-config",
-    "eslint",
     "happy-dom",
     "valibot30",
     "valibot31"
@@ -23,5 +21,8 @@
       "@tailwindcss/postcss",
       "@tailwindcss/vite"
     ]
+  }, {
+    "matchDepTypes": ["resolutions"],
+    "enabled": false
   }]
 }

scripts/bump-edge.ts

@@ -1,8 +1,8 @@
-import { promises as fsp } from 'fs'
-import { resolve } from 'path'
-import { execSync } from 'child_process'
+import { promises as fsp } from 'node:fs'
+import { resolve } from 'node:path'
+import { execSync } from 'node:child_process'
 
-async function loadPackage (dir: string) {
+async function loadPackage(dir: string) {
   const pkgPath = resolve(dir, 'package.json')
 
   const data = JSON.parse(await fsp.readFile(pkgPath, 'utf-8').catch(() => '{}'))
@@ -16,7 +16,7 @@ async function loadPackage (dir: string) {
   }
 }
 
-async function main () {
+async function main() {
   const pkg = await loadPackage(process.cwd())
 
   const commit = execSync('git rev-parse --short HEAD').toString('utf-8').trim()
@@ -31,7 +31,6 @@ async function main () {
 }
 
 main().catch((err) => {
-  // eslint-disable-next-line no-console
   console.error(err)
   process.exit(1)
 })

src/module.ts

@@ -1,8 +1,9 @@
 import { createRequire } from 'node:module'
 import { defineNuxtModule, installModule, addComponentsDir, addImportsDir, createResolver, addPlugin } from '@nuxt/kit'
+import type { ConfigExtension, DefaultClassGroupIds, DefaultThemeGroupIds } from 'tailwind-merge'
 import { name, version } from '../package.json'
 import createTemplates from './templates'
-import * as config from './runtime/ui.config'
+import type * as config from './runtime/ui.config'
 import type { DeepPartial, Strategy } from './runtime/types'
 import installTailwind from './tailwind'
 
@@ -20,8 +21,9 @@ type UI = {
   gray?: string
   colors?: string[]
   strategy?: Strategy
+  tailwindMerge?: ConfigExtension<DefaultClassGroupIds, DefaultThemeGroupIds>
   [key: string]: any
-} & DeepPartial<typeof config, string>
+} & DeepPartial<typeof config, string | number | boolean>
 
 declare module '@nuxt/schema' {
   interface AppConfigInput {
@@ -62,7 +64,7 @@ export default defineNuxtModule<ModuleOptions>({
     safelistColors: ['primary'],
     disableGlobalStyles: false
   },
-  async setup (options, nuxt) {
+  async setup(options, nuxt) {
     const { resolve } = createResolver(import.meta.url)
 
     // Transpile runtime