Skip to content
Draft
Show file tree
Hide file tree
Changes from 2 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: 0 additions & 1 deletion knip.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ const config: KnipConfig = {
// Weird importmap things
'@iconify-json/lucide',
'@iconify/json',
'@primeuix/forms',
'@primeuix/styled',
'@primeuix/utils',
'@primevue/icons'
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,9 @@
"@comfyorg/shared-frontend-utils": "workspace:*",
"@comfyorg/tailwind-utils": "workspace:*",
"@iconify/json": "catalog:",
"@primeuix/forms": "catalog:",
"@primeuix/styled": "catalog:",
"@primeuix/utils": "catalog:",
"@primevue/core": "catalog:",
"@primevue/forms": "catalog:",
"@primevue/icons": "catalog:",
"@primevue/themes": "catalog:",
"@sentry/vue": "catalog:",
Expand All @@ -77,6 +75,7 @@
"@tiptap/extension-table-header": "^2.10.4",
"@tiptap/extension-table-row": "^2.10.4",
"@tiptap/starter-kit": "^2.10.4",
"@vee-validate/zod": "catalog:",
"@vueuse/core": "catalog:",
"@vueuse/integrations": "catalog:",
"@xterm/addon-fit": "^0.10.0",
Expand Down Expand Up @@ -106,6 +105,7 @@
"three": "^0.170.0",
"tiptap-markdown": "^0.8.10",
"typegpu": "catalog:",
"vee-validate": "catalog:",
"vue": "catalog:",
"vue-i18n": "catalog:",
"vue-router": "catalog:",
Expand Down
77 changes: 36 additions & 41 deletions pnpm-lock.yaml

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

4 changes: 2 additions & 2 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,9 @@ catalog:
'@nx/vite': 22.2.6
'@pinia/testing': ^1.0.3
'@playwright/test': ^1.58.1
'@primeuix/forms': 0.0.2
'@primeuix/styled': 0.3.2
'@primeuix/utils': ^0.3.2
'@primevue/core': ^4.2.5
'@primevue/forms': ^4.2.5
'@primevue/icons': 4.2.5
'@primevue/themes': ^4.2.5
'@sentry/vite-plugin': ^4.6.0
Expand All @@ -37,6 +35,7 @@ catalog:
'@types/node': ^24.1.0
'@types/semver': ^7.7.0
'@types/three': ^0.169.0
'@vee-validate/zod': ^4.15.1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Check `@vee-validate/zod` 4.15.1 peerDependencies
curl -s https://registry.npmjs.org/@vee-validate/zod/4.15.1 | jq '.peerDependencies'

Repository: Comfy-Org/ComfyUI_frontend

Length of output: 92


Upgrade Zod to satisfy @vee-validate/zod 4.15.1's peer dependency.

@vee-validate/zod 4.15.1 requires zod ^3.24.0, but the repository currently uses zod ^3.23.8. Either upgrade zod to ^3.24.0 or newer, or use a compatible @vee-validate/zod version.

Also applies to: line 95

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@pnpm-workspace.yaml` at line 38, The repo's `@vee-validate/zod` (referenced as
'@vee-validate/zod') requires zod ^3.24.0 but the workspace currently constrains
zod to ^3.23.8; update the zod version constraint to ^3.24.0 (or newer) wherever
zod is declared (ensure you update all occurrences mentioned alongside
'@vee-validate/zod'), or alternatively downgrade/pin '@vee-validate/zod' to a
version compatible with zod ^3.23.8; adjust the package dependency entries for
zod and/or `@vee-validate/zod` so the peer dependency requirement is satisfied.

'@vitejs/plugin-vue': ^6.0.0
'@vitest/coverage-v8': ^4.0.16
'@vitest/ui': ^4.0.16
Expand Down Expand Up @@ -93,6 +92,7 @@ catalog:
unplugin-icons: ^22.5.0
unplugin-typegpu: 0.8.0
unplugin-vue-components: ^30.0.0
vee-validate: ^4.15.1
vite: 8.0.0-beta.13
vite-plugin-dts: ^4.5.4
vite-plugin-html: ^3.2.2
Expand Down
29 changes: 16 additions & 13 deletions src/components/dialog/content/UpdatePasswordContent.vue
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
<template>
<Form
class="flex w-96 flex-col gap-6"
:resolver="zodResolver(updatePasswordSchema)"
@submit="onSubmit"
>
<form class="flex w-96 flex-col gap-6" @submit="onSubmit">
<PasswordFields />

<!-- Submit Button -->
<Button type="submit" class="mt-4 h-10 font-medium" :loading="loading">
{{ $t('userSettings.updatePassword') }}
</Button>
</Form>
</form>
</template>

<script setup lang="ts">
import type { FormSubmitEvent } from '@primevue/forms'
import { Form } from '@primevue/forms'
import { zodResolver } from '@primevue/forms/resolvers/zod'
import { toTypedSchema } from '@vee-validate/zod'
import { useForm } from 'vee-validate'
import { ref } from 'vue'

import PasswordFields from '@/components/dialog/content/signin/PasswordFields.vue'
Expand All @@ -31,15 +26,23 @@ const { onSuccess } = defineProps<{
onSuccess: () => void
}>()

const onSubmit = async (event: FormSubmitEvent) => {
if (event.valid) {
const { handleSubmit } = useForm({
initialValues: {
confirmPassword: '',
password: ''
},
validationSchema: toTypedSchema(updatePasswordSchema)
})

const onSubmit = handleSubmit(async (submittedValues) => {
if (submittedValues.password) {
loading.value = true
try {
await authActions.updatePassword(event.values.password)
await authActions.updatePassword(submittedValues.password)
onSuccess()
} finally {
loading.value = false
}
}
}
})
</script>
3 changes: 1 addition & 2 deletions src/components/dialog/content/signin/ApiKeyForm.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import type { ComponentProps } from 'vue-component-type-helpers'

import { Form } from '@primevue/forms'
import { mount } from '@vue/test-utils'
import { createPinia } from 'pinia'
import Button from '@/components/ui/button/Button.vue'
Expand Down Expand Up @@ -69,7 +68,7 @@ describe('ApiKeyForm', () => {
return mount(ApiKeyForm, {
global: {
plugins: [PrimeVue, createPinia(), i18n],
components: { Button, Form, InputText, Message }
components: { Button, InputText, Message }
},
props
})
Expand Down
Loading
Loading