From d6476d17f9b17317a7160271dacdb854f30237ae Mon Sep 17 00:00:00 2001
From: Younes Barrad <younesbarraddev@gmail.com>
Date: Thu, 14 Sep 2023 17:47:09 +0100
Subject: [PATCH] feat: remove `lodash-es` (#648)

Co-authored-by: Daniel Roe <daniel@roe.dev>
---
 package.json                                  |  5 +-
 pnpm-lock.yaml                                | 18 +++--
 src/colors.ts                                 |  3 +-
 src/runtime/components/data/Table.vue         | 20 +++++-
 src/runtime/components/elements/Accordion.vue |  2 +-
 src/runtime/components/elements/Alert.vue     |  2 +-
 src/runtime/components/elements/Avatar.vue    |  3 +-
 .../components/elements/AvatarGroup.ts        |  2 +-
 src/runtime/components/elements/Badge.vue     |  2 +-
 src/runtime/components/elements/Button.vue    |  2 +-
 .../components/elements/ButtonGroup.ts        |  2 +-
 src/runtime/components/elements/Dropdown.vue  |  2 +-
 src/runtime/components/elements/Kbd.vue       |  2 +-
 src/runtime/components/elements/Link.vue      |  2 +-
 src/runtime/components/forms/Checkbox.vue     |  2 +-
 src/runtime/components/forms/FormGroup.vue    |  2 +-
 src/runtime/components/forms/Input.vue        |  2 +-
 src/runtime/components/forms/Radio.vue        |  2 +-
 src/runtime/components/forms/Range.vue        |  2 +-
 src/runtime/components/forms/Select.vue       |  2 +-
 src/runtime/components/forms/SelectMenu.vue   |  2 +-
 src/runtime/components/forms/Textarea.vue     |  2 +-
 src/runtime/components/forms/Toggle.vue       |  2 +-
 src/runtime/components/layout/Card.vue        |  2 +-
 src/runtime/components/layout/Container.vue   |  2 +-
 src/runtime/components/layout/Skeleton.vue    |  2 +-
 .../components/navigation/CommandPalette.vue  | 48 +++++++++----
 .../components/navigation/Pagination.vue      |  2 +-
 src/runtime/components/navigation/Tabs.vue    |  2 +-
 .../navigation/VerticalNavigation.vue         |  2 +-
 .../components/overlays/ContextMenu.vue       |  2 +-
 src/runtime/components/overlays/Modal.vue     |  2 +-
 .../components/overlays/Notification.vue      |  2 +-
 .../components/overlays/Notifications.vue     |  2 +-
 src/runtime/components/overlays/Popover.vue   |  2 +-
 src/runtime/components/overlays/Slideover.vue |  2 +-
 src/runtime/components/overlays/Tooltip.vue   |  2 +-
 src/runtime/composables/usePopper.ts          | 72 +++++++++++--------
 src/runtime/utils/lodash.ts                   | 33 +++++++++
 39 files changed, 173 insertions(+), 91 deletions(-)
 create mode 100644 src/runtime/utils/lodash.ts

diff --git a/package.json b/package.json
index 36a7d47e15..2ce6a1af3e 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,9 @@
     "@vueuse/integrations": "^10.4.1",
     "@vueuse/math": "^10.4.1",
     "defu": "^6.1.2",
+    "ohash": "^1.1.3",
+    "scule": "^1.0.0",
     "fuse.js": "^6.6.2",
-    "lodash-es": "^4.17.21",
     "tailwind-merge": "^1.14.0",
     "tailwindcss": "^3.3.3"
   },
@@ -70,4 +71,4 @@
       "nuxt-component-meta@0.5.3": "patches/nuxt-component-meta@0.5.3.patch"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 487e9a2266..184e1fd392 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -61,9 +61,12 @@ importers:
       fuse.js:
         specifier: ^6.6.2
         version: 6.6.2
-      lodash-es:
-        specifier: ^4.17.21
-        version: 4.17.21
+      ohash:
+        specifier: ^1.1.3
+        version: 1.1.3
+      scule:
+        specifier: ^1.0.0
+        version: 1.0.0
       tailwind-merge:
         specifier: ^1.14.0
         version: 1.14.0
@@ -2666,8 +2669,8 @@ packages:
       '@types/node': 20.5.7
     dev: true
 
