@nuxt/ui 2.20.0 → 2.21.0

package/dist/module.d.mts

@@ -1,4 +1,5 @@
 import * as _nuxt_schema from '@nuxt/schema';
+import { ConfigExtension, DefaultClassGroupIds, DefaultThemeGroupIds } from 'tailwind-merge';
 import * as config from '../dist/runtime/ui.config/index.js';
 import { Strategy, DeepPartial } from '../dist/runtime/types/index.js';
 
@@ -7,6 +8,7 @@ type UI = {
     gray?: string;
     colors?: string[];
     strategy?: Strategy;
+    tailwindMerge?: ConfigExtension<DefaultClassGroupIds, DefaultThemeGroupIds>;
     [key: string]: any;
 } & DeepPartial<typeof config, string | number | boolean>;
 declare module '@nuxt/schema' {

package/dist/module.d.ts

@@ -1,4 +1,5 @@
 import * as _nuxt_schema from '@nuxt/schema';
+import { ConfigExtension, DefaultClassGroupIds, DefaultThemeGroupIds } from 'tailwind-merge';
 import * as config from '../dist/runtime/ui.config/index.js';
 import { Strategy, DeepPartial } from '../dist/runtime/types/index.js';
 
@@ -7,6 +8,7 @@ type UI = {
     gray?: string;
     colors?: string[];
     strategy?: Strategy;
+    tailwindMerge?: ConfigExtension<DefaultClassGroupIds, DefaultThemeGroupIds>;
     [key: string]: any;
 } & DeepPartial<typeof config, string | number | boolean>;
 declare module '@nuxt/schema' {

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/ui",
-  "version": "2.20.0",
+  "version": "2.21.0",
   "configKey": "ui",
   "compatibility": {
     "nuxt": ">=3.10.0"

package/dist/module.mjs

@@ -14,7 +14,7 @@ const __filename = __cjs_url__.fileURLToPath(import.meta.url);
 const __dirname = __cjs_path__.dirname(__filename);
 const require = __cjs_mod__.createRequire(import.meta.url);
 const name = "@nuxt/ui";
-const version = "2.20.0";
+const version = "2.21.0";
 
 function createTemplates(nuxt = useNuxt()) {
   const template = addTemplate({
@@ -48,21 +48,26 @@ function installTailwind(moduleOptions, nuxt = useNuxt(), resolve = createResolv
     };
   });
   const configTemplate = addTemplate({
-    filename: "nuxtui-tailwind.config.cjs",
+    filename: "nuxtui-tailwind.config.mjs",
     write: true,
     getContents: ({ nuxt: nuxt2 }) => `
-      const { defaultExtractor: createDefaultExtractor } = require('tailwindcss/lib/lib/defaultExtractor.js')
-      const { customSafelistExtractor, generateSafelist } = require(${JSON.stringify(resolve(runtimeDir, "utils", "colors"))})
+      import { defaultExtractor as createDefaultExtractor } from "tailwindcss/lib/lib/defaultExtractor.js";
+      import { customSafelistExtractor, generateSafelist } from ${JSON.stringify(resolve(runtimeDir, "utils", "colors"))};
+      import formsPlugin from "@tailwindcss/forms";
+      import aspectRatio from "@tailwindcss/aspect-ratio";
+      import typography from "@tailwindcss/typography";
+      import containerQueries from "@tailwindcss/container-queries";
+      import headlessUi from "@headlessui/tailwindcss";
 
-      const defaultExtractor = createDefaultExtractor({ tailwindConfig: { separator: ':' } })
+      const defaultExtractor = createDefaultExtractor({ tailwindConfig: { separator: ':' } });
 
-      module.exports = {
+      export default {
         plugins: [
-          require('@tailwindcss/forms')({ strategy: 'class' }),
-          require('@tailwindcss/aspect-ratio'),
-          require('@tailwindcss/typography'),
-          require('@tailwindcss/container-queries'),
-          require('@headlessui/tailwindcss')
+          formsPlugin({ strategy: 'class' }),
+          aspectRatio,
+          typography,
+          containerQueries,
+          headlessUi
         ],
         content: {
           files: [

package/dist/runtime/components/data/Table.vue

@@ -18,7 +18,7 @@
             :class="[ui.th.base, ui.th.padding, ui.th.color, ui.th.font, ui.th.size, column.key === 'select' && ui.checkbox.padding, column.class]"
             :aria-sort="getAriaSort(column)"
           >
-            <slot v-if="!singleSelect && modelValue && (column.key === 'select' || shouldRenderColumnInFirstPlace(index, 'select'))" name="select-header" :indeterminate="indeterminate" :checked="isAllRowChecked" :change="onChange">
+            <slot v-if="!singleSelect && modelValue && column.key === 'select'" name="select-header" :indeterminate="indeterminate" :checked="isAllRowChecked" :change="onChange">
               <UCheckbox
                 :model-value="isAllRowChecked"
                 :indeterminate="indeterminate"
@@ -93,13 +93,12 @@
                 />
               </td>
               <td v-for="(column, subIndex) in columns" :key="subIndex" :class="[ui.td.base, ui.td.padding, ui.td.color, ui.td.font, ui.td.size, column?.rowClass, row[column.key]?.class, column.key === 'select' && ui.checkbox.padding]">
-                <slot v-if="modelValue && (column.key === 'select' || shouldRenderColumnInFirstPlace(subIndex, 'select')) " name="select-data" :checked="isSelected(row)" :change="(ev: boolean) => onChangeCheckbox(ev, row)">
+                <slot v-if="modelValue && column.key === 'select' " name="select-data" :checked="isSelected(row)" :change="(ev: boolean) => onChangeCheckbox(ev, row)">
                   <UCheckbox
                     :model-value="isSelected(row)"
                     v-bind="ui.default.checkbox"
                     aria-label="Select row"
                     @change="onChangeCheckbox($event, row)"
-                    @click.capture.stop="() => onSelect(row)"
                   />
                 </slot>
 
@@ -143,7 +142,7 @@ import UButton from "../elements/Button.vue";
 import UProgress from "../elements/Progress.vue";
 import UCheckbox from "../forms/Checkbox.vue";
 import { useUI } from "../../composables/useUI";
-import { mergeConfig, get } from "../../utils";
+import { get, mergeConfig } from "../../utils";
 import appConfig from "#build/app.config";
 import { table } from "#ui/ui.config";
 const config = mergeConfig(appConfig.ui.strategy, appConfig.ui.table, table);
@@ -263,7 +262,25 @@ export default defineComponent({
   emits: ["update:modelValue", "update:sort", "update:expand", "select:all"],
   setup(props, { emit, attrs: $attrs }) {
     const { ui, attrs } = useUI("table", toRef(props, "ui"), config, toRef(props, "class"));
-    const columns = computed(() => props.columns ?? Object.keys(props.rows[0] ?? {}).map((key) => ({ key, label: upperFirst(key), sortable: false, class: void 0, sort: defaultSort })));
+    const columns = computed(() => {
+      const defaultColumns = props.columns ?? Object.keys(props.rows[0]).map((key) => ({
+        key,
+        label: upperFirst(key),
+        sortable: false,
+        class: void 0,
+        sort: defaultSort
+      }));
+      const hasColumnSelect = defaultColumns.find((v) => v.key === "select");
+      if (hasColumnSelect || !props.modelValue) {
+        return defaultColumns;
+      }
+      return [{
+        key: "select",
+        sortable: false,
+        class: void 0,
+        sort: defaultSort
+      }, ...defaultColumns];
+    });
     const sort = useVModel(props, "sort", emit, { passive: true, defaultValue: defu({}, props.sort, { column: null, direction: "asc" }) });
     const expand = useVModel(props, "expand", emit, {
       passive: true,
@@ -375,8 +392,7 @@ export default defineComponent({
       if (checked) {
         selected.value = props.singleSelect ? [row] : [...selected.value, row];
       } else {
-        const index = selected.value.findIndex((item) => compare(item, row));
-        selected.value.splice(index, 1);
+        selected.value = selected.value.filter((value) => !compare(toRaw(value), toRaw(row)));
       }
     }
     function getRowData(row, rowKey, defaultValue = "") {
@@ -385,12 +401,6 @@ export default defineComponent({
     function isExpanded(row) {
       return expand.value?.openedRows ? expand.value.openedRows.some((openedRow) => compare(openedRow, row)) : false;
     }
-    function shouldRenderColumnInFirstPlace(index, key) {
-      if (!props.columns) {
-        return index === 0;
-      }
-      return index === 0 && !props.columns.find((col) => col.key === key);
-    }
     function toggleOpened(row) {
       expand.value = {
         openedRows: isExpanded(row) ? expand.value.openedRows.filter((v) => !compare(v, row)) : props.multipleExpand ? [...expand.value.openedRows, row] : [row],
@@ -444,7 +454,6 @@ export default defineComponent({
       toggleOpened,
       getAriaSort,
       isExpanded,
-      shouldRenderColumnInFirstPlace,
       retriggerSlot
     };
   }

package/dist/runtime/components/data/Table.vue.d.ts

@@ -308,7 +308,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     toggleOpened: (row: TableRow) => void;
     getAriaSort: (column: TableColumn) => AriaAttributes["aria-sort"];
     isExpanded: (row: TableRow) => boolean;
-    shouldRenderColumnInFirstPlace: (index: number, key: string) => boolean;
     retriggerSlot: import("vue").Ref<any, any>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "update:sort" | "update:expand" | "select:all")[], "update:modelValue" | "update:sort" | "update:expand" | "select:all", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelValue: {

package/dist/runtime/components/elements/Alert.vue

@@ -41,12 +41,12 @@
 
 <script>
 import { computed, toRef, defineComponent } from "vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import UIcon from "../elements/Icon.vue";
 import UAvatar from "../elements/Avatar.vue";
 import UButton from "../elements/Button.vue";
 import { useUI } from "../../composables/useUI";
-import { mergeConfig } from "../../utils";
+import { mergeConfig, twMerge } from "../../utils";
 import appConfig from "#build/app.config";
 import { alert } from "#ui/ui.config";
 const config = mergeConfig(appConfig.ui.strategy, appConfig.ui.alert, alert);

package/dist/runtime/components/elements/Avatar.vue

@@ -22,10 +22,10 @@
 
 <script>
 import { defineComponent, ref, computed, toRef, watch } from "vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import UIcon from "../elements/Icon.vue";
 import { useUI } from "../../composables/useUI";
-import { mergeConfig } from "../../utils";
+import { mergeConfig, twMerge } from "../../utils";
 import appConfig from "#build/app.config";
 import { avatar } from "#ui/ui.config";
 const config = mergeConfig(appConfig.ui.strategy, appConfig.ui.avatar, avatar);

package/dist/runtime/components/elements/AvatarGroup.js

@@ -1,7 +1,7 @@
 import { h, cloneVNode, computed, toRef, defineComponent } from "vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import { useUI } from "../../composables/useUI.js";
-import { mergeConfig, getSlotsChildren } from "../../utils/index.js";
+import { getSlotsChildren, mergeConfig, twMerge } from "../../utils/index.js";
 import UAvatar from "./Avatar.vue";
 import appConfig from "#build/app.config";
 import { avatar, avatarGroup } from "#ui/ui.config";

package/dist/runtime/components/elements/Badge.vue

@@ -18,10 +18,10 @@
 
 <script>
 import { computed, toRef, defineComponent } from "vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import UIcon from "../elements/Icon.vue";
 import { useUI } from "../../composables/useUI";
-import { mergeConfig } from "../../utils";
+import { mergeConfig, twMerge } from "../../utils";
 import { useInjectButtonGroup } from "../../composables/useButtonGroup";
 import appConfig from "#build/app.config";
 import { badge } from "#ui/ui.config";

package/dist/runtime/components/elements/Button.vue

@@ -18,11 +18,11 @@
 
 <script>
 import { computed, defineComponent, toRef } from "vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import UIcon from "../elements/Icon.vue";
 import ULink from "../elements/Link.vue";
 import { useUI } from "../../composables/useUI";
-import { mergeConfig, nuxtLinkProps, getNuxtLinkProps } from "../../utils";
+import { getNuxtLinkProps, mergeConfig, nuxtLinkProps, twMerge } from "../../utils";
 import { useInjectButtonGroup } from "../../composables/useButtonGroup";
 import appConfig from "#build/app.config";
 import { button } from "#ui/ui.config";

package/dist/runtime/components/elements/ButtonGroup.js

@@ -1,7 +1,7 @@
 import { h, computed, toRef, defineComponent } from "vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import { useUI } from "../../composables/useUI.js";
-import { mergeConfig, getSlotsChildren } from "../../utils/index.js";
+import { getSlotsChildren, mergeConfig, twMerge } from "../../utils/index.js";
 import { useProvideButtonGroup } from "../../composables/useButtonGroup.js";
 import appConfig from "#build/app.config";
 import { button, buttonGroup } from "#ui/ui.config";

package/dist/runtime/components/elements/Carousel.vue

@@ -57,9 +57,8 @@
 
 <script>
 import { ref, toRef, computed, defineComponent } from "vue";
-import { twMerge } from "tailwind-merge";
 import { useScroll, useResizeObserver, useElementSize } from "@vueuse/core";
-import { mergeConfig } from "../../utils";
+import { mergeConfig, twMerge } from "../../utils";
 import UButton from "../elements/Button.vue";
 import { useUI } from "../../composables/useUI";
 import { useCarouselScroll } from "../../composables/useCarouselScroll";

package/dist/runtime/components/elements/Dropdown.vue

@@ -59,13 +59,13 @@
 import { defineComponent, ref, computed, watch, toRef, onMounted, resolveComponent } from "vue";
 import { Menu as HMenu, MenuButton as HMenuButton, MenuItems as HMenuItems, MenuItem as HMenuItem, provideUseId } from "@headlessui/vue";
 import { defu } from "defu";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import UIcon from "../elements/Icon.vue";
 import UAvatar from "../elements/Avatar.vue";
 import UKbd from "../elements/Kbd.vue";
 import { useUI } from "../../composables/useUI";
 import { usePopper } from "../../composables/usePopper";
-import { mergeConfig, getNuxtLinkProps } from "../../utils";
+import { getNuxtLinkProps, mergeConfig, twMerge } from "../../utils";
 import appConfig from "#build/app.config";
 import { dropdown } from "#ui/ui.config";
 import { useId } from "#imports";

package/dist/runtime/components/elements/Kbd.vue

@@ -6,9 +6,9 @@
 
 <script>
 import { toRef, defineComponent, computed } from "vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import { useUI } from "../../composables/useUI";
-import { mergeConfig } from "../../utils";
+import { mergeConfig, twMerge } from "../../utils";
 import appConfig from "#build/app.config";
 import { kbd } from "#ui/ui.config";
 const config = mergeConfig(appConfig.ui.strategy, appConfig.ui.kbd, kbd);

package/dist/runtime/components/elements/MeterGroup.js

@@ -2,7 +2,7 @@ import { h, cloneVNode, computed, toRef, defineComponent } from "vue";
 import { twJoin } from "tailwind-merge";
 import UIcon from "../elements/Icon.vue";
 import { useUI } from "../../composables/useUI.js";
-import { mergeConfig, getSlotsChildren } from "../../utils/index.js";
+import { getSlotsChildren, mergeConfig } from "../../utils/index.js";
 import appConfig from "#build/app.config";
 import { meter, meterGroup } from "#ui/ui.config";
 const meterConfig = mergeConfig(appConfig.ui.strategy, appConfig.ui.meter, meter);

package/dist/runtime/components/forms/Checkbox.vue

@@ -31,10 +31,10 @@
 
 <script>
 import { computed, toRef, defineComponent } from "vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import { useUI } from "../../composables/useUI";
 import { useFormGroup } from "../../composables/useFormGroup";
-import { mergeConfig } from "../../utils";
+import { mergeConfig, twMerge } from "../../utils";
 import appConfig from "#build/app.config";
 import { checkbox } from "#ui/ui.config";
 import { useId } from "#app";

package/dist/runtime/components/forms/Input.vue

@@ -32,12 +32,12 @@
 
 <script>
 import { ref, computed, toRef, onMounted, defineComponent } from "vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import { defu } from "defu";
 import UIcon from "../elements/Icon.vue";
 import { useUI } from "../../composables/useUI";
 import { useFormGroup } from "../../composables/useFormGroup";
-import { mergeConfig, looseToNumber } from "../../utils";
+import { looseToNumber, mergeConfig, twMerge } from "../../utils";
 import { useInjectButtonGroup } from "../../composables/useButtonGroup";
 import appConfig from "#build/app.config";
 import { input } from "#ui/ui.config";

package/dist/runtime/components/forms/InputMenu.vue

@@ -102,14 +102,14 @@ import {
 } from "@headlessui/vue";
 import { computedAsync, useDebounceFn } from "@vueuse/core";
 import { defu } from "defu";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import { isEqual } from "ohash";
 import UIcon from "../elements/Icon.vue";
 import UAvatar from "../elements/Avatar.vue";
 import { useUI } from "../../composables/useUI";
 import { usePopper } from "../../composables/usePopper";
 import { useFormGroup } from "../../composables/useFormGroup";
-import { get, mergeConfig } from "../../utils";
+import { get, mergeConfig, twMerge } from "../../utils";
 import { useInjectButtonGroup } from "../../composables/useButtonGroup";
 import appConfig from "#build/app.config";
 import { input, inputMenu } from "#ui/ui.config";

package/dist/runtime/components/forms/Radio.vue

@@ -30,10 +30,10 @@
 
 <script>
 import { computed, defineComponent, inject, toRef } from "vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import { useUI } from "../../composables/useUI";
 import { useFormGroup } from "../../composables/useFormGroup";
-import { mergeConfig } from "../../utils";
+import { mergeConfig, twMerge } from "../../utils";
 import appConfig from "#build/app.config";
 import { radio } from "#ui/ui.config";
 import { useId } from "#imports";

package/dist/runtime/components/forms/RadioGroup.vue

@@ -33,7 +33,7 @@
 import { computed, defineComponent, provide, toRef } from "vue";
 import { useUI } from "../../composables/useUI";
 import { useFormGroup } from "../../composables/useFormGroup";
-import { mergeConfig, get } from "../../utils";
+import { get, mergeConfig } from "../../utils";
 import URadio from "./Radio.vue";
 import appConfig from "#build/app.config";
 import { radioGroup, radio } from "#ui/ui.config";

package/dist/runtime/components/forms/Range.vue

@@ -21,10 +21,10 @@
 
 <script>
 import { computed, toRef, defineComponent } from "vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import { useUI } from "../../composables/useUI";
 import { useFormGroup } from "../../composables/useFormGroup";
-import { mergeConfig } from "../../utils";
+import { mergeConfig, twMerge } from "../../utils";
 import appConfig from "#build/app.config";
 import { range } from "#ui/ui.config";
 const config = mergeConfig(appConfig.ui.strategy, appConfig.ui.range, range);

package/dist/runtime/components/forms/Select.vue

@@ -54,11 +54,11 @@
 
 <script>
 import { computed, toRef, defineComponent } from "vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import UIcon from "../elements/Icon.vue";
 import { useUI } from "../../composables/useUI";
 import { useFormGroup } from "../../composables/useFormGroup";
-import { mergeConfig, get } from "../../utils";
+import { get, mergeConfig, twMerge } from "../../utils";
 import { useInjectButtonGroup } from "../../composables/useButtonGroup";
 import appConfig from "#build/app.config";
 import { select } from "#ui/ui.config";

package/dist/runtime/components/forms/SelectMenu.vue

@@ -138,14 +138,14 @@ import {
 } from "@headlessui/vue";
 import { computedAsync, useDebounceFn } from "@vueuse/core";
 import { defu } from "defu";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import { isEqual } from "ohash";
 import UIcon from "../elements/Icon.vue";
 import UAvatar from "../elements/Avatar.vue";
 import { useUI } from "../../composables/useUI";
 import { usePopper } from "../../composables/usePopper";
 import { useFormGroup } from "../../composables/useFormGroup";
-import { get, mergeConfig } from "../../utils";
+import { get, mergeConfig, twMerge } from "../../utils";
 import { useInjectButtonGroup } from "../../composables/useButtonGroup";
 import appConfig from "#build/app.config";
 import { select, selectMenu } from "#ui/ui.config";

package/dist/runtime/components/forms/Textarea.vue

@@ -22,11 +22,11 @@
 
 <script>
 import { ref, computed, toRef, watch, onMounted, nextTick, defineComponent } from "vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import { defu } from "defu";
 import { useUI } from "../../composables/useUI";
 import { useFormGroup } from "../../composables/useFormGroup";
-import { mergeConfig, looseToNumber } from "../../utils";
+import { looseToNumber, mergeConfig, twMerge } from "../../utils";
 import appConfig from "#build/app.config";
 import { textarea } from "#ui/ui.config";
 const config = mergeConfig(appConfig.ui.strategy, appConfig.ui.textarea, textarea);

package/dist/runtime/components/forms/Toggle.vue

@@ -32,11 +32,11 @@
 <script>
 import { computed, toRef, defineComponent } from "vue";
 import { Switch as HSwitch, provideUseId } from "@headlessui/vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import UIcon from "../elements/Icon.vue";
 import { useUI } from "../../composables/useUI";
 import { useFormGroup } from "../../composables/useFormGroup";
-import { mergeConfig } from "../../utils";
+import { mergeConfig, twMerge } from "../../utils";
 import appConfig from "#build/app.config";
 import { toggle } from "#ui/ui.config";
 import { useId } from "#imports";

package/dist/runtime/components/layout/Card.vue

@@ -18,9 +18,9 @@
 
 <script>
 import { computed, toRef, defineComponent } from "vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import { useUI } from "../../composables/useUI";
-import { mergeConfig } from "../../utils";
+import { mergeConfig, twMerge } from "../../utils";
 import appConfig from "#build/app.config";
 import { card } from "#ui/ui.config";
 const config = mergeConfig(appConfig.ui.strategy, appConfig.ui.card, card);

package/dist/runtime/components/layout/Container.vue

@@ -6,9 +6,9 @@
 
 <script>
 import { computed, toRef, defineComponent } from "vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import { useUI } from "../../composables/useUI";
-import { mergeConfig } from "../../utils";
+import { mergeConfig, twMerge } from "../../utils";
 import appConfig from "#build/app.config";
 import { container } from "#ui/ui.config";
 const config = mergeConfig(appConfig.ui.strategy, appConfig.ui.container, container);

package/dist/runtime/components/layout/Divider.vue

@@ -20,11 +20,11 @@
 
 <script>
 import { toRef, computed, defineComponent } from "vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import UIcon from "../elements/Icon.vue";
 import UAvatar from "../elements/Avatar.vue";
 import { useUI } from "../../composables/useUI";
-import { mergeConfig } from "../../utils";
+import { mergeConfig, twMerge } from "../../utils";
 import appConfig from "#build/app.config";
 import { divider } from "#ui/ui.config";
 const config = mergeConfig(appConfig.ui.strategy, appConfig.ui.divider, divider);

package/dist/runtime/components/layout/Skeleton.vue

@@ -4,9 +4,9 @@
 
 <script>
 import { computed, toRef, defineComponent } from "vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import { useUI } from "../../composables/useUI";
-import { mergeConfig } from "../../utils";
+import { mergeConfig, twMerge } from "../../utils";
 import appConfig from "#build/app.config";
 import { skeleton } from "#ui/ui.config";
 const config = mergeConfig(appConfig.ui.strategy, appConfig.ui.skeleton, skeleton);

package/dist/runtime/components/navigation/Breadcrumb.vue

@@ -35,11 +35,11 @@
 
 <script>
 import { defineComponent, toRef } from "vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import UIcon from "../elements/Icon.vue";
 import ULink from "../elements/Link.vue";
 import { useUI } from "../../composables/useUI";
-import { mergeConfig, getULinkProps } from "../../utils";
+import { getULinkProps, mergeConfig, twMerge } from "../../utils";
 import appConfig from "#build/app.config";
 import { breadcrumb } from "#ui/ui.config";
 const config = mergeConfig(appConfig.ui.strategy, appConfig.ui.breadcrumb, breadcrumb);

package/dist/runtime/components/navigation/HorizontalNavigation.vue

@@ -53,13 +53,13 @@
 
 <script>
 import { toRef, defineComponent, computed } from "vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import UIcon from "../elements/Icon.vue";
 import UAvatar from "../elements/Avatar.vue";
 import UBadge from "../elements/Badge.vue";
 import ULink from "../elements/Link.vue";
 import { useUI } from "../../composables/useUI";
-import { mergeConfig, getULinkProps } from "../../utils";
+import { getULinkProps, mergeConfig, twMerge } from "../../utils";
 import appConfig from "#build/app.config";
 import { horizontalNavigation } from "#ui/ui.config";
 const config = mergeConfig(appConfig.ui.strategy, appConfig.ui.horizontalNavigation, horizontalNavigation);

package/dist/runtime/components/navigation/VerticalNavigation.vue

@@ -54,14 +54,14 @@
 
 <script>
 import { toRef, defineComponent, computed } from "vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import UIcon from "../elements/Icon.vue";
 import UAvatar from "../elements/Avatar.vue";
 import UBadge from "../elements/Badge.vue";
 import ULink from "../elements/Link.vue";
 import UDivider from "../layout/Divider.vue";
 import { useUI } from "../../composables/useUI";
-import { mergeConfig, getULinkProps } from "../../utils";
+import { getULinkProps, mergeConfig, twMerge } from "../../utils";
 import appConfig from "#build/app.config";
 import { verticalNavigation } from "#ui/ui.config";
 const config = mergeConfig(appConfig.ui.strategy, appConfig.ui.verticalNavigation, verticalNavigation);

package/dist/runtime/components/overlays/ContextMenu.vue

@@ -16,10 +16,10 @@
 import { computed, toRef, defineComponent } from "vue";
 import { defu } from "defu";
 import { onClickOutside } from "@vueuse/core";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import { useUI } from "../../composables/useUI";
 import { usePopper } from "../../composables/usePopper";
-import { mergeConfig } from "../../utils";
+import { mergeConfig, twMerge } from "../../utils";
 import appConfig from "#build/app.config";
 import { contextMenu } from "#ui/ui.config";
 const config = mergeConfig(appConfig.ui.strategy, appConfig.ui.contextMenu, contextMenu);

package/dist/runtime/components/overlays/Notification.vue

@@ -44,13 +44,13 @@
 
 <script>
 import { ref, computed, toRef, onMounted, onUnmounted, watch, watchEffect, defineComponent } from "vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import UIcon from "../elements/Icon.vue";
 import UAvatar from "../elements/Avatar.vue";
 import UButton from "../elements/Button.vue";
 import { useUI } from "../../composables/useUI";
 import { useTimer } from "../../composables/useTimer";
-import { mergeConfig } from "../../utils";
+import { mergeConfig, twMerge } from "../../utils";
 import appConfig from "#build/app.config";
 import { notification } from "#ui/ui.config";
 const config = mergeConfig(appConfig.ui.strategy, appConfig.ui.notification, notification);

package/dist/runtime/components/overlays/Notifications.vue

@@ -21,10 +21,10 @@
 
 <script>
 import { computed, toRef, defineComponent } from "vue";
-import { twMerge, twJoin } from "tailwind-merge";
+import { twJoin } from "tailwind-merge";
 import { useUI } from "../../composables/useUI";
 import { useToast } from "../../composables/useToast";
-import { mergeConfig } from "../../utils";
+import { mergeConfig, twMerge } from "../../utils";
 import UNotification from "./Notification.vue";
 import { useState } from "#imports";
 import appConfig from "#build/app.config";

package/dist/runtime/utils/index.d.ts

@@ -1,4 +1,5 @@
 import type { Strategy } from '../types/index.js';
+export declare const twMerge: (...classLists: import("tailwind-merge").ClassNameValue[]) => string;
 export declare function mergeConfig<T>(strategy: Strategy, ...configs: any[]): T;
 export declare function parseConfigValue(value: string): string;
 export declare function hexToRgb(hex: string): string;

package/dist/runtime/utils/index.js

@@ -1,12 +1,13 @@
 import { defu, createDefu } from "defu";
 import { extendTailwindMerge } from "tailwind-merge";
-const customTwMerge = extendTailwindMerge({
+import appConfig from "#build/app.config";
+export const twMerge = extendTailwindMerge(defu({
   extend: {
     classGroups: {
       icons: [(classPart) => classPart.startsWith("i-")]
     }
   }
-});
+}, appConfig.ui?.tailwindMerge));
 const defuTwMerge = createDefu((obj, key, value, namespace) => {
   if (namespace === "default" || namespace.startsWith("default.")) {
     return false;
@@ -24,7 +25,7 @@ const defuTwMerge = createDefu((obj, key, value, namespace) => {
     return false;
   }
   if (typeof obj[key] === "string" && typeof value === "string" && obj[key] && value) {
-    obj[key] = customTwMerge(obj[key], value);
+    obj[key] = twMerge(obj[key], value);
     return true;
   }
 });

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@nuxt/ui",
   "description": "A UI Library for Modern Web Apps, powered by Vue & Tailwind CSS.",
-  "version": "2.20.0",
-  "packageManager": "pnpm@9.15.0",
+  "version": "2.21.0",
+  "packageManager": "pnpm@9.15.3",
   "repository": "nuxt/ui",
   "homepage": "https://ui.nuxt.com",
   "type": "module",
@@ -34,55 +34,55 @@
   "dependencies": {
     "@headlessui/tailwindcss": "^0.2.1",
     "@headlessui/vue": "^1.7.23",
-    "@iconify-json/heroicons": "^1.2.1",
-    "@nuxt/icon": "^1.9.1",
-    "@nuxt/kit": "^3.14.1592",
+    "@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.12.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": "^12.0.0",
-    "@vueuse/integrations": "^12.0.0",
-    "@vueuse/math": "^12.0.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.5",
-    "tailwindcss": "^3.4.16"
+    "tailwind-merge": "^2.6.0",
+    "tailwindcss": "^3.4.17"
   },
   "devDependencies": {
-    "@nuxt/eslint-config": "^0.7.2",
+    "@nuxt/eslint-config": "^0.7.5",
     "@nuxt/module-builder": "^0.8.4",
-    "@nuxt/test-utils": "^3.15.1",
-    "@release-it/conventional-changelog": "^9.0.3",
+    "@nuxt/test-utils": "^3.15.4",
+    "@release-it/conventional-changelog": "^10.0.0",
     "@vue/test-utils": "^2.4.6",
-    "eslint": "^9.16.0",
+    "eslint": "^9.18.0",
     "happy-dom": "^14.12.3",
     "joi": "^17.13.3",
-    "nuxt": "^3.14.1592",
-    "release-it": "^17.10.0",
+    "nuxt": "^3.15.1",
+    "release-it": "^18.1.1",
     "superstruct": "^2.0.2",
     "typescript": "^5.6.3",
-    "unbuild": "^2.0.0",
     "valibot": "^0.42.1",
     "valibot30": "npm:valibot@0.30.0",
     "valibot31": "npm:valibot@0.31.0",
     "vitest": "^2.1.8",
     "vitest-environment-nuxt": "^1.0.1",
     "vue-tsc": "^2.1.10",
-    "yup": "^1.5.0",
-    "zod": "^3.23.8"
+    "yup": "^1.6.1",
+    "zod": "^3.24.1"
   },
   "resolutions": {
     "@nuxt/ui": "workspace:*",
     "@nuxt/content": "2.13.2",
     "@nuxtjs/mdc": "0.9.0",
     "chokidar": "3.6.0",
+    "vue-tsc": "2.1.10",
     "typescript": "5.6.3"
   }
 }