diff --git a/src/components/dialog/content/ManagerProgressDialogContent.test.ts b/src/components/dialog/content/ManagerProgressDialogContent.test.ts index dc7ac8910..0075c9dc5 100644 --- a/src/components/dialog/content/ManagerProgressDialogContent.test.ts +++ b/src/components/dialog/content/ManagerProgressDialogContent.test.ts @@ -7,7 +7,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { nextTick } from 'vue' 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' diff --git a/src/components/dialog/content/manager/ManagerHeader.test.ts b/src/components/dialog/content/manager/ManagerHeader.test.ts index 291020d1f..fa974bbfc 100644 --- a/src/components/dialog/content/manager/ManagerHeader.test.ts +++ b/src/components/dialog/content/manager/ManagerHeader.test.ts @@ -6,7 +6,7 @@ import Tooltip from 'primevue/tooltip' import { describe, expect, it } from 'vitest' 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' diff --git a/src/components/dialog/content/manager/PackVersionBadge.test.ts b/src/components/dialog/content/manager/PackVersionBadge.test.ts index 1246de66b..f57c65760 100644 --- a/src/components/dialog/content/manager/PackVersionBadge.test.ts +++ b/src/components/dialog/content/manager/PackVersionBadge.test.ts @@ -6,7 +6,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { nextTick } from 'vue' 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 PackVersionSelectorPopover from './PackVersionSelectorPopover.vue' diff --git a/src/components/dialog/content/manager/PackVersionSelectorPopover.test.ts b/src/components/dialog/content/manager/PackVersionSelectorPopover.test.ts index 83b4d320e..6b712f743 100644 --- a/src/components/dialog/content/manager/PackVersionSelectorPopover.test.ts +++ b/src/components/dialog/content/manager/PackVersionSelectorPopover.test.ts @@ -10,7 +10,7 @@ import { nextTick } from 'vue' import { createI18n } from 'vue-i18n' 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 diff --git a/src/components/dialog/content/manager/button/PackEnableToggle.test.ts b/src/components/dialog/content/manager/button/PackEnableToggle.test.ts index 44b319553..30112a88b 100644 --- a/src/components/dialog/content/manager/button/PackEnableToggle.test.ts +++ b/src/components/dialog/content/manager/button/PackEnableToggle.test.ts @@ -6,7 +6,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { nextTick } from 'vue' 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 PackEnableToggle from './PackEnableToggle.vue' diff --git a/src/components/dialog/content/manager/infoPanel/tabs/DescriptionTabPanel.test.ts b/src/components/dialog/content/manager/infoPanel/tabs/DescriptionTabPanel.test.ts index fac684a52..d8dd40c4e 100644 --- a/src/components/dialog/content/manager/infoPanel/tabs/DescriptionTabPanel.test.ts +++ b/src/components/dialog/content/manager/infoPanel/tabs/DescriptionTabPanel.test.ts @@ -2,7 +2,7 @@ import { mount } from '@vue/test-utils' import { describe, expect, it } from 'vitest' 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 DescriptionTabPanel from './DescriptionTabPanel.vue' diff --git a/src/components/dialog/content/manager/skeleton/PackCardGridSkeleton.test.ts b/src/components/dialog/content/manager/skeleton/PackCardGridSkeleton.test.ts index 4948e79fd..db1f2a13f 100644 --- a/src/components/dialog/content/manager/skeleton/PackCardGridSkeleton.test.ts +++ b/src/components/dialog/content/manager/skeleton/PackCardGridSkeleton.test.ts @@ -5,7 +5,7 @@ import { describe, expect, it } from 'vitest' import { nextTick } from 'vue' 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 PackCardSkeleton from './PackCardSkeleton.vue' diff --git a/src/components/dialog/content/signin/SignInForm.spec.ts b/src/components/dialog/content/signin/SignInForm.spec.ts index 1e5b6304e..62c1fc0f7 100644 --- a/src/components/dialog/content/signin/SignInForm.spec.ts +++ b/src/components/dialog/content/signin/SignInForm.spec.ts @@ -10,7 +10,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { nextTick } from 'vue' 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' diff --git a/src/components/topbar/CurrentUserButton.spec.ts b/src/components/topbar/CurrentUserButton.spec.ts index abb2a08b7..55e23fa23 100644 --- a/src/components/topbar/CurrentUserButton.spec.ts +++ b/src/components/topbar/CurrentUserButton.spec.ts @@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { h } from 'vue' 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' diff --git a/src/components/topbar/CurrentUserPopover.spec.ts b/src/components/topbar/CurrentUserPopover.spec.ts index 9929d316a..174850a0d 100644 --- a/src/components/topbar/CurrentUserPopover.spec.ts +++ b/src/components/topbar/CurrentUserPopover.spec.ts @@ -4,7 +4,7 @@ import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest' import { h } from 'vue' 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' diff --git a/src/constants/coreColorPalettes.ts b/src/constants/coreColorPalettes.ts index 58c7f1522..f20cb260d 100644 --- a/src/constants/coreColorPalettes.ts +++ b/src/constants/coreColorPalettes.ts @@ -1,9 +1,9 @@ -import arc from '@/assets/palettes/arc.json' -import dark from '@/assets/palettes/dark.json' -import github from '@/assets/palettes/github.json' -import light from '@/assets/palettes/light.json' -import nord from '@/assets/palettes/nord.json' -import solarized from '@/assets/palettes/solarized.json' +import arc from '@/assets/palettes/arc.json' with { type: 'json' } +import dark from '@/assets/palettes/dark.json' with { type: 'json' } +import github from '@/assets/palettes/github.json' with { type: 'json' } +import light from '@/assets/palettes/light.json' with { type: 'json' } +import nord from '@/assets/palettes/nord.json' with { type: 'json' } +import solarized from '@/assets/palettes/solarized.json' with { type: 'json' } import type { ColorPalettes, CompletedPalette diff --git a/src/i18n.ts b/src/i18n.ts index 08369af62..2544fc7eb 100644 --- a/src/i18n.ts +++ b/src/i18n.ts @@ -1,41 +1,41 @@ import { createI18n } from 'vue-i18n' -import arCommands from './locales/ar/commands.json' -import ar from './locales/ar/main.json' -import arNodes from './locales/ar/nodeDefs.json' -import arSettings from './locales/ar/settings.json' -import enCommands from './locales/en/commands.json' -import en from './locales/en/main.json' -import enNodes from './locales/en/nodeDefs.json' -import enSettings from './locales/en/settings.json' -import esCommands from './locales/es/commands.json' -import es from './locales/es/main.json' -import esNodes from './locales/es/nodeDefs.json' -import esSettings from './locales/es/settings.json' -import frCommands from './locales/fr/commands.json' -import fr from './locales/fr/main.json' -import frNodes from './locales/fr/nodeDefs.json' -import frSettings from './locales/fr/settings.json' -import jaCommands from './locales/ja/commands.json' -import ja from './locales/ja/main.json' -import jaNodes from './locales/ja/nodeDefs.json' -import jaSettings from './locales/ja/settings.json' -import koCommands from './locales/ko/commands.json' -import ko from './locales/ko/main.json' -import koNodes from './locales/ko/nodeDefs.json' -import koSettings from './locales/ko/settings.json' -import ruCommands from './locales/ru/commands.json' -import ru from './locales/ru/main.json' -import ruNodes from './locales/ru/nodeDefs.json' -import ruSettings from './locales/ru/settings.json' -import zhTWCommands from './locales/zh-TW/commands.json' -import zhTW from './locales/zh-TW/main.json' -import zhTWNodes from './locales/zh-TW/nodeDefs.json' -import zhTWSettings from './locales/zh-TW/settings.json' -import zhCommands from './locales/zh/commands.json' -import zh from './locales/zh/main.json' -import zhNodes from './locales/zh/nodeDefs.json' -import zhSettings from './locales/zh/settings.json' +import arCommands from './locales/ar/commands.json' with { type: 'json' } +import ar from './locales/ar/main.json' with { type: 'json' } +import arNodes from './locales/ar/nodeDefs.json' with { type: 'json' } +import arSettings from './locales/ar/settings.json' with { type: 'json' } +import enCommands from './locales/en/commands.json' with { type: 'json' } +import en from './locales/en/main.json' with { type: 'json' } +import enNodes from './locales/en/nodeDefs.json' with { type: 'json' } +import enSettings from './locales/en/settings.json' with { type: 'json' } +import esCommands from './locales/es/commands.json' with { type: 'json' } +import es from './locales/es/main.json' with { type: 'json' } +import esNodes from './locales/es/nodeDefs.json' with { type: 'json' } +import esSettings from './locales/es/settings.json' with { type: 'json' } +import frCommands from './locales/fr/commands.json' with { type: 'json' } +import fr from './locales/fr/main.json' with { type: 'json' } +import frNodes from './locales/fr/nodeDefs.json' with { type: 'json' } +import frSettings from './locales/fr/settings.json' with { type: 'json' } +import jaCommands from './locales/ja/commands.json' with { type: 'json' } +import ja from './locales/ja/main.json' with { type: 'json' } +import jaNodes from './locales/ja/nodeDefs.json' with { type: 'json' } +import jaSettings from './locales/ja/settings.json' with { type: 'json' } +import koCommands from './locales/ko/commands.json' with { type: 'json' } +import ko from './locales/ko/main.json' with { type: 'json' } +import koNodes from './locales/ko/nodeDefs.json' with { type: 'json' } +import koSettings from './locales/ko/settings.json' with { type: 'json' } +import ruCommands from './locales/ru/commands.json' with { type: 'json' } +import ru from './locales/ru/main.json' with { type: 'json' } +import ruNodes from './locales/ru/nodeDefs.json' with { type: 'json' } +import ruSettings from './locales/ru/settings.json' with { type: 'json' } +import zhTWCommands from './locales/zh-TW/commands.json' with { type: 'json' } +import zhTW from './locales/zh-TW/main.json' with { type: 'json' } +import zhTWNodes from './locales/zh-TW/nodeDefs.json' with { type: 'json' } +import zhTWSettings from './locales/zh-TW/settings.json' with { type: 'json' } +import zhCommands from './locales/zh/commands.json' with { type: 'json' } +import zh from './locales/zh/main.json' with { type: 'json' } +import zhNodes from './locales/zh/nodeDefs.json' with { type: 'json' } +import zhSettings from './locales/zh/settings.json' with { type: 'json' } function buildLocale(main: M, nodes: N, commands: C, settings: S) { return { diff --git a/src/lib/litegraph/test/testExtensions.ts b/src/lib/litegraph/test/testExtensions.ts index 097808fd2..bb59e7221 100644 --- a/src/lib/litegraph/test/testExtensions.ts +++ b/src/lib/litegraph/test/testExtensions.ts @@ -7,10 +7,10 @@ import type { ISerialisedGraph, SerialisableGraph } from '../src/types/serialisation' -import floatingBranch from './assets/floatingBranch.json' -import floatingLink from './assets/floatingLink.json' -import linkedNodes from './assets/linkedNodes.json' -import reroutesComplex from './assets/reroutesComplex.json' +import floatingBranch from './assets/floatingBranch.json' with { type: 'json' } +import floatingLink from './assets/floatingLink.json' with { type: 'json' } +import linkedNodes from './assets/linkedNodes.json' with { type: 'json' } +import reroutesComplex from './assets/reroutesComplex.json' with { type: 'json' } import { basicSerialisableGraph, minimalSerialisableGraph, diff --git a/src/renderer/extensions/vueNodes/components/NodeSlots.spec.ts b/src/renderer/extensions/vueNodes/components/NodeSlots.spec.ts index 522a9e8a6..f58e115ad 100644 --- a/src/renderer/extensions/vueNodes/components/NodeSlots.spec.ts +++ b/src/renderer/extensions/vueNodes/components/NodeSlots.spec.ts @@ -5,7 +5,7 @@ import { type PropType, defineComponent } from 'vue' import { createI18n } from 'vue-i18n' 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' diff --git a/src/scripts/api.ts b/src/scripts/api.ts index 9480face6..951ac1272 100644 --- a/src/scripts/api.ts +++ b/src/scripts/api.ts @@ -1,7 +1,7 @@ import axios from 'axios' import { get } from 'es-toolkit/compat' -import defaultClientFeatureFlags from '@/config/clientFeatureFlags.json' +import defaultClientFeatureFlags from '@/config/clientFeatureFlags.json' with { type: 'json' } import type { DisplayComponentWsMessage, EmbeddingsResponse, diff --git a/tailwind.config.ts b/tailwind.config.ts index 4602b69a9..e5e39987b 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -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 { iconCollection } from './build/customIconCollection' diff --git a/tests-ui/tests/litegraph/core/fixtures/testExtensions.ts b/tests-ui/tests/litegraph/core/fixtures/testExtensions.ts index 8c4869da2..300b23814 100644 --- a/tests-ui/tests/litegraph/core/fixtures/testExtensions.ts +++ b/tests-ui/tests/litegraph/core/fixtures/testExtensions.ts @@ -7,10 +7,10 @@ import type { SerialisableGraph } from '@/lib/litegraph/src/types/serialisation' -import floatingBranch from './assets/floatingBranch.json' -import floatingLink from './assets/floatingLink.json' -import linkedNodes from './assets/linkedNodes.json' -import reroutesComplex from './assets/reroutesComplex.json' +import floatingBranch from './assets/floatingBranch.json' with { type: 'json' } +import floatingLink from './assets/floatingLink.json' with { type: 'json' } +import linkedNodes from './assets/linkedNodes.json' with { type: 'json' } +import reroutesComplex from './assets/reroutesComplex.json' with { type: 'json' } import { basicSerialisableGraph, minimalSerialisableGraph,