-  /@types/lodash-es@4.17.8:
-    resolution: {integrity: sha512-euY3XQcZmIzSy7YH5+Unb3b2X12Wtk54YWINBvvGQ5SmMvwb11JQskGsfkH/5HXK77Kr8GF0wkVDIxzAisWtog==}
+  /@types/lodash-es@4.17.9:
+    resolution: {integrity: sha512-ZTcmhiI3NNU7dEvWLZJkzG6ao49zOIjEgIE0RgV7wbPxU0f2xT3VSAHw2gmst8swH6V0YkLRGp4qPlX/6I90MQ==}
     dependencies:
       '@types/lodash': 4.14.197
     dev: true
@@ -7476,6 +7479,7 @@ packages:
 
   /lodash-es@4.17.21:
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
+    dev: true
 
   /lodash._reinterpolate@3.0.0:
     resolution: {integrity: sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==}
@@ -8981,8 +8985,8 @@ packages:
   /nuxt-lodash@2.5.0(rollup@3.28.1):
     resolution: {integrity: sha512-nd7YrKzJH7kqMEwyAlwk0T8Fi/G1heAaWJENFm6SUIwYgR6AOigp/ryLya+JBEP+ZmGrJbIHq+mhWNdvKsLK7g==}
     dependencies:
-      '@nuxt/kit': 3.7.0(rollup@3.28.1)
-      '@types/lodash-es': 4.17.8
+      '@nuxt/kit': 3.7.1(rollup@3.28.1)
+      '@types/lodash-es': 4.17.9
       lodash-es: 4.17.21
     transitivePeerDependencies:
       - rollup
