Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci-design-system-pack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
Expand Down
3 changes: 3 additions & 0 deletions packages/design-system/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -36,6 +38,7 @@
"@iconify/tailwind4": "catalog:",
"@iconify/tools": "catalog:",
"@iconify/utils": "catalog:",
"cva": "catalog:",
"tailwindcss-primeui": "catalog:",
"tw-animate-css": "catalog:"
},
Expand Down
3 changes: 3 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/components/common/DropdownMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/NoResultsPlaceholder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/components/dialog/confirm/ConfirmFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion src/components/dialog/content/signin/SignUpForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/button/Button.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/components/ui/button/Button.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
2 changes: 1 addition & 1 deletion src/components/widget/layout/BaseModalLayout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Loading