diff --git a/.prettierrc b/.prettierrc index 07c5ccc22..bb98e70de 100644 --- a/.prettierrc +++ b/.prettierrc @@ -4,15 +4,15 @@ "semi": false, "trailingComma": "none", "printWidth": 80, - "importOrder": ["^@core/(.*)$", "", "^@/(.*)$", "^[./]"], - "importOrderSeparation": true, - "importOrderSortSpecifiers": true, - "overrides": [ - { - "files": "*.{js,cjs,mjs,ts,cts,mts,tsx,vue}", - "options": { - "plugins": ["@trivago/prettier-plugin-sort-imports"] - } - } - ] + "importOrder": [ + "^@core/(.*)$", + "", + "", + "", + "^@/(.*)$", + "", + "^[./]" + ], + "importOrderTypeScriptVersion": "5.0.0", + "plugins": ["@prettier/plugin-oxc", "@ianvs/prettier-plugin-sort-imports"] } diff --git a/.storybook/preview.ts b/.storybook/preview.ts index bfe81f431..562103fbb 100644 --- a/.storybook/preview.ts +++ b/.storybook/preview.ts @@ -3,14 +3,18 @@ import Aura from '@primevue/themes/aura' import { setup } from '@storybook/vue3' import type { Preview, StoryContext, StoryFn } from '@storybook/vue3-vite' import { createPinia } from 'pinia' + import 'primeicons/primeicons.css' + import PrimeVue from 'primevue/config' import ConfirmationService from 'primevue/confirmationservice' import ToastService from 'primevue/toastservice' import Tooltip from 'primevue/tooltip' import '@/assets/css/style.css' + import { i18n } from '@/i18n' + import '@/lib/litegraph/public/css/litegraph.css' const ComfyUIPreset = definePreset(Aura, { diff --git a/apps/desktop-ui/.storybook/preview.ts b/apps/desktop-ui/.storybook/preview.ts index a0ead30cc..fcab8a6d1 100644 --- a/apps/desktop-ui/.storybook/preview.ts +++ b/apps/desktop-ui/.storybook/preview.ts @@ -3,13 +3,16 @@ import Aura from '@primevue/themes/aura' import { setup } from '@storybook/vue3' import type { Preview, StoryContext, StoryFn } from '@storybook/vue3-vite' import { createPinia } from 'pinia' + import 'primeicons/primeicons.css' + import PrimeVue from 'primevue/config' import ConfirmationService from 'primevue/confirmationservice' import ToastService from 'primevue/toastservice' import Tooltip from 'primevue/tooltip' import '@/assets/css/style.css' + import { i18n } from '@/i18n' const ComfyUIPreset = definePreset(Aura, { diff --git a/apps/desktop-ui/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue b/apps/desktop-ui/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue index ca0dcf34e..4f461cc45 100644 --- a/apps/desktop-ui/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue +++ b/apps/desktop-ui/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue @@ -29,8 +29,7 @@ import { useElementHover, useEventListener } from '@vueuse/core' import type { IDisposable } from '@xterm/xterm' import Button from 'primevue/button' -import type { Ref } from 'vue' -import { computed, onMounted, onUnmounted, ref } from 'vue' +import { computed, onMounted, onUnmounted, ref, type Ref } from 'vue' import { useI18n } from 'vue-i18n' import { useTerminal } from '@/composables/bottomPanelTabs/useTerminal' diff --git a/apps/desktop-ui/src/components/install/InstallLocationPicker.vue b/apps/desktop-ui/src/components/install/InstallLocationPicker.vue index 6b139c1e9..75ffe21df 100644 --- a/apps/desktop-ui/src/components/install/InstallLocationPicker.vue +++ b/apps/desktop-ui/src/components/install/InstallLocationPicker.vue @@ -104,8 +104,10 @@