diff --git a/src/colors.ts b/src/colors.ts
index 4724f549d0..133c0c2804 100644
--- a/src/colors.ts
+++ b/src/colors.ts
@@ -1,4 +1,5 @@
-import { omit, kebabCase, camelCase, upperFirst } from 'lodash-es'
+import { omit } from './runtime/utils/lodash'
+import { kebabCase, camelCase, upperFirst } from 'scule'
 
 const colorsToExclude = [
   'inherit',
diff --git a/src/runtime/components/data/Table.vue b/src/runtime/components/data/Table.vue
index e63143bb00..6d1b5b56ef 100644
--- a/src/runtime/components/data/Table.vue
+++ b/src/runtime/components/data/Table.vue
@@ -69,9 +69,10 @@
 <script lang="ts">
 import { ref, computed, defineComponent, toRaw } from 'vue'
 import type { PropType } from 'vue'
-import { omit, capitalize, orderBy, get } from 'lodash-es'
+import { upperFirst } from 'scule'
 import { defu } from 'defu'
 import { twMerge } from 'tailwind-merge'
+import { omit, get } from '../../utils/lodash'
 import { defuTwMerge } from '../../utils'
 import UButton from '../elements/Button.vue'
 import UIcon from '../elements/Icon.vue'
@@ -158,7 +159,7 @@ export default defineComponent({
 
     const wrapperClass = computed(() => twMerge(ui.value.wrapper, attrs.class as string))
 
-    const columns = computed(() => props.columns ?? Object.keys(omit(props.rows[0] ?? {}, ['click'])).map((key) => ({ key, label: capitalize(key), sortable: false })))
+    const columns = computed(() => props.columns ?? Object.keys(omit(props.rows[0] ?? {}, ['click'])).map((key) => ({ key, label: upperFirst(key), sortable: false })))
 
     const sort = ref(defu({}, props.sort, { column: null, direction: 'asc' }))
 
@@ -169,7 +170,20 @@ export default defineComponent({
 
       const { column, direction } = sort.value
 
-      return orderBy(props.rows, column, direction)
+      return props.rows.slice().sort((a, b) => {
+        const aValue = a[column]
+        const bValue = b[column]
+
+        if (aValue === bValue) {
+          return 0
+        }
+
+        if (direction === 'asc') {
+          return aValue < bValue ? -1 : 1
+        } else {
+          return aValue > bValue ? -1 : 1
+        }
+      })
     })
 
     const selected = computed({
diff --git a/src/runtime/components/elements/Accordion.vue b/src/runtime/components/elements/Accordion.vue
index ba3aa5734e..76a7b05dc2 100644
--- a/src/runtime/components/elements/Accordion.vue
+++ b/src/runtime/components/elements/Accordion.vue
@@ -43,7 +43,7 @@
 import { ref, computed, defineComponent } from 'vue'
 import type { PropType } from 'vue'
 import { Disclosure as HDisclosure, DisclosureButton as HDisclosureButton, DisclosurePanel as HDisclosurePanel } from '@headlessui/vue'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge } from 'tailwind-merge'
 import UIcon from '../elements/Icon.vue'
 import UButton from '../elements/Button.vue'
diff --git a/src/runtime/components/elements/Alert.vue b/src/runtime/components/elements/Alert.vue
index 27e4cf0019..ecd8812cbf 100644
--- a/src/runtime/components/elements/Alert.vue
+++ b/src/runtime/components/elements/Alert.vue
@@ -45,7 +45,7 @@ import { useAppConfig } from '#imports'
 // TODO: Remove
 // @ts-expect-error
 import appConfig from '#build/app.config'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 
 // const appConfig = useAppConfig()
 
diff --git a/src/runtime/components/elements/Avatar.vue b/src/runtime/components/elements/Avatar.vue
index 97f86a124f..0f0de78ace 100644
--- a/src/runtime/components/elements/Avatar.vue
+++ b/src/runtime/components/elements/Avatar.vue
@@ -29,8 +29,7 @@ import { useAppConfig } from '#imports'
 // TODO: Remove
 // @ts-expect-error
 import appConfig from '#build/app.config'
-import { omit } from 'lodash-es'
-
+import { omit } from '../../utils/lodash'
 // const appConfig = useAppConfig()
 
 export default defineComponent({
diff --git a/src/runtime/components/elements/AvatarGroup.ts b/src/runtime/components/elements/AvatarGroup.ts
index 0ec76d68d5..d0bd1ebe36 100644
--- a/src/runtime/components/elements/AvatarGroup.ts
+++ b/src/runtime/components/elements/AvatarGroup.ts
@@ -1,6 +1,6 @@
 import { h, cloneVNode, computed, defineComponent } from 'vue'
 import type { PropType } from 'vue'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge, twJoin } from 'tailwind-merge'
 import { defuTwMerge, getSlotsChildren } from '../../utils'
 import Avatar from './Avatar.vue'
diff --git a/src/runtime/components/elements/Badge.vue b/src/runtime/components/elements/Badge.vue
index 81c66ea146..26c7128805 100644
--- a/src/runtime/components/elements/Badge.vue
+++ b/src/runtime/components/elements/Badge.vue
@@ -7,7 +7,7 @@
 <script lang="ts">
 import { computed, defineComponent } from 'vue'
 import type { PropType } from 'vue'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge, twJoin } from 'tailwind-merge'
 import { defuTwMerge } from '../../utils'
 import { useAppConfig } from '#imports'
diff --git a/src/runtime/components/elements/Button.vue b/src/runtime/components/elements/Button.vue
index f670cc7c80..09ced47cc1 100644
--- a/src/runtime/components/elements/Button.vue
+++ b/src/runtime/components/elements/Button.vue
@@ -19,7 +19,7 @@
 <script lang="ts">
 import { computed, defineComponent } from 'vue'
 import type { PropType } from 'vue'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge, twJoin } from 'tailwind-merge'
 import UIcon from '../elements/Icon.vue'
 import ULink from '../elements/Link.vue'
diff --git a/src/runtime/components/elements/ButtonGroup.ts b/src/runtime/components/elements/ButtonGroup.ts
index 928061a3d1..edf3786044 100644
--- a/src/runtime/components/elements/ButtonGroup.ts
+++ b/src/runtime/components/elements/ButtonGroup.ts
@@ -1,6 +1,6 @@
 import { h, cloneVNode, computed, defineComponent } from 'vue'
 import type { PropType } from 'vue'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge, twJoin } from 'tailwind-merge'
 import { defuTwMerge, getSlotsChildren } from '../../utils'
 import { useAppConfig } from '#imports'
diff --git a/src/runtime/components/elements/Dropdown.vue b/src/runtime/components/elements/Dropdown.vue
index 5de4cbe184..a5c22ee585 100644
--- a/src/runtime/components/elements/Dropdown.vue
+++ b/src/runtime/components/elements/Dropdown.vue
@@ -49,7 +49,7 @@ import { defineComponent, ref, computed, onMounted } from 'vue'
 import type { PropType } from 'vue'
 import { Menu as HMenu, MenuButton as HMenuButton, MenuItems as HMenuItems, MenuItem as HMenuItem } from '@headlessui/vue'
 import { defu } from 'defu'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge } from 'tailwind-merge'
 import UIcon from '../elements/Icon.vue'
 import UAvatar from '../elements/Avatar.vue'
diff --git a/src/runtime/components/elements/Kbd.vue b/src/runtime/components/elements/Kbd.vue
index 3321d6177d..a8946653d1 100644
--- a/src/runtime/components/elements/Kbd.vue
+++ b/src/runtime/components/elements/Kbd.vue
@@ -7,7 +7,7 @@
 <script lang="ts">
 import { defineComponent, computed } from 'vue'
 import type { PropType } from 'vue'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge, twJoin } from 'tailwind-merge'
 import { defuTwMerge } from '../../utils'
 import { useAppConfig } from '#imports'
