mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-30 11:11:53 +00:00
Merge branch 'main' into sno-fix-playwright-babel-test
This commit is contained in:
@@ -7,7 +7,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|||||||
import { nextTick } from 'vue'
|
import { nextTick } from 'vue'
|
||||||
import { createI18n } from 'vue-i18n'
|
import { createI18n } from 'vue-i18n'
|
||||||
|
|
||||||
import enMessages from '@/locales/en/main.json'
|
import enMessages from '@/locales/en/main.json' with { type: 'json' }
|
||||||
|
|
||||||
import ManagerProgressDialogContent from './ManagerProgressDialogContent.vue'
|
import ManagerProgressDialogContent from './ManagerProgressDialogContent.vue'
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import Tooltip from 'primevue/tooltip'
|
|||||||
import { describe, expect, it } from 'vitest'
|
import { describe, expect, it } from 'vitest'
|
||||||
import { createI18n } from 'vue-i18n'
|
import { createI18n } from 'vue-i18n'
|
||||||
|
|
||||||
import enMessages from '@/locales/en/main.json'
|
import enMessages from '@/locales/en/main.json' with { type: 'json' }
|
||||||
|
|
||||||
import ManagerHeader from './ManagerHeader.vue'
|
import ManagerHeader from './ManagerHeader.vue'
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|||||||
import { nextTick } from 'vue'
|
import { nextTick } from 'vue'
|
||||||
import { createI18n } from 'vue-i18n'
|
import { createI18n } from 'vue-i18n'
|
||||||
|
|
||||||
import enMessages from '@/locales/en/main.json'
|
import enMessages from '@/locales/en/main.json' with { type: 'json' }
|
||||||
|
|
||||||
import PackVersionBadge from './PackVersionBadge.vue'
|
import PackVersionBadge from './PackVersionBadge.vue'
|
||||||
import PackVersionSelectorPopover from './PackVersionSelectorPopover.vue'
|
import PackVersionSelectorPopover from './PackVersionSelectorPopover.vue'
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import { nextTick } from 'vue'
|
|||||||
import { createI18n } from 'vue-i18n'
|
import { createI18n } from 'vue-i18n'
|
||||||
|
|
||||||
import VerifiedIcon from '@/components/icons/VerifiedIcon.vue'
|
import VerifiedIcon from '@/components/icons/VerifiedIcon.vue'
|
||||||
import enMessages from '@/locales/en/main.json'
|
import enMessages from '@/locales/en/main.json' with { type: 'json' }
|
||||||
|
|
||||||
// SelectedVersion is now using direct strings instead of enum
|
// SelectedVersion is now using direct strings instead of enum
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|||||||
import { nextTick } from 'vue'
|
import { nextTick } from 'vue'
|
||||||
import { createI18n } from 'vue-i18n'
|
import { createI18n } from 'vue-i18n'
|
||||||
|
|
||||||
import enMessages from '@/locales/en/main.json'
|
import enMessages from '@/locales/en/main.json' with { type: 'json' }
|
||||||
import { useComfyManagerStore } from '@/stores/comfyManagerStore'
|
import { useComfyManagerStore } from '@/stores/comfyManagerStore'
|
||||||
|
|
||||||
import PackEnableToggle from './PackEnableToggle.vue'
|
import PackEnableToggle from './PackEnableToggle.vue'
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { mount } from '@vue/test-utils'
|
|||||||
import { describe, expect, it } from 'vitest'
|
import { describe, expect, it } from 'vitest'
|
||||||
import { createI18n } from 'vue-i18n'
|
import { createI18n } from 'vue-i18n'
|
||||||
|
|
||||||
import enMessages from '@/locales/en/main.json'
|
import enMessages from '@/locales/en/main.json' with { type: 'json' }
|
||||||
import { components } from '@/types/comfyRegistryTypes'
|
import { components } from '@/types/comfyRegistryTypes'
|
||||||
|
|
||||||
import DescriptionTabPanel from './DescriptionTabPanel.vue'
|
import DescriptionTabPanel from './DescriptionTabPanel.vue'
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { describe, expect, it } from 'vitest'
|
|||||||
import { nextTick } from 'vue'
|
import { nextTick } from 'vue'
|
||||||
import { createI18n } from 'vue-i18n'
|
import { createI18n } from 'vue-i18n'
|
||||||
|
|
||||||
import enMessages from '@/locales/en/main.json'
|
import enMessages from '@/locales/en/main.json' with { type: 'json' }
|
||||||
|
|
||||||
import GridSkeleton from './GridSkeleton.vue'
|
import GridSkeleton from './GridSkeleton.vue'
|
||||||
import PackCardSkeleton from './PackCardSkeleton.vue'
|
import PackCardSkeleton from './PackCardSkeleton.vue'
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|||||||
import { nextTick } from 'vue'
|
import { nextTick } from 'vue'
|
||||||
import { createI18n } from 'vue-i18n'
|
import { createI18n } from 'vue-i18n'
|
||||||
|
|
||||||
import enMessages from '@/locales/en/main.json'
|
import enMessages from '@/locales/en/main.json' with { type: 'json' }
|
||||||
|
|
||||||
import SignInForm from './SignInForm.vue'
|
import SignInForm from './SignInForm.vue'
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|||||||
import { h } from 'vue'
|
import { h } from 'vue'
|
||||||
import { createI18n } from 'vue-i18n'
|
import { createI18n } from 'vue-i18n'
|
||||||
|
|
||||||
import enMessages from '@/locales/en/main.json'
|
import enMessages from '@/locales/en/main.json' with { type: 'json' }
|
||||||
|
|
||||||
import CurrentUserButton from './CurrentUserButton.vue'
|
import CurrentUserButton from './CurrentUserButton.vue'
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest'
|
|||||||
import { h } from 'vue'
|
import { h } from 'vue'
|
||||||
import { createI18n } from 'vue-i18n'
|
import { createI18n } from 'vue-i18n'
|
||||||
|
|
||||||
import enMessages from '@/locales/en/main.json'
|
import enMessages from '@/locales/en/main.json' with { type: 'json' }
|
||||||
|
|
||||||
import CurrentUserPopover from './CurrentUserPopover.vue'
|
import CurrentUserPopover from './CurrentUserPopover.vue'
|
||||||
|
|
||||||
|
|||||||
@@ -7,10 +7,10 @@ import type {
|
|||||||
ISerialisedGraph,
|
ISerialisedGraph,
|
||||||
SerialisableGraph
|
SerialisableGraph
|
||||||
} from '../src/types/serialisation'
|
} from '../src/types/serialisation'
|
||||||
import floatingBranch from './assets/floatingBranch.json'
|
import floatingBranch from './assets/floatingBranch.json' with { type: 'json' }
|
||||||
import floatingLink from './assets/floatingLink.json'
|
import floatingLink from './assets/floatingLink.json' with { type: 'json' }
|
||||||
import linkedNodes from './assets/linkedNodes.json'
|
import linkedNodes from './assets/linkedNodes.json' with { type: 'json' }
|
||||||
import reroutesComplex from './assets/reroutesComplex.json'
|
import reroutesComplex from './assets/reroutesComplex.json' with { type: 'json' }
|
||||||
import {
|
import {
|
||||||
basicSerialisableGraph,
|
basicSerialisableGraph,
|
||||||
minimalSerialisableGraph,
|
minimalSerialisableGraph,
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { type PropType, defineComponent } from 'vue'
|
|||||||
import { createI18n } from 'vue-i18n'
|
import { createI18n } from 'vue-i18n'
|
||||||
|
|
||||||
import type { VueNodeData } from '@/composables/graph/useGraphNodeManager'
|
import type { VueNodeData } from '@/composables/graph/useGraphNodeManager'
|
||||||
import enMessages from '@/locales/en/main.json'
|
import enMessages from '@/locales/en/main.json' with { type: 'json' }
|
||||||
|
|
||||||
import NodeSlots from './NodeSlots.vue'
|
import NodeSlots from './NodeSlots.vue'
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import lucide from '@iconify-json/lucide/icons.json'
|
import lucide from '@iconify-json/lucide/icons.json' with { type: 'json' }
|
||||||
import { addDynamicIconSelectors } from '@iconify/tailwind'
|
import { addDynamicIconSelectors } from '@iconify/tailwind'
|
||||||
|
|
||||||
import { iconCollection } from './build/customIconCollection'
|
import { iconCollection } from './build/customIconCollection'
|
||||||
|
|||||||
@@ -7,10 +7,10 @@ import type {
|
|||||||
SerialisableGraph
|
SerialisableGraph
|
||||||
} from '@/lib/litegraph/src/types/serialisation'
|
} from '@/lib/litegraph/src/types/serialisation'
|
||||||
|
|
||||||
import floatingBranch from './assets/floatingBranch.json'
|
import floatingBranch from './assets/floatingBranch.json' with { type: 'json' }
|
||||||
import floatingLink from './assets/floatingLink.json'
|
import floatingLink from './assets/floatingLink.json' with { type: 'json' }
|
||||||
import linkedNodes from './assets/linkedNodes.json'
|
import linkedNodes from './assets/linkedNodes.json' with { type: 'json' }
|
||||||
import reroutesComplex from './assets/reroutesComplex.json'
|
import reroutesComplex from './assets/reroutesComplex.json' with { type: 'json' }
|
||||||
import {
|
import {
|
||||||
basicSerialisableGraph,
|
basicSerialisableGraph,
|
||||||
minimalSerialisableGraph,
|
minimalSerialisableGraph,
|
||||||
|
|||||||
Reference in New Issue
Block a user