Skip to content

Commit e77f24a

Browse files
arjansingharjansingh
authored
Merge branch 'main' into feat/cloud-auth-backport
2 parents 02cbbca + bfe53d7 commit e77f24a

File tree

58 files changed

+293
-361
lines changed

Some content is hidden

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

58 files changed

+293
-361
lines changed

‎.github/workflows/publish-desktop-ui.yaml‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -161,20 +161,6 @@ jobs:
161161
echo "publish_dir=$PUBLISH_DIR" >> "$GITHUB_OUTPUT"
162162
echo "name=$NAME" >> "$GITHUB_OUTPUT"
163163
164-
- name: Pack (preview only)
165-
shell: bash
166-
working-directory: ${{ steps.pkg.outputs.publish_dir }}
167-
run: |
168-
set -euo pipefail
169-
npm pack --json | tee pack-result.json
170-
171-
- name: Upload package tarball artifact
172-
uses: actions/upload-artifact@v4
173-
with:
174-
name: desktop-ui-npm-tarball-${{ inputs.version }}
175-
path: ${{ steps.pkg.outputs.publish_dir }}/*.tgz
176-
if-no-files-found: error
177-
178164
- name: Check if version already on npm
179165
id: check_npm
180166
env:

‎.github/workflows/release-version-bump.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ jobs:
5959
uses: actions/setup-node@v4
6060
with:
6161
node-version: lts/*
62-
cache: 'pnpm'
6362

6463
- name: Bump version
6564
id: bump-version

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ templates_repo/
7878
vite.config.mts.timestamp-*.mjs
7979

8080
# Linux core dumps
81-
./core
81+
/core
8282

8383
*storybook.log
8484
storybook-static

‎.husky/pre-push‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
22

33
# Run Knip with cache via package script
4-
pnpm knip
4+
pnpm knip 1>&2
55

‎.prettierrc‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,5 @@
77
"importOrder": ["^@core/(.*)$", "<THIRD_PARTY_MODULES>", "^@/(.*)$", "^[./]"],
88
"importOrderSeparation": true,
99
"importOrderSortSpecifiers": true,
10-
"overrides": [
11-
{
12-
"files": "*.{js,cjs,mjs,ts,cts,mts,tsx,vue}",
13-
"options": {
14-
"plugins": ["@trivago/prettier-plugin-sort-imports"]
15-
}
16-
}
17-
]
10+
"plugins": ["@prettier/plugin-oxc", "@trivago/prettier-plugin-sort-imports"]
1811
}

‎apps/desktop-ui/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />
5-
<title>ComfyUI Desktop</title>
5+
<title>ComfyUI</title>
66
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" />
77
</head>
88
<body>

‎apps/desktop-ui/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@comfyorg/desktop-ui",
3-
"version": "0.0.1",
3+
"version": "0.0.3",
44
"type": "module",
55
"nx": {
66
"tags": [

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<template>
22
<div
3-
class="grid grid-rows-[1fr_auto_auto_1fr] w-full max-w-3xl mx-auto h-[40rem] select-none"
3+
class="mx-auto grid h-[40rem] w-full max-w-3xl grid-rows-[1fr_auto_auto_1fr] select-none"
44
>
5-
<h2 class="font-inter font-bold text-3xl text-neutral-100 text-center">
5+
<h2 class="text-center font-inter text-3xl font-bold text-neutral-100">
66
{{ $t('install.gpuPicker.title') }}
77
</h2>
88

99
<!-- GPU Selection buttons - takes up remaining space and centers content -->
10-
<div class="flex-1 flex gap-8 justify-center items-center">
10+
<div class="flex flex-1 items-center justify-center gap-8">
1111
<!-- Apple Metal / NVIDIA -->
1212
<HardwareOption
1313
v-if="platform === 'darwin'"
14-
:image-path="'/assets/images/apple-mps-logo.png'"
14+
:image-path="'./assets/images/apple-mps-logo.png'"
1515
placeholder-text="Apple Metal"
1616
subtitle="Apple Metal"
1717
:value="'mps'"
@@ -21,7 +21,7 @@
2121
/>
2222
<HardwareOption
2323
v-else
24-
:image-path="'/assets/images/nvidia-logo-square.jpg'"
24+
:image-path="'./assets/images/nvidia-logo-square.jpg'"
2525
placeholder-text="NVIDIA"
2626
:subtitle="$t('install.gpuPicker.nvidiaSubtitle')"
2727
:value="'nvidia'"
@@ -47,17 +47,17 @@
4747
/>
4848
</div>
4949

50-
<div class="pt-12 px-24 h-16">
50+
<div class="h-16 px-24 pt-12">
5151
<div v-show="showRecommendedBadge" class="flex items-center gap-2">
5252
<Tag
5353
:value="$t('install.gpuPicker.recommended')"
54-
class="bg-neutral-300 text-neutral-900 rounded-full text-sm font-bold px-2 py-[1px]"
54+
class="rounded-full bg-neutral-300 px-2 py-[1px] text-sm font-bold text-neutral-900"
5555
/>
56-
<i class="icon-[lucide--badge-check] text-neutral-300 text-lg" />
56+
<i class="icon-[lucide--badge-check] text-lg text-neutral-300" />
5757
</div>
5858
</div>
5959

60-
<div class="text-neutral-300 px-24">
60+
<div class="px-24 text-neutral-300">
6161
<p v-show="descriptionText" class="leading-relaxed">
6262
{{ descriptionText }}
6363
</p>

‎apps/desktop-ui/src/views/ServerStartView.vue‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,6 @@
6666
@click="troubleshoot"
6767
/>
6868
</div>
69-
70-
<div class="text-center">
71-
<button
72-
v-if="!terminalVisible"
73-
class="text-sm text-neutral-500 hover:text-neutral-300 transition-colors flex items-center gap-2 mx-auto"
74-
@click="terminalVisible = true"
75-
>
76-
<i class="pi pi-search"></i>
77-
{{ $t('serverStart.showTerminal') }}
78-
</button>
79-
</div>
8069
</div>
8170

8271
<!-- Terminal Output (positioned at bottom when manually toggled in error state) -->

‎browser_tests/helpers/actionbar.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export class ComfyActionbar {
1313

1414
async isDocked() {
1515
const className = await this.root.getAttribute('class')
16-
return className?.includes('is-docked') ?? false
16+
return className?.includes('static') ?? false
1717
}
1818
}
1919

0 commit comments

Comments
 (0)