diff --git a/src/runtime/components/elements/Link.vue b/src/runtime/components/elements/Link.vue
index 2a98f21ed0..f583a555b8 100644
--- a/src/runtime/components/elements/Link.vue
+++ b/src/runtime/components/elements/Link.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script lang="ts">
-import { isEqual } from 'lodash-es'
+import { isEqual } from 'ohash'
 import { defineComponent } from 'vue'
 import { NuxtLink } from '#components'
 
diff --git a/src/runtime/components/forms/Checkbox.vue b/src/runtime/components/forms/Checkbox.vue
index 832a3fa082..865b9e05e8 100644
--- a/src/runtime/components/forms/Checkbox.vue
+++ b/src/runtime/components/forms/Checkbox.vue
@@ -32,7 +32,7 @@
 <script lang="ts">
 import { computed, defineComponent } from 'vue'
 import type { PropType } from 'vue'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge, twJoin } from 'tailwind-merge'
 import { defuTwMerge } from '../../utils'
 import { useFormGroup } from '../../composables/useFormGroup'
diff --git a/src/runtime/components/forms/FormGroup.vue b/src/runtime/components/forms/FormGroup.vue
index e03478a32d..baf0b62e33 100644
--- a/src/runtime/components/forms/FormGroup.vue
+++ b/src/runtime/components/forms/FormGroup.vue
@@ -21,7 +21,7 @@
 <script lang="ts">
 import { computed, defineComponent, provide, inject } from 'vue'
 import type { PropType } from 'vue'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge } from 'tailwind-merge'
 import type { FormError } from '../../types/form'
 import { defuTwMerge } from '../../utils'
diff --git a/src/runtime/components/forms/Input.vue b/src/runtime/components/forms/Input.vue
index b917f8299f..197f04a891 100644
--- a/src/runtime/components/forms/Input.vue
+++ b/src/runtime/components/forms/Input.vue
@@ -33,7 +33,7 @@
 <script lang="ts">
 import { ref, computed, onMounted, defineComponent } from 'vue'
 import type { PropType } from 'vue'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge, twJoin } from 'tailwind-merge'
 import UIcon from '../elements/Icon.vue'
 import { defuTwMerge } from '../../utils'
diff --git a/src/runtime/components/forms/Radio.vue b/src/runtime/components/forms/Radio.vue
index fb1a68de19..7dd966ab4f 100644
--- a/src/runtime/components/forms/Radio.vue
+++ b/src/runtime/components/forms/Radio.vue
@@ -29,7 +29,7 @@
 <script lang="ts">
 import { computed, defineComponent } from 'vue'
 import type { PropType } from 'vue'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge, twJoin } from 'tailwind-merge'
 import { defuTwMerge } from '../../utils'
 import { useFormGroup } from '../../composables/useFormGroup'
diff --git a/src/runtime/components/forms/Range.vue b/src/runtime/components/forms/Range.vue
index 845ce1266a..b8ae37f59d 100644
--- a/src/runtime/components/forms/Range.vue
+++ b/src/runtime/components/forms/Range.vue
@@ -21,7 +21,7 @@
 <script lang="ts">
 import { computed, defineComponent } from 'vue'
 import type { PropType } from 'vue'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge, twJoin } from 'tailwind-merge'
 import { defuTwMerge } from '../../utils'
 import { useFormGroup } from '../../composables/useFormGroup'
diff --git a/src/runtime/components/forms/Select.vue b/src/runtime/components/forms/Select.vue
index dcc19c29d6..a19e76adc2 100644
--- a/src/runtime/components/forms/Select.vue
+++ b/src/runtime/components/forms/Select.vue
@@ -55,7 +55,7 @@
 <script lang="ts">
 import { computed, defineComponent } from 'vue'
 import type { PropType, ComputedRef } from 'vue'
