Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
3 changes: 2 additions & 1 deletion apps/desktop-ui/src/components/install/InstallFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
<script setup lang="ts">
import type { PassThrough } from '@primevue/core'
import Button from 'primevue/button'
import Step, { type StepPassThroughOptions } from 'primevue/step'
import Step from 'primevue/step'
import type { StepPassThroughOptions } from 'primevue/step'
import StepList from 'primevue/steplist'

defineProps<{
Expand Down
10 changes: 6 additions & 4 deletions apps/desktop-ui/src/i18n.ts
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,14 @@ export async function loadLocale(locale: string): Promise<void> {
}

// Only include English in the initial bundle
const messages = {
en: buildLocale(en, enNodes, enCommands, enSettings)
}
const enMessages = buildLocale(en, enNodes, enCommands, enSettings)

// Type for locale messages - inferred from the English locale structure
type LocaleMessages = typeof messages.en
type LocaleMessages = typeof enMessages

const messages: Record<string, LocaleMessages> = {
en: enMessages
}

export const i18n = createI18n({
// Must set `false`, as Vue I18n Legacy API is for Vue 2
Expand Down
3 changes: 2 additions & 1 deletion apps/desktop-ui/src/utils/refUtil.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useTimeout } from '@vueuse/core'
import { type Ref, computed, ref, watch } from 'vue'
import { computed, ref, watch } from 'vue'
import type { Ref } from 'vue'

/**
* Vue boolean ref (writable computed) with one difference: when set to `true` it stays that way for at least {@link minDuration}.
Expand Down
3 changes: 2 additions & 1 deletion apps/desktop-ui/src/views/DesktopDialogView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ import { normalizeI18nKey } from '@comfyorg/shared-frontend-utils/formatUtil'
import Button from 'primevue/button'
import { useRoute } from 'vue-router'

import { type DialogAction, getDialog } from '@/constants/desktopDialogs'
import { getDialog } from '@/constants/desktopDialogs'
import type { DialogAction } from '@/constants/desktopDialogs'
import { t } from '@/i18n'
import { electronAPI } from '@/utils/envUtil'

Expand Down
2 changes: 2 additions & 0 deletions apps/desktop-ui/src/views/NotSupportedView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
<BaseViewTemplate>
<div class="sad-container">
<!-- Right side image -->
<!-- eslint-disable @intlify/vue-i18n/no-raw-text -->
<img
class="sad-girl"
src="/assets/images/sad_girl.png"
alt="Sad girl illustration"
/>
<!-- eslint-enable @intlify/vue-i18n/no-raw-text -->

<div class="no-drag sad-text flex items-center">
<div class="flex flex-col gap-8 p-8 min-w-110">
Expand Down
6 changes: 5 additions & 1 deletion eslint.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
parser as tseslintParser
} from 'typescript-eslint'
import vueParser from 'vue-eslint-parser'
import path from 'node:path'

const extraFileExtensions = ['.vue']

Expand Down Expand Up @@ -292,6 +293,9 @@ export default defineConfig([
'no-console': 'off'
}
},

// Turn off ESLint rules that are already handled by oxlint
...oxlint.buildFromOxlintConfigFile('./.oxlintrc.json')
...oxlint.buildFromOxlintConfigFile(
path.resolve(import.meta.dirname, '.oxlintrc.json')
)
])
Loading