diff --git a/.github/workflows/ci-design-system-pack.yaml b/.github/workflows/ci-design-system-pack.yaml index b60f269a03d..502aa5d193f 100644 --- a/.github/workflows/ci-design-system-pack.yaml +++ b/.github/workflows/ci-design-system-pack.yaml @@ -38,6 +38,7 @@ jobs: and . != "LICENSE" and . != "README.md" and . != "src/workspaceAvatar.ts" + and . != "src/button.variants.ts" and (startswith("src/css/") | not) and (startswith("src/icons/") | not) ) diff --git a/packages/design-system/package.json b/packages/design-system/package.json index 0cdff10d3b5..4d1f3f30440 100644 --- a/packages/design-system/package.json +++ b/packages/design-system/package.json @@ -16,12 +16,14 @@ "files": [ "src/css", "src/icons", + "src/button.variants.ts", "src/workspaceAvatar.ts" ], "type": "module", "exports": { "./css/*": "./src/css/*", "./icons/*": "./src/icons/*", + "./button.variants": "./src/button.variants.ts", "./workspaceAvatar": "./src/workspaceAvatar.ts" }, "publishConfig": { @@ -36,6 +38,7 @@ "@iconify/tailwind4": "catalog:", "@iconify/tools": "catalog:", "@iconify/utils": "catalog:", + "cva": "catalog:", "tailwindcss-primeui": "catalog:", "tw-animate-css": "catalog:" }, diff --git a/src/components/ui/button/button.variants.ts b/packages/design-system/src/button.variants.ts similarity index 100% rename from src/components/ui/button/button.variants.ts rename to packages/design-system/src/button.variants.ts diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dc8d222b738..0378bde5297 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1336,6 +1336,9 @@ importers: '@iconify/utils': specifier: 'catalog:' version: 3.1.4 + cva: + specifier: 'catalog:' + version: 1.0.0-beta.4(typescript@6.0.3) tailwindcss-primeui: specifier: 'catalog:' version: 0.6.1(tailwindcss@4.3.2) diff --git a/src/components/common/DropdownMenu.vue b/src/components/common/DropdownMenu.vue index b873fedef3c..fae735d81ca 100644 --- a/src/components/common/DropdownMenu.vue +++ b/src/components/common/DropdownMenu.vue @@ -13,7 +13,7 @@ import DropdownItem from '@/components/common/DropdownItem.vue' import Button from '@/components/ui/button/Button.vue' import { useModalLiftedZIndex } from '@/composables/useModalLiftedZIndex' import { cn } from '@comfyorg/tailwind-utils' -import type { ButtonVariants } from '../ui/button/button.variants' +import type { ButtonVariants } from '@comfyorg/design-system/button.variants' defineOptions({ inheritAttrs: false diff --git a/src/components/common/NoResultsPlaceholder.vue b/src/components/common/NoResultsPlaceholder.vue index 07defcf2f69..e6d62910b15 100644 --- a/src/components/common/NoResultsPlaceholder.vue +++ b/src/components/common/NoResultsPlaceholder.vue @@ -22,7 +22,7 @@ import { cn } from '@comfyorg/tailwind-utils' import Button from '@/components/ui/button/Button.vue' -import type { ButtonVariants } from '../ui/button/button.variants' +import type { ButtonVariants } from '@comfyorg/design-system/button.variants' const props = defineProps<{ class?: string diff --git a/src/components/dialog/confirm/ConfirmFooter.vue b/src/components/dialog/confirm/ConfirmFooter.vue index 5dd744b9c94..2cb3fe7fc07 100644 --- a/src/components/dialog/confirm/ConfirmFooter.vue +++ b/src/components/dialog/confirm/ConfirmFooter.vue @@ -26,7 +26,7 @@ import type { MaybeRefOrGetter } from 'vue' import { useI18n } from 'vue-i18n' import Button from '@/components/ui/button/Button.vue' -import type { ButtonVariants } from '@/components/ui/button/button.variants' +import type { ButtonVariants } from '@comfyorg/design-system/button.variants' const { t } = useI18n() diff --git a/src/components/dialog/content/signin/SignUpForm.vue b/src/components/dialog/content/signin/SignUpForm.vue index 8089993f751..3d478eae839 100644 --- a/src/components/dialog/content/signin/SignUpForm.vue +++ b/src/components/dialog/content/signin/SignUpForm.vue @@ -75,7 +75,7 @@ import { useI18n } from 'vue-i18n' import { cn } from '@comfyorg/tailwind-utils' import Button from '@/components/ui/button/Button.vue' -import type { ButtonVariants } from '@/components/ui/button/button.variants' +import type { ButtonVariants } from '@comfyorg/design-system/button.variants' import { useTurnstile, useTurnstileGate } from '@/composables/auth/useTurnstile' import { signUpSchema } from '@/schemas/signInSchema' import type { SignUpData } from '@/schemas/signInSchema' diff --git a/src/components/ui/button/Button.stories.ts b/src/components/ui/button/Button.stories.ts index 68cea7e5b38..dcf16561c8a 100644 --- a/src/components/ui/button/Button.stories.ts +++ b/src/components/ui/button/Button.stories.ts @@ -5,7 +5,7 @@ import type { } from '@storybook/vue3-vite' import Button from './Button.vue' -import { FOR_STORIES } from '@/components/ui/button/button.variants' +import { FOR_STORIES } from '@comfyorg/design-system/button.variants' interface ButtonPropsAndStoryArgs extends ComponentPropsAndSlots< typeof Button diff --git a/src/components/ui/button/Button.vue b/src/components/ui/button/Button.vue index d32be57cdad..8a27a2f913e 100644 --- a/src/components/ui/button/Button.vue +++ b/src/components/ui/button/Button.vue @@ -5,8 +5,8 @@ import type { HTMLAttributes } from 'vue' import { cn } from '@comfyorg/tailwind-utils' -import type { ButtonVariants } from './button.variants' -import { buttonVariants } from './button.variants' +import type { ButtonVariants } from '@comfyorg/design-system/button.variants' +import { buttonVariants } from '@comfyorg/design-system/button.variants' interface Props extends PrimitiveProps { variant?: ButtonVariants['variant'] diff --git a/src/components/widget/layout/BaseModalLayout.vue b/src/components/widget/layout/BaseModalLayout.vue index 072904a6bfc..89315a94a4a 100644 --- a/src/components/widget/layout/BaseModalLayout.vue +++ b/src/components/widget/layout/BaseModalLayout.vue @@ -140,7 +140,7 @@ import { computed, inject, ref, useSlots, watch } from 'vue' import { useI18n } from 'vue-i18n' import Button from '@/components/ui/button/Button.vue' -import type { ButtonVariants } from '@/components/ui/button/button.variants' +import type { ButtonVariants } from '@comfyorg/design-system/button.variants' import { OnCloseKey } from '@/types/widgetTypes' import { cn } from '@comfyorg/tailwind-utils' diff --git a/src/platform/cloud/onboarding/components/CloudSocialAuthButtons.vue b/src/platform/cloud/onboarding/components/CloudSocialAuthButtons.vue index 4d7297108f8..54d8cea5d32 100644 --- a/src/platform/cloud/onboarding/components/CloudSocialAuthButtons.vue +++ b/src/platform/cloud/onboarding/components/CloudSocialAuthButtons.vue @@ -28,7 +28,7 @@ import { useI18n } from 'vue-i18n' import SocialAuthButtons from '@comfyorg/account-ui/auth/SocialAuthButtons' import { cn } from '@comfyorg/tailwind-utils' -import { buttonVariants } from '@/components/ui/button/button.variants' +import { buttonVariants } from '@comfyorg/design-system/button.variants' const { googleLabel, diff --git a/src/workbench/extensions/agent/components/agent/composer/InlinePromptEditor.vue b/src/workbench/extensions/agent/components/agent/composer/InlinePromptEditor.vue index 6726285ea7a..75a234243e8 100644 --- a/src/workbench/extensions/agent/components/agent/composer/InlinePromptEditor.vue +++ b/src/workbench/extensions/agent/components/agent/composer/InlinePromptEditor.vue @@ -10,7 +10,7 @@ import { onBeforeUnmount, onMounted, useTemplateRef, watch } from 'vue' import { default as DOMPurify } from 'dompurify' import { useI18n } from 'vue-i18n' -import { buttonVariants } from '@/components/ui/button/button.variants' +import { buttonVariants } from '@comfyorg/design-system/button.variants' import { tagRemoveButtonVariants, tagVariants diff --git a/src/workbench/extensions/manager/components/manager/button/PackInstallButton.vue b/src/workbench/extensions/manager/components/manager/button/PackInstallButton.vue index 271face1816..9e2e4932d3f 100644 --- a/src/workbench/extensions/manager/components/manager/button/PackInstallButton.vue +++ b/src/workbench/extensions/manager/components/manager/button/PackInstallButton.vue @@ -25,7 +25,7 @@ import { useI18n } from 'vue-i18n' import DotSpinner from '@/components/common/DotSpinner.vue' import Button from '@/components/ui/button/Button.vue' -import type { ButtonVariants } from '@/components/ui/button/button.variants' +import type { ButtonVariants } from '@comfyorg/design-system/button.variants' import type { components } from '@/types/comfyRegistryTypes' import type { ConflictDetail } from '@/workbench/extensions/manager/types/conflictDetectionTypes' import { usePackInstall } from '@/workbench/extensions/manager/composables/nodePack/usePackInstall' diff --git a/src/workbench/extensions/manager/components/manager/button/PackTryUpdateButton.vue b/src/workbench/extensions/manager/components/manager/button/PackTryUpdateButton.vue index 20125956022..75a58668444 100644 --- a/src/workbench/extensions/manager/components/manager/button/PackTryUpdateButton.vue +++ b/src/workbench/extensions/manager/components/manager/button/PackTryUpdateButton.vue @@ -22,7 +22,7 @@ import { useI18n } from 'vue-i18n' import DotSpinner from '@/components/common/DotSpinner.vue' import Button from '@/components/ui/button/Button.vue' -import type { ButtonVariants } from '@/components/ui/button/button.variants' +import type { ButtonVariants } from '@comfyorg/design-system/button.variants' import type { components } from '@/types/comfyRegistryTypes' import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comfyManagerStore' diff --git a/src/workbench/extensions/manager/components/manager/button/PackUninstallButton.vue b/src/workbench/extensions/manager/components/manager/button/PackUninstallButton.vue index 23aa9d23bfd..bbd58dba049 100644 --- a/src/workbench/extensions/manager/components/manager/button/PackUninstallButton.vue +++ b/src/workbench/extensions/manager/components/manager/button/PackUninstallButton.vue @@ -13,7 +13,7 @@ import { useI18n } from 'vue-i18n' import Button from '@/components/ui/button/Button.vue' -import type { ButtonVariants } from '@/components/ui/button/button.variants' +import type { ButtonVariants } from '@comfyorg/design-system/button.variants' import type { components } from '@/types/comfyRegistryTypes' import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comfyManagerStore' import type { components as ManagerComponents } from '@/workbench/extensions/manager/types/generatedManagerTypes' diff --git a/src/workbench/extensions/manager/components/manager/button/PackUpdateButton.vue b/src/workbench/extensions/manager/components/manager/button/PackUpdateButton.vue index 0d5549137b6..fcf60866bdc 100644 --- a/src/workbench/extensions/manager/components/manager/button/PackUpdateButton.vue +++ b/src/workbench/extensions/manager/components/manager/button/PackUpdateButton.vue @@ -42,7 +42,7 @@ import TinyChevronIcon from '@/components/actionbar/TinyChevronIcon.vue' import DotSpinner from '@/components/common/DotSpinner.vue' import DropdownMenu from '@/components/common/DropdownMenu.vue' import Button from '@/components/ui/button/Button.vue' -import type { ButtonVariants } from '@/components/ui/button/button.variants' +import type { ButtonVariants } from '@comfyorg/design-system/button.variants' import ButtonGroup from '@/components/ui/button-group/ButtonGroup.vue' import type { components } from '@/types/comfyRegistryTypes' import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comfyManagerStore'