-import { get, omit } from 'lodash-es'
+import { get, omit } from '../../utils/lodash'
 import { twMerge, twJoin } from 'tailwind-merge'
 import UIcon from '../elements/Icon.vue'
 import { defuTwMerge } from '../../utils'
diff --git a/src/runtime/components/forms/SelectMenu.vue b/src/runtime/components/forms/SelectMenu.vue
index 36db0b0582..ebb6f7a28d 100644
--- a/src/runtime/components/forms/SelectMenu.vue
+++ b/src/runtime/components/forms/SelectMenu.vue
@@ -131,7 +131,7 @@ import {
 } from '@headlessui/vue'
 import { computedAsync, useDebounceFn } from '@vueuse/core'
 import { defu } from 'defu'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge, twJoin } from 'tailwind-merge'
 import UIcon from '../elements/Icon.vue'
 import UAvatar from '../elements/Avatar.vue'
diff --git a/src/runtime/components/forms/Textarea.vue b/src/runtime/components/forms/Textarea.vue
index 98eb9afaf3..48e617886d 100644
--- a/src/runtime/components/forms/Textarea.vue
+++ b/src/runtime/components/forms/Textarea.vue
@@ -20,7 +20,7 @@
 <script lang="ts">
 import { ref, computed, watch, onMounted, nextTick, defineComponent } from 'vue'
 import type { PropType } from 'vue'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge, twJoin } from 'tailwind-merge'
 import { defuTwMerge } from '../../utils'
 import { useFormGroup } from '../../composables/useFormGroup'
diff --git a/src/runtime/components/forms/Toggle.vue b/src/runtime/components/forms/Toggle.vue
index 08dc1fbe30..acb3050393 100644
--- a/src/runtime/components/forms/Toggle.vue
+++ b/src/runtime/components/forms/Toggle.vue
@@ -21,7 +21,7 @@
 import { computed, defineComponent } from 'vue'
 import type { PropType } from 'vue'
 import { Switch as HSwitch } from '@headlessui/vue'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge, twJoin } from 'tailwind-merge'
 import UIcon from '../elements/Icon.vue'
 import { defuTwMerge } from '../../utils'
diff --git a/src/runtime/components/layout/Card.vue b/src/runtime/components/layout/Card.vue
index 622ca65db0..419fd574b1 100644
--- a/src/runtime/components/layout/Card.vue
+++ b/src/runtime/components/layout/Card.vue
@@ -19,7 +19,7 @@
 <script lang="ts">
 import { computed, defineComponent } from 'vue'
 import type { PropType } from 'vue'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge, twJoin } from 'tailwind-merge'
 import { defuTwMerge } from '../../utils'
 import { useAppConfig } from '#imports'
diff --git a/src/runtime/components/layout/Container.vue b/src/runtime/components/layout/Container.vue
index 4cae0d82c1..ad79418729 100644
--- a/src/runtime/components/layout/Container.vue
+++ b/src/runtime/components/layout/Container.vue
@@ -7,7 +7,7 @@
 <script lang="ts">
 import { computed, defineComponent } from 'vue'
 import type { PropType } from 'vue'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge, twJoin } from 'tailwind-merge'
 import { defuTwMerge } from '../../utils'
 import { useAppConfig } from '#imports'
diff --git a/src/runtime/components/layout/Skeleton.vue b/src/runtime/components/layout/Skeleton.vue
index b6234af0d9..b18e3f06f8 100644
--- a/src/runtime/components/layout/Skeleton.vue
+++ b/src/runtime/components/layout/Skeleton.vue
@@ -5,7 +5,7 @@
 <script lang="ts">
 import { computed, defineComponent } from 'vue'
 import type { PropType } from 'vue'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge, twJoin } from 'tailwind-merge'
 import { defuTwMerge } from '../../utils'
 import { useAppConfig } from '#imports'
