diff --git a/components.json b/components.json index 90f5d46d..5e3012e5 100644 --- a/components.json +++ b/components.json @@ -1,20 +1,20 @@ { - "$schema": "https://shadcn-vue.com/schema.json", - "style": "default", - "typescript": true, - "tailwind": { - "config": "tailwind.config.js", - "css": "resources/css/app.css", - "baseColor": "neutral", - "cssVariables": true, - "prefix": "" - }, - "aliases": { - "components": "@/components", - "composables": "@/composables", - "utils": "@/lib/utils", - "ui": "@/components/ui", - "lib": "@/lib" - }, - "iconLibrary": "lucide" + "$schema": "https://shadcn-vue.com/schema.json", + "style": "default", + "typescript": true, + "tailwind": { + "config": "tailwind.config.js", + "css": "resources/css/app.css", + "baseColor": "neutral", + "cssVariables": true, + "prefix": "" + }, + "aliases": { + "components": "@/components", + "composables": "@/composables", + "utils": "@/lib/utils", + "ui": "@/components/ui", + "lib": "@/lib" + }, + "iconLibrary": "lucide" } diff --git a/package-lock.json b/package-lock.json index 524714a8..5dbfd1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "laravel-vite-plugin": "^1.0", "lucide": "^0.468.0", "lucide-vue-next": "^0.468.0", - "radix-vue": "^1.9.11", + "reka-ui": "^2.0.0", "tailwind-merge": "^2.5.5", "tailwindcss": "^3.4.1", "tailwindcss-animate": "^1.0.7", @@ -2774,6 +2774,7 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, "license": "MIT" }, "node_modules/fast-glob": { @@ -3658,6 +3659,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/ohash": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/ohash/-/ohash-1.1.4.tgz", + "integrity": "sha512-FlDryZAahJmEF3VR3w1KogSEdWX3WhA5GPakFx4J81kEAiHyLMpdLLElS8n8dfNadMgAne/MywcvmogzscVt4g==", + "license": "MIT" + }, "node_modules/optionator": { "version": "0.9.4", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", @@ -4127,134 +4134,6 @@ ], "license": "MIT" }, - "node_modules/radix-vue": { - "version": "1.9.17", - "resolved": "https://registry.npmjs.org/radix-vue/-/radix-vue-1.9.17.tgz", - "integrity": "sha512-mVCu7I2vXt1L2IUYHTt0sZMz7s1K2ZtqKeTIxG3yC5mMFfLBG4FtE1FDeRMpDd+Hhg/ybi9+iXmAP1ISREndoQ==", - "license": "MIT", - "dependencies": { - "@floating-ui/dom": "^1.6.7", - "@floating-ui/vue": "^1.1.0", - "@internationalized/date": "^3.5.4", - "@internationalized/number": "^3.5.3", - "@tanstack/vue-virtual": "^3.8.1", - "@vueuse/core": "^10.11.0", - "@vueuse/shared": "^10.11.0", - "aria-hidden": "^1.2.4", - "defu": "^6.1.4", - "fast-deep-equal": "^3.1.3", - "nanoid": "^5.0.7" - }, - "peerDependencies": { - "vue": ">= 3.2.0" - } - }, - "node_modules/radix-vue/node_modules/@vueuse/core": { - "version": "10.11.1", - "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-10.11.1.tgz", - "integrity": "sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==", - "license": "MIT", - "dependencies": { - "@types/web-bluetooth": "^0.0.20", - "@vueuse/metadata": "10.11.1", - "@vueuse/shared": "10.11.1", - "vue-demi": ">=0.14.8" - }, - "funding": { - "url": "https://github.com/sponsors/antfu" - } - }, - "node_modules/radix-vue/node_modules/@vueuse/core/node_modules/vue-demi": { - "version": "0.14.10", - "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz", - "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==", - "hasInstallScript": true, - "license": "MIT", - "bin": { - "vue-demi-fix": "bin/vue-demi-fix.js", - "vue-demi-switch": "bin/vue-demi-switch.js" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/antfu" - }, - "peerDependencies": { - "@vue/composition-api": "^1.0.0-rc.1", - "vue": "^3.0.0-0 || ^2.6.0" - }, - "peerDependenciesMeta": { - "@vue/composition-api": { - "optional": true - } - } - }, - "node_modules/radix-vue/node_modules/@vueuse/metadata": { - "version": "10.11.1", - "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.11.1.tgz", - "integrity": "sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw==", - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/antfu" - } - }, - "node_modules/radix-vue/node_modules/@vueuse/shared": { - "version": "10.11.1", - "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-10.11.1.tgz", - "integrity": "sha512-LHpC8711VFZlDaYUXEBbFBCQ7GS3dVU9mjOhhMhXP6txTV4EhYQg/KGnQuvt/sPAtoUKq7VVUnL6mVtFoL42sA==", - "license": "MIT", - "dependencies": { - "vue-demi": ">=0.14.8" - }, - "funding": { - "url": "https://github.com/sponsors/antfu" - } - }, - "node_modules/radix-vue/node_modules/@vueuse/shared/node_modules/vue-demi": { - "version": "0.14.10", - "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz", - "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==", - "hasInstallScript": true, - "license": "MIT", - "bin": { - "vue-demi-fix": "bin/vue-demi-fix.js", - "vue-demi-switch": "bin/vue-demi-switch.js" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/antfu" - }, - "peerDependencies": { - "@vue/composition-api": "^1.0.0-rc.1", - "vue": "^3.0.0-0 || ^2.6.0" - }, - "peerDependenciesMeta": { - "@vue/composition-api": { - "optional": true - } - } - }, - "node_modules/radix-vue/node_modules/nanoid": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.2.tgz", - "integrity": "sha512-b+CiXQCNMUGe0Ri64S9SXFcP9hogjAJ2Rd6GdVxhPLRm7mhGaM7VgOvCAJ1ZshfHbqVDI3uqTI5C8/GaKuLI7g==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "bin": { - "nanoid": "bin/nanoid.js" - }, - "engines": { - "node": "^18 || >=20" - } - }, "node_modules/read-cache": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", @@ -4276,6 +4155,27 @@ "node": ">=8.10.0" } }, + "node_modules/reka-ui": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.0.0.tgz", + "integrity": "sha512-/1amDDvTnDIkSFbTZnUkiFWkxlc/UEe0pZsgvz3nDI15R9+yspQv/gIbM62Mo9LALK6A76NsgMNlXie04kv7PA==", + "license": "MIT", + "dependencies": { + "@floating-ui/dom": "^1.6.13", + "@floating-ui/vue": "^1.1.6", + "@internationalized/date": "^3.5.0", + "@internationalized/number": "^3.5.0", + "@tanstack/vue-virtual": "^3.12.0", + "@vueuse/core": "^12.5.0", + "@vueuse/shared": "^12.5.0", + "aria-hidden": "^1.2.4", + "defu": "^6.1.4", + "ohash": "^1.1.4" + }, + "peerDependencies": { + "vue": ">= 3.2.0" + } + }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", diff --git a/package.json b/package.json index b6b68f3a..1687c244 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "laravel-vite-plugin": "^1.0", "lucide": "^0.468.0", "lucide-vue-next": "^0.468.0", - "radix-vue": "^1.9.11", + "reka-ui": "^2.0.0", "tailwind-merge": "^2.5.5", "tailwindcss": "^3.4.1", "tailwindcss-animate": "^1.0.7", diff --git a/resources/js/components/NavUser.vue b/resources/js/components/NavUser.vue index 65dff773..ce6ec676 100644 --- a/resources/js/components/NavUser.vue +++ b/resources/js/components/NavUser.vue @@ -23,7 +23,7 @@ const { isMobile, state } = useSidebar(); import { cn } from '@/lib/utils'; -import { AvatarRoot } from 'radix-vue'; +import { AvatarRoot } from 'reka-ui'; import type { HTMLAttributes } from 'vue'; import { avatarVariant, type AvatarVariants } from '.'; diff --git a/resources/js/components/ui/avatar/AvatarFallback.vue b/resources/js/components/ui/avatar/AvatarFallback.vue index 02d65e18..b65809ab 100644 --- a/resources/js/components/ui/avatar/AvatarFallback.vue +++ b/resources/js/components/ui/avatar/AvatarFallback.vue @@ -1,5 +1,5 @@ diff --git a/resources/js/components/ui/avatar/AvatarImage.vue b/resources/js/components/ui/avatar/AvatarImage.vue index e2c75ed6..1b72e764 100644 --- a/resources/js/components/ui/avatar/AvatarImage.vue +++ b/resources/js/components/ui/avatar/AvatarImage.vue @@ -1,5 +1,5 @@ diff --git a/resources/js/components/ui/breadcrumb/BreadcrumbLink.vue b/resources/js/components/ui/breadcrumb/BreadcrumbLink.vue index 2612d6d7..beb32ecc 100644 --- a/resources/js/components/ui/breadcrumb/BreadcrumbLink.vue +++ b/resources/js/components/ui/breadcrumb/BreadcrumbLink.vue @@ -1,6 +1,6 @@ diff --git a/resources/js/components/ui/collapsible/CollapsibleTrigger.vue b/resources/js/components/ui/collapsible/CollapsibleTrigger.vue index 83cb10e5..dc9fa6e2 100644 --- a/resources/js/components/ui/collapsible/CollapsibleTrigger.vue +++ b/resources/js/components/ui/collapsible/CollapsibleTrigger.vue @@ -1,5 +1,5 @@ diff --git a/resources/js/components/ui/dialog/Dialog.vue b/resources/js/components/ui/dialog/Dialog.vue index 490fff1a..5d52f1e4 100644 --- a/resources/js/components/ui/dialog/Dialog.vue +++ b/resources/js/components/ui/dialog/Dialog.vue @@ -1,5 +1,5 @@ diff --git a/resources/js/components/ui/dialog/DialogContent.vue b/resources/js/components/ui/dialog/DialogContent.vue index 9ee28b75..deb885d9 100644 --- a/resources/js/components/ui/dialog/DialogContent.vue +++ b/resources/js/components/ui/dialog/DialogContent.vue @@ -9,7 +9,7 @@ import { useForwardPropsEmits, type DialogContentEmits, type DialogContentProps, -} from 'radix-vue'; +} from 'reka-ui'; import { computed, type HTMLAttributes } from 'vue'; const props = defineProps(); diff --git a/resources/js/components/ui/dialog/DialogDescription.vue b/resources/js/components/ui/dialog/DialogDescription.vue index d35f13ae..22e43bb1 100644 --- a/resources/js/components/ui/dialog/DialogDescription.vue +++ b/resources/js/components/ui/dialog/DialogDescription.vue @@ -1,6 +1,6 @@ diff --git a/resources/js/components/ui/dropdown-menu/DropdownMenu.vue b/resources/js/components/ui/dropdown-menu/DropdownMenu.vue index e3cd9075..9a285514 100644 --- a/resources/js/components/ui/dropdown-menu/DropdownMenu.vue +++ b/resources/js/components/ui/dropdown-menu/DropdownMenu.vue @@ -1,5 +1,5 @@ diff --git a/resources/js/components/ui/dropdown-menu/DropdownMenuItem.vue b/resources/js/components/ui/dropdown-menu/DropdownMenuItem.vue index 76032a0d..5737f03d 100644 --- a/resources/js/components/ui/dropdown-menu/DropdownMenuItem.vue +++ b/resources/js/components/ui/dropdown-menu/DropdownMenuItem.vue @@ -1,6 +1,6 @@ diff --git a/resources/js/components/ui/navigation-menu/NavigationMenuLink.vue b/resources/js/components/ui/navigation-menu/NavigationMenuLink.vue index 30c91c61..037140f9 100644 --- a/resources/js/components/ui/navigation-menu/NavigationMenuLink.vue +++ b/resources/js/components/ui/navigation-menu/NavigationMenuLink.vue @@ -4,7 +4,7 @@ import { type NavigationMenuLinkEmits, type NavigationMenuLinkProps, useForwardPropsEmits, -} from 'radix-vue' +} from 'reka-ui' const props = defineProps() const emits = defineEmits() diff --git a/resources/js/components/ui/navigation-menu/NavigationMenuList.vue b/resources/js/components/ui/navigation-menu/NavigationMenuList.vue index 4cf0d10e..74d22dee 100644 --- a/resources/js/components/ui/navigation-menu/NavigationMenuList.vue +++ b/resources/js/components/ui/navigation-menu/NavigationMenuList.vue @@ -1,6 +1,6 @@ diff --git a/resources/js/components/ui/sheet/SheetContent.vue b/resources/js/components/ui/sheet/SheetContent.vue index 60c9552a..306d63a7 100644 --- a/resources/js/components/ui/sheet/SheetContent.vue +++ b/resources/js/components/ui/sheet/SheetContent.vue @@ -9,7 +9,7 @@ import { useForwardPropsEmits, type DialogContentEmits, type DialogContentProps, -} from 'radix-vue'; +} from 'reka-ui'; import { computed, type HTMLAttributes } from 'vue'; import { sheetVariants, type SheetVariants } from '.'; diff --git a/resources/js/components/ui/sheet/SheetDescription.vue b/resources/js/components/ui/sheet/SheetDescription.vue index 6b4bb9d7..d9b0c010 100644 --- a/resources/js/components/ui/sheet/SheetDescription.vue +++ b/resources/js/components/ui/sheet/SheetDescription.vue @@ -1,6 +1,6 @@ diff --git a/resources/js/components/ui/sidebar/Sidebar.vue b/resources/js/components/ui/sidebar/Sidebar.vue index 6a8946d0..21a2abd4 100644 --- a/resources/js/components/ui/sidebar/Sidebar.vue +++ b/resources/js/components/ui/sidebar/Sidebar.vue @@ -1,8 +1,7 @@ @@ -90,7 +82,7 @@ const { isMobile, state, openMobile, setOpenMobile } = useSidebar(); >
diff --git a/resources/js/components/ui/sidebar/SidebarGroupAction.vue b/resources/js/components/ui/sidebar/SidebarGroupAction.vue index 7a0ce815..46f5bfc2 100644 --- a/resources/js/components/ui/sidebar/SidebarGroupAction.vue +++ b/resources/js/components/ui/sidebar/SidebarGroupAction.vue @@ -1,7 +1,7 @@ diff --git a/resources/js/components/ui/tooltip/TooltipTrigger.vue b/resources/js/components/ui/tooltip/TooltipTrigger.vue index c4b0509d..cee6c986 100644 --- a/resources/js/components/ui/tooltip/TooltipTrigger.vue +++ b/resources/js/components/ui/tooltip/TooltipTrigger.vue @@ -1,5 +1,5 @@ diff --git a/resources/js/pages/auth/Login.vue b/resources/js/pages/auth/Login.vue index 0a4df71a..166caf9b 100644 --- a/resources/js/pages/auth/Login.vue +++ b/resources/js/pages/auth/Login.vue @@ -73,7 +73,7 @@ const submit = () => {