Skip to content

Commit 3f84bb0

Browse files
committed
Merge remote-tracking branch 'origin/main' into bl-linkslot-refactor
2 parents 2aca7c8 + fe0eaae commit 3f84bb0

File tree

65 files changed

+562
-190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+562
-190
lines changed

.github/workflows/update-locales.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ jobs:
1414
if: github.event_name == 'workflow_dispatch' || (github.event.pull_request.head.repo.full_name == github.repository && startsWith(github.head_ref, 'version-bump-'))
1515
runs-on: ubuntu-latest
1616
steps:
17+
- name: Checkout repository
18+
uses: actions/checkout@v5
19+
1720
- name: Setup Frontend
1821
uses: ./.github/actions/setup-frontend
1922

.storybook/README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,18 +211,17 @@ This Storybook setup includes:
211211

212212
## Icon Usage in Storybook
213213

214-
In this project, the `<i-lucide:... />` syntax from unplugin-icons is not supported in Storybook.
214+
In this project, only the `<i class="icon-[lucide--folder]" />` syntax from unplugin-icons is supported in Storybook.
215215

216216
**Example:**
217217

218218
```vue
219219
<script setup lang="ts">
220-
import { Trophy, Settings } from 'lucide-vue-next'
221220
</script>
222221
223222
<template>
224-
<Trophy :size="16" class="text-neutral" />
225-
<Settings :size="16" class="text-neutral" />
223+
<i class="icon-[lucide--trophy] text-neutral size-4" />
224+
<i class="icon-[lucide--settings] text-neutral size-4" />
226225
</template>
227226
```
228227

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ pnpm format
255255
The project supports three types of icons, all with automatic imports (no manual imports needed):
256256

257257
1. **PrimeIcons** - Built-in PrimeVue icons using CSS classes: `<i class="pi pi-plus" />`
258-
2. **Iconify Icons** - 200,000+ icons from various libraries: `<i-lucide:settings />`, `<i-mdi:folder />`
258+
2. **Iconify Icons** - 200,000+ icons from various libraries: `<i class="icon-[lucide--settings]" />`, `<i class="icon-[mdi--folder]" />`
259259
3. **Custom Icons** - Your own SVG icons: `<i-comfy:workflow />`
260260

261261
Icons are powered by the unplugin-icons system, which automatically discovers and imports icons as Vue components. Custom icons are stored in `packages/design-system/src/icons/` and processed by `packages/design-system/src/iconCollection.ts` with automatic validation.

apps/desktop-ui/src/components/install/GpuPicker.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
:value="$t('install.gpuPicker.recommended')"
5454
class="bg-neutral-300 text-neutral-900 rounded-full text-sm font-bold px-2 py-[1px]"
5555
/>
56-
<i-lucide:badge-check class="text-neutral-300 text-lg" />
56+
<i class="icon-[lucide--badge-check] text-neutral-300 text-lg" />
5757
</div>
5858
</div>
5959

124 Bytes
Loading
148 Bytes
Loading

browser_tests/tests/vueNodes/groups/groups.spec.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ const CREATE_GROUP_HOTKEY = 'Control+g'
88
test.describe('Vue Node Groups', () => {
99
test.beforeEach(async ({ comfyPage }) => {
1010
await comfyPage.setSetting('Comfy.VueNodes.Enabled', true)
11+
await comfyPage.setSetting('Comfy.Minimap.ShowGroups', true)
1112
await comfyPage.vueNodes.waitForNodes()
1213
})
1314

1415
test('should allow creating groups with hotkey', async ({ comfyPage }) => {
1516
await comfyPage.page.getByText('Load Checkpoint').click()
1617
await comfyPage.page.getByText('KSampler').click({ modifiers: ['Control'] })
1718
await comfyPage.page.keyboard.press(CREATE_GROUP_HOTKEY)
19+
await comfyPage.nextFrame()
1820
await expect(comfyPage.canvas).toHaveScreenshot(
1921
'vue-groups-create-group.png'
2022
)
145 Bytes
Loading
108 Bytes
Loading
123 Bytes
Loading

0 commit comments

Comments
 (0)