diff --git a/src/runtime/components/navigation/CommandPalette.vue b/src/runtime/components/navigation/CommandPalette.vue
index 2f29eff2e6..bf9905de7c 100644
--- a/src/runtime/components/navigation/CommandPalette.vue
+++ b/src/runtime/components/navigation/CommandPalette.vue
@@ -68,7 +68,7 @@ import type { ComputedRef, PropType, ComponentPublicInstance } from 'vue'
 import { useDebounceFn } from '@vueuse/core'
 import { useFuse } from '@vueuse/integrations/useFuse'
 import { twMerge, twJoin } from 'tailwind-merge'
-import { groupBy, map, omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { defu } from 'defu'
 import type { UseFuseOptions } from '@vueuse/integrations/useFuse'
 import type { Group, Command } from '../../types/command-palette'
@@ -214,32 +214,50 @@ export default defineComponent({
       matchAllWhenSearchEmpty: true
     }))
 
-    const commands = computed(() => props.groups.filter(group => !group.search).reduce((acc, group) => {
-      return acc.concat(group.commands.map(command => ({ ...command, group: group.key })))
-    }, [] as Command[]))
+    const commands = computed(() => {
+      const commands: Command[] = []
+      for (const group of props.groups) {
+        if (!group.search) {
+          commands.push(...group.commands.map(command => ({ ...command, group: group.key })))
+        }
+      }
+      return commands
+    })
 
     const searchResults = ref<{ [key: string]: any }>({})
 
     const { results } = useFuse(query, commands, options)
 
-    const groups = computed(() => ([
-      ...map(groupBy(results.value, command => command.item.group), (results, key) => {
-        const commands = results.map((result) => {
+    const groups = computed(() => {
+      const groups: Group[] = []
+
+      const groupedCommands: Record<string, typeof results['value']> = {}
+      for (const command of results.value) {
+        groupedCommands[command.item.group] ||= []
+        groupedCommands[command.item.group].push(command)
+      }
+      for (const key in groupedCommands) {
+        const group = props.groups.find(group => group.key === key)
+        const commands = groupedCommands[key].slice(0, options.value.resultLimit).map((result) => {
           const { item, ...data } = result
 
           return {
             ...item,
             ...data
-          }
+          } as Command
         })
 
-        return {
-          ...props.groups.find(group => group.key === key),
-          commands: commands.slice(0, options.value.resultLimit)
-        } as Group
-      }),
-      ...props.groups.filter(group => !!group.search).map(group => ({ ...group, commands: (searchResults.value[group.key] || []).slice(0, options.value.resultLimit) })).filter(group => group.commands.length)
-    ]))
+        groups.push({ ...group, commands })
+      }
+
+      for (const group of props.groups) {
+        if (group.search && searchResults.value[group.key]?.length) {
+          groups.push({ ...group, commands: (searchResults.value[group.key] || []).slice(0, options.value.resultLimit) })
+        }
+      }
+
+      return groups
+    })
 
     const debouncedSearch = useDebounceFn(async () => {
       const searchableGroups = props.groups.filter(group => !!group.search)
diff --git a/src/runtime/components/navigation/Pagination.vue b/src/runtime/components/navigation/Pagination.vue
index 02a76e0b63..f0747fbcd1 100644
--- a/src/runtime/components/navigation/Pagination.vue
+++ b/src/runtime/components/navigation/Pagination.vue
@@ -42,7 +42,7 @@
 <script lang="ts">
 import { computed, defineComponent } from 'vue'
 import type { PropType } from 'vue'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge } from 'tailwind-merge'
 import UButton from '../elements/Button.vue'
 import { defuTwMerge } from '../../utils'
diff --git a/src/runtime/components/navigation/Tabs.vue b/src/runtime/components/navigation/Tabs.vue
index 8e8becbea0..9de4321e7b 100644
--- a/src/runtime/components/navigation/Tabs.vue
+++ b/src/runtime/components/navigation/Tabs.vue
@@ -52,7 +52,7 @@ import { ref, computed, watch, onMounted, defineComponent } from 'vue'
 import type { PropType } from 'vue'
 import { TabGroup as HTabGroup, TabList as HTabList, Tab as HTab, TabPanels as HTabPanels, TabPanel as HTabPanel } from '@headlessui/vue'
 import { useResizeObserver } from '@vueuse/core'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge } from 'tailwind-merge'
 import { defuTwMerge } from '../../utils'
 import type { TabItem } from '../../types/tabs'
diff --git a/src/runtime/components/navigation/VerticalNavigation.vue b/src/runtime/components/navigation/VerticalNavigation.vue
index 6855cd0fa2..3d49a75bcb 100644
--- a/src/runtime/components/navigation/VerticalNavigation.vue
+++ b/src/runtime/components/navigation/VerticalNavigation.vue
@@ -40,7 +40,7 @@
 <script lang="ts">
 import { computed, defineComponent } from 'vue'
 import type { PropType } from 'vue'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge } from 'tailwind-merge'
 import UIcon from '../elements/Icon.vue'
 import UAvatar from '../elements/Avatar.vue'
