Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3d420dc
chore: align development and CI on Node 24 (DESK-249)
benceruleanlu Nov 14, 2026
1d75b1c
chore: use Node 26 tooling with Node 24 runtime types
benceruleanlu Nov 14, 2026
7e8cc19
chore: standardize tooling on Node 24 to match the Electron runtime (…
benceruleanlu Nov 14, 2026
9cd1e21
chore(deps): update dependencies within their declared ranges
benceruleanlu Nov 14, 2026
bb472e9
Merge main into bl/deps-refresh-node24
benceruleanlu Nov 15, 2026
4d6151b
chore(deps): bump Playwright to 1.65.1 and systeminformation to 5.33.22
benceruleanlu Nov 15, 2026
c1af4d0
chore(deps): upgrade Electron from 40.4.1 to 45.3.2
benceruleanlu Nov 15, 2026
08ff5f4
chore(deps): upgrade Vite to 8, electron-vite to 6 and Vitest to 5
benceruleanlu Nov 15, 2026
7022731
chore(deps): upgrade TypeScript from 5.9 to 6.0
benceruleanlu Nov 15, 2026
b4284f9
chore(deps): upgrade Prettier from 3.8.1 to 3.10.1 and reformat
benceruleanlu Nov 15, 2026
8af9b96
test: drop the mock of a component that no longer exists
benceruleanlu Nov 15, 2026
afe274a
chore(deps): upgrade pinia to 4, Datadog RUM to 7 and move to @lucide…
benceruleanlu Nov 15, 2026
90f6cb5
Merge main into bl/deps-refresh-node24
benceruleanlu Nov 15, 2026
2e6b84f
chore(deps): bump @vue/test-utils to 2.6.0
benceruleanlu Nov 15, 2026
c0d21db
chore(deps): add Dependabot and guards so dependencies stay current
benceruleanlu Nov 15, 2026
d40e928
fix(builds): keep macOS 12 off Electron 45 updates
benceruleanlu Nov 15, 2026
fe593d7
Merge main into bl/deps-refresh-node24
benceruleanlu Nov 15, 2026
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
90 changes: 90 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
version: 2

updates:
- package-ecosystem: npm
directory: /
schedule:
interval: weekly
day: monday
open-pull-requests-limit: 10
groups:
minor-and-patch:
patterns:
- '*'
exclude-patterns:
- electron
- electron-updater
- '@todesktop/*'
- '@comfyorg/*'
update-types:
- minor
- patch
electron:
patterns:
- electron
release-path:
patterns:
- electron-updater
- '@todesktop/*'
vite-and-vitest:
patterns:
- vite
- electron-vite
- '@vitejs/*'
- vitest
- '@vitest/*'
update-types:
- major
playwright:
patterns:
- playwright
- '@playwright/*'
update-types:
- major
pinia:
patterns:
- pinia
- '@pinia/*'
update-types:
- major
tailwind:
patterns:
- tailwindcss
- '@tailwindcss/*'
update-types:
- major
lint:
patterns:
- eslint
- '@eslint/*'
- 'eslint-plugin-*'
- typescript-eslint
- vue-eslint-parser
update-types:
- major
ignore:
- dependency-name: '@types/node'
update-types:
- version-update:semver-major
- dependency-name: '@vueuse/core'
versions:
- '>=15.0.0'
- dependency-name: '@xterm/addon-fit'
versions:
- '>=0.11.0'
- dependency-name: '@xterm/xterm'
versions:
- '>=6.0.0'
- dependency-name: typescript
versions:
- '>=6.1.0'

- package-ecosystem: github-actions
directory: /
schedule:
interval: weekly
day: monday
groups:
actions:
patterns:
- '*'
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,10 @@ jobs:
- name: Build app
run: pnpm run build

- name: Verify the Windows hardware UUID lookup
if: matrix.platform == 'windows' && matrix.shard == 1
run: pnpm exec vitest run --project node src/main/lib/deviceId.dependency.test.ts

- name: Run E2E (${{ matrix.platform }} ${{ matrix.shard }}/3)
run: ${{ format('{0}pnpm run test:e2e:{1} --shard={2}/3', matrix.platform == 'linux' && 'xvfb-run --auto-servernum ' || '', matrix.platform, matrix.shard) }}

Expand Down
4 changes: 1 addition & 3 deletions e2e/support/cdpPages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,7 @@ export class WebContentsPage {
win?.focus()
wc.focus()
const point = (await wc.executeJavaScript(payload.aimAndWatchPress)) as
| { x: number; y: number }
| 'missing'
| 'blocked'
{ x: number; y: number } | 'missing' | 'blocked'
if (typeof point === 'string') return point
wc.sendInputEvent({ type: 'mouseMove', ...point })
wc.sendInputEvent({ type: 'mouseDown', button: 'left', clickCount: 1, ...point })
Expand Down
17 changes: 14 additions & 3 deletions e2e/support/comfyHostWindow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ function openWindowCount(app: ElectronApplication): Promise<number> {
)
}

export async function keepOnlyComfyHostWindow(app: ElectronApplication): Promise<void> {
await evalWithRetry(() =>
function closeEveryWindowButTheComfyHost(app: ElectronApplication): Promise<boolean> {
return evalWithRetry(() =>
app.evaluate(({ BrowserWindow, WebContentsView }) => {
const wins = BrowserWindow.getAllWindows().filter((w) => !w.isDestroyed())
const host = wins.find((w) =>
Expand All @@ -21,11 +21,22 @@ export async function keepOnlyComfyHostWindow(app: ElectronApplication): Promise
/^http:\/\/(127\.0\.0\.1|localhost):/.test(v.webContents.getURL())
)
)
if (!host) throw new Error('running comfy host window not found')
if (!host) return false
for (const win of wins) {
if (win.id !== host.id) win.close()
}
return true
})
)
}

export async function keepOnlyComfyHostWindow(app: ElectronApplication): Promise<void> {
await expect
.poll(() => closeEveryWindowButTheComfyHost(app), {
timeout: 30_000,
intervals: [200, 500],
message: 'the running build never showed ComfyUI in a window'
})
.toBe(true)
await expect.poll(() => openWindowCount(app), { timeout: 15_000, intervals: [200, 500] }).toBe(1)
}
7 changes: 1 addition & 6 deletions e2e/support/devHooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@ import type { ElectronApplication } from 'playwright'
import { evalWithRetry } from './evalRetry'

export type DownloadStatus =
| 'pending'
| 'downloading'
| 'paused'
| 'completed'
| 'error'
| 'cancelled'
'pending' | 'downloading' | 'paused' | 'completed' | 'error' | 'cancelled'

export interface DownloadProgressLike {
url: string
Expand Down
2 changes: 1 addition & 1 deletion e2e/support/evalRetry.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const RETRY_PATTERN = /Execution context was destroyed/i
const RETRY_PATTERN = /Execution context was destroyed|Resulting promise was garbage collected/i

export async function evalWithRetry<T>(fn: () => Promise<T>, attempts = 3): Promise<T> {
let lastErr: unknown
Expand Down
85 changes: 43 additions & 42 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,61 +73,62 @@
},
"dependencies": {
"7zip-bin": "^5.2.0",
"@datadog/browser-rum": "6.28.1",
"@todesktop/runtime": "^2.1.3",
"@datadog/browser-rum": "7.17.1",
"@todesktop/runtime": "^2.1.4",
"@xterm/addon-fit": "^0.10.0",
"@xterm/xterm": "^5.5.0",
"electron-updater": "^6.7.3",
"image-size": "^2.0.4",
"music-metadata": "^12.3.2",
"electron-updater": "^6.8.11",
"image-size": "^2.1.0",
"music-metadata": "^12.5.0",
"node-pty": "^1.1.0",
"posthog-node": "^5.30.7",
"semver": "^7.7.4",
"smol-toml": "^1.6.1",
"systeminformation": "^5.31.5",
"tar": "^7.5.11",
"yaml": "^2.9.0"
"posthog-node": "^5.73.1",
"semver": "^7.8.6",
"smol-toml": "^1.9.1",
"systeminformation": "^5.33.22",
"tar": "^7.5.23",
"yaml": "^2.9.1"
},
"devDependencies": {
"@comfyorg/design-system": "1.3.0-alpha.1",
"@datadog/datadog-ci": "^5.9.0",
"@electron/rebuild": "^3.7.2",
"@datadog/datadog-ci": "^5.27.0",
"@electron/rebuild": "^4.2.1",
"@eslint/js": "^10.0.1",
"@pinia/testing": "^1.0.3",
"@playwright/test": "^1.58.2",
"@tailwindcss/vite": "^4.1.8",
"@tanstack/vue-virtual": "^3.13.48",
"@lucide/vue": "^1.73.0",
"@pinia/testing": "^2.0.2",
"@playwright/test": "^1.65.1",
"@tailwindcss/vite": "^4.3.5",
"@tanstack/vue-virtual": "^3.13.52",
"@types/node": "^24.19.2",
"@types/semver": "^7.7.1",
"@vitejs/plugin-vue": "^6.0.2",
"@vitest/browser-playwright": "^4.1.12",
"@vue/test-utils": "^2.4.6",
"@types/semver": "^7.8.0",
"@vitejs/plugin-vue": "^6.0.11",
"@vitest/browser-playwright": "^5.1.0",
"@vue/devtools-api": "^8.2.1",
"@vue/test-utils": "^2.6.0",
"@vueuse/core": "^14.4.0",
"electron": "40.4.1",
"electron-builder": "^26.7.0",
"electron-vite": "^5.0.0",
"eslint": "^10.0.1",
"electron": "45.3.2",
"electron-builder": "^26.18.0",
"electron-vite": "^6.0.0",
"eslint": "^10.15.0",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-unused-imports": "^4.4.1",
"eslint-plugin-vue": "^10.8.0",
"globals": "^17.3.0",
"eslint-plugin-vue": "^10.12.1",
"globals": "^17.14.0",
"husky": "^9.1.7",
"jiti": "^2.6.1",
"lucide-vue-next": "^0.525.0",
"pinia": "^3.0.3",
"playwright": "^1.58.2",
"prettier": "^3.8.1",
"jiti": "^2.7.0",
"pinia": "^4.1.0",
"playwright": "^1.65.1",
"prettier": "^3.10.1",
"reka-ui": "^2.11.0",
"tailwindcss": "^4.1.8",
"typescript": "^5.9.3",
"typescript-eslint": "^8.56.0",
"vite": "^7.3.1",
"vitest": "^4.1.12",
"vue": "^3.5.44",
"vue-component-type-helpers": "^3.3.13",
"vue-eslint-parser": "^10.4.0",
"vue-i18n": "^11.1.6",
"vue-tsc": "^3.1.6"
"tailwindcss": "^4.3.5",
"typescript": "~6.0.3",
"typescript-eslint": "^8.72.2",
"vite": "^8.3.8",
"vitest": "^5.1.0",
"vue": "^3.5.45",
"vue-component-type-helpers": "^3.3.14",
"vue-eslint-parser": "^10.4.2",
"vue-i18n": "^11.4.20",
"vue-tsc": "^3.3.14"
},
"pnpm": {
"onlyBuiltDependencies": [
Expand Down
2 changes: 1 addition & 1 deletion packages/comfyui-desktop-bridge-types/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@comfyorg/comfyui-desktop-bridge-types",
"version": "0.11.0",
"version": "0.11.1",
"description": "TypeScript definitions for the Comfy Desktop hosted frontend bridge",
"type": "module",
"main": "./index.js",
Expand Down
Loading
Loading