diff --git a/src/runtime/components/overlays/ContextMenu.vue b/src/runtime/components/overlays/ContextMenu.vue
index 0ce3685715..4f6b7dab32 100644
--- a/src/runtime/components/overlays/ContextMenu.vue
+++ b/src/runtime/components/overlays/ContextMenu.vue
@@ -14,7 +14,7 @@ import type { PropType, Ref } from 'vue'
 import { defu } from 'defu'
 import { onClickOutside } from '@vueuse/core'
 import type { VirtualElement } from '@popperjs/core'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge, twJoin } from 'tailwind-merge'
 import { usePopper } from '../../composables/usePopper'
 import { defuTwMerge } from '../../utils'
diff --git a/src/runtime/components/overlays/Modal.vue b/src/runtime/components/overlays/Modal.vue
index 0e1308602c..0c874cb607 100644
--- a/src/runtime/components/overlays/Modal.vue
+++ b/src/runtime/components/overlays/Modal.vue
@@ -32,7 +32,7 @@
 <script lang="ts">
 import { computed, defineComponent } from 'vue'
 import type { PropType } from 'vue'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge } from 'tailwind-merge'
 import { Dialog as HDialog, DialogPanel as HDialogPanel, TransitionRoot, TransitionChild } from '@headlessui/vue'
 import { defuTwMerge } from '../../utils'
diff --git a/src/runtime/components/overlays/Notification.vue b/src/runtime/components/overlays/Notification.vue
index 07920f6b2f..da7dbb2beb 100644
--- a/src/runtime/components/overlays/Notification.vue
+++ b/src/runtime/components/overlays/Notification.vue
@@ -41,7 +41,7 @@
 <script lang="ts">
 import { ref, computed, onMounted, onUnmounted, watchEffect, defineComponent } from 'vue'
 import type { PropType } from 'vue'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge, twJoin } from 'tailwind-merge'
 import UIcon from '../elements/Icon.vue'
 import UAvatar from '../elements/Avatar.vue'
diff --git a/src/runtime/components/overlays/Notifications.vue b/src/runtime/components/overlays/Notifications.vue
index 8ffb5f7184..50e43bf141 100644
--- a/src/runtime/components/overlays/Notifications.vue
+++ b/src/runtime/components/overlays/Notifications.vue
@@ -20,7 +20,7 @@
 <script lang="ts">
 import { computed, defineComponent } from 'vue'
 import type { PropType } from 'vue'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge, twJoin } from 'tailwind-merge'
 import UNotification from './Notification.vue'
 import { useToast } from '../../composables/useToast'
diff --git a/src/runtime/components/overlays/Popover.vue b/src/runtime/components/overlays/Popover.vue
index bfc21cd7a7..cedaf098d1 100644
--- a/src/runtime/components/overlays/Popover.vue
+++ b/src/runtime/components/overlays/Popover.vue
@@ -29,7 +29,7 @@
 import { computed, ref, onMounted, defineComponent } from 'vue'
 import type { PropType } from 'vue'
 import { defu } from 'defu'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge } from 'tailwind-merge'
 import { Popover as HPopover, PopoverButton as HPopoverButton, PopoverPanel as HPopoverPanel } from '@headlessui/vue'
 import { usePopper } from '../../composables/usePopper'
diff --git a/src/runtime/components/overlays/Slideover.vue b/src/runtime/components/overlays/Slideover.vue
index 294a4b56f1..06772b3f48 100644
--- a/src/runtime/components/overlays/Slideover.vue
+++ b/src/runtime/components/overlays/Slideover.vue
@@ -18,7 +18,7 @@
 import { computed, defineComponent } from 'vue'
 import type { WritableComputedRef, PropType } from 'vue'
 import { Dialog as HDialog, DialogPanel as HDialogPanel, TransitionRoot, TransitionChild } from '@headlessui/vue'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge } from 'tailwind-merge'
 import { defuTwMerge } from '../../utils'
 import { useAppConfig } from '#imports'
diff --git a/src/runtime/components/overlays/Tooltip.vue b/src/runtime/components/overlays/Tooltip.vue
index f34d3528af..01ff38afb7 100644
--- a/src/runtime/components/overlays/Tooltip.vue
+++ b/src/runtime/components/overlays/Tooltip.vue
@@ -27,7 +27,7 @@
 import { computed, ref, defineComponent } from 'vue'
 import type { PropType } from 'vue'
 import { defu } from 'defu'
-import { omit } from 'lodash-es'
+import { omit } from '../../utils/lodash'
 import { twMerge } from 'tailwind-merge'
 import UKbd from '../elements/Kbd.vue'
 import { usePopper } from '../../composables/usePopper'
diff --git a/src/runtime/composables/usePopper.ts b/src/runtime/composables/usePopper.ts
index ea55b47f47..7ec2fe44e4 100644
--- a/src/runtime/composables/usePopper.ts
+++ b/src/runtime/composables/usePopper.ts
@@ -2,7 +2,6 @@ import { ref, onMounted, watchEffect } from 'vue'
 import type { Ref } from 'vue'
 import { popperGenerator, defaultModifiers, VirtualElement } from '@popperjs/core/lib/popper-lite'
 import type { Instance } from '@popperjs/core'
-import { omitBy, isUndefined } from 'lodash-es'
 import flip from '@popperjs/core/lib/modifiers/flip'
 import offset from '@popperjs/core/lib/modifiers/offset'
 import preventOverflow from '@popperjs/core/lib/modifiers/preventOverflow'
@@ -43,36 +42,49 @@ export function usePopper ({
       if (!(popperEl instanceof HTMLElement)) { return }
       if (!referenceEl) { return }
 
-      instance.value = createPopper(referenceEl, popperEl, omitBy({
-        placement,
-        strategy,
-        modifiers: [{
-          name: 'flip',
-          enabled: !locked
-        }, {
-          name: 'preventOverflow',
-          options: {
-            padding: overflowPadding
+      const config: Record<string, any> = {
+        modifiers: [
+          {
+            name: 'flip',
+            enabled: !locked
+          },
+          {
+            name: 'preventOverflow',
+            options: {
+              padding: overflowPadding
+            }
+          },
+          {
+            name: 'offset',
+            options: {
+              offset: [offsetSkid, offsetDistance]
+            }
+          },
+          {
+            name: 'computeStyles',
+            options: {
+              adaptive,
+              gpuAcceleration
+            }
+          },
+          {
+            name: 'eventListeners',
+            options: {
+              scroll,
+              resize
+            }
           }
-        }, {
-          name: 'offset',
-          options: {
-            offset: [offsetSkid, offsetDistance]
-          }
-        }, {
-          name: 'computeStyles',
-          options: {
-            adaptive,
-            gpuAcceleration
-          }
-        }, {
-          name: 'eventListeners',
-          options: {
-            scroll,
-            resize
-          }
-        }]
-      }, isUndefined))
+        ]
+      }
+
+      if (placement) {
+        config.placement = placement
+      }
+      if (strategy) {
+        config.strategy = strategy
+      }
+
+      instance.value = createPopper(referenceEl, popperEl, config)
 
       onInvalidate(instance.value.destroy)
     })
diff --git a/src/runtime/utils/lodash.ts b/src/runtime/utils/lodash.ts
new file mode 100644
index 0000000000..1a3c2646ab
--- /dev/null
+++ b/src/runtime/utils/lodash.ts
@@ -0,0 +1,33 @@
+export function omit<T extends Record<string, any>, K extends keyof T> (
+  object: T,
+  keysToOmit: K[] | any[]
+): Pick<T, Exclude<keyof T, K>> {
+  const result = { ...object }
+
+  for (const key of keysToOmit) {
+    delete result[key]
+  }
+
+  return result
+}
+
+export function get (object: Record<string, any>, path: (string | number)[] | string, defaultValue?: any): any {
+  if (typeof path === 'string') {
+    path = path.split('.').map(key => {
+      const numKey = Number(key)
+      return isNaN(numKey) ? key : numKey
+    })
+  }
+
+  let result: any = object
+
+  for (const key of path) {
+    if (result === undefined || result === null) {
+      return defaultValue
+    }
+
+    result = result[key]
+  }
+
+  return result !== undefined ? result : defaultValue
+}