Skip to content

Commit 7690a80

Browse files
author
Connor Byrne
committed
Merge remote-tracking branch 'origin/main' into pr-11953-x
# Conflicts: # browser_tests/fixtures/data/cloudWorkspace.ts # browser_tests/tests/dialogs/pricingTableDeepLink.spec.ts
2 parents 9ad945d + db147c0 commit 7690a80

338 files changed

Lines changed: 10559 additions & 2937 deletions

File tree

Some content is hidden

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

.agents/checks/pattern-compliance.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Steps:
2222
- Explicit return types on exported functions
2323
- Use `es-toolkit` for utility functions, NOT lodash. Flag any new `import ... from 'lodash'` or `import ... from 'lodash/*'`
2424
- Never use `z.any()` in Zod schemas — use `z.unknown()` and narrow
25+
- Never hand-declare or duplicate server/API response types locally — flag any local interface/type that reimplements a type already generated from an OpenAPI spec (e.g. `@comfyorg/ingest-types`, `@comfyorg/registry-types` in `packages/`) instead of importing it. This caused real bugs in PR #14771 (see `docs/guidance/typescript.md`)
2526

2627
### Vue (if applicable)
2728

.agents/setup

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ set -euo pipefail
33

44
repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
55
cd "$repo_root"
6+
7+
if [[ "${AMP_ORB:-}" == 1 ]]; then
8+
gh auth setup-git
9+
fi
10+
611
node_major="$(tr -d '[:space:]' < "$repo_root/.nvmrc")"
712
node_home="$HOME/.local/share/comfyui-frontend-node-v$node_major"
813

@@ -56,16 +61,10 @@ if [[ ! -x "$node_home/bin/pnpm" ]] ||
5661
npm install --global --prefix "$node_home" "pnpm@$pnpm_version"
5762
fi
5863

59-
profile_marker="# ComfyUI Frontend orb toolchain"
60-
if ! grep -Fqx "$profile_marker" "$HOME/.bash_profile" 2>/dev/null; then
61-
cat >> "$HOME/.bash_profile" <<EOF
62-
63-
$profile_marker
64-
if [[ "\${PWD:-}" == "$repo_root" || "\${PWD:-}" == "$repo_root/"* ]]; then
65-
export PATH="$node_home/bin:\$PATH"
66-
fi
67-
EOF
68-
fi
64+
mkdir -p "$HOME/.local/bin"
65+
for executable in node npm npx pnpm pnpx; do
66+
ln -sfn "$node_home/bin/$executable" "$HOME/.local/bin/$executable"
67+
done
6968

7069
echo "Installing workspace dependencies"
7170
pnpm install --frozen-lockfile

.amp/services.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
services:
2+
frontend:
3+
command: pnpm dev:cloud --host 0.0.0.0 --port "$PORT"
4+
portal:
5+
title: ComfyUI Frontend
6+
description: Frontend dev server connected to the Comfy test cloud backend.

.claude/commands/comprehensive-pr-review.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ Look for:
146146
- Proper abstraction levels
147147
- Interface design and API clarity
148148
- Leftover debug code (console.log, commented code, TODO comments)
149+
- Hand-declared/inlined server or API response types that duplicate a type already generated from an OpenAPI spec (`@comfyorg/ingest-types`, `@comfyorg/registry-types` under `packages/`) instead of importing it — these silently drift from the real contract and caused real bugs in PR #14771
149150
150151
### 3.3 Library Usage Enforcement
151152
Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
11
name: 'Lint and format verify'
22
description: >
3-
Runs the lint/format/knip verification suite plus a conditional
4-
browser-tests typecheck. Shared by ci-lint-format.yaml (PR) and
3+
Runs the lint/format/knip verification suite plus the browser-tests
4+
typecheck. Shared by ci-lint-format.yaml (PR) and
55
ci-lint-format-queue.yaml (merge queue) so both paths run the exact
66
same checks. The caller is responsible for checkout and frontend setup
77
before invoking this action.
88
99
runs:
1010
using: composite
1111
steps:
12-
- name: Detect browser_tests changes
13-
id: changed-paths
14-
uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
15-
with:
16-
filters: |
17-
browser_tests:
18-
- 'browser_tests/**'
19-
2012
- name: Verify lint and format
2113
shell: bash
2214
run: |
@@ -26,6 +18,5 @@ runs:
2618
pnpm knip
2719
2820
- name: Typecheck browser tests
29-
if: steps.changed-paths.outputs.browser_tests == 'true'
3021
shell: bash
3122
run: pnpm typecheck:browser

.github/actions/setup-frontend/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ runs:
1212

1313
# Install pnpm, Node.js, build frontend
1414
- name: Install pnpm
15-
uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4.4.0
15+
uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
1616

1717
- name: Setup Node.js
1818
uses: actions/setup-node@v6

.github/workflows/api-update-electron-api-types.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
uses: actions/checkout@v6
1717

1818
- name: Install pnpm
19-
uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4.4.0
19+
uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
2020

2121
- name: Setup Node.js
2222
uses: actions/setup-node@v6

.github/workflows/api-update-manager-api-types.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: actions/checkout@v6
2222

2323
- name: Install pnpm
24-
uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4.4.0
24+
uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
2525

2626
- name: Setup Node.js
2727
uses: actions/setup-node@v6

.github/workflows/ci-dist-telemetry-scan.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- uses: actions/checkout@v6
3333

3434
- name: Install pnpm
35-
uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4.4.0
35+
uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
3636

3737
- name: Use Node.js
3838
uses: actions/setup-node@v6

.github/workflows/ci-oss-assets-validation.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- uses: actions/checkout@v6
3434

3535
- name: Install pnpm
36-
uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4.4.0
36+
uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
3737

3838
- name: Use Node.js
3939
uses: actions/setup-node@v6
@@ -52,24 +52,24 @@ jobs:
5252
- name: Check for proprietary fonts in dist
5353
run: |
5454
set -euo pipefail
55-
echo '🔍 Checking dist for proprietary ABCROM fonts...'
55+
echo '🔍 Checking dist for proprietary fonts...'
5656
5757
if [ ! -d "dist" ] || [ -z "$(ls -A dist)" ]; then
5858
echo '❌ ERROR: dist/ directory missing or empty!'
5959
exit 1
6060
fi
6161
62-
# Check for ABCROM font files
63-
if find dist/ -type f -iname '*abcrom*' \
62+
# Check for ABCROM and PP Formula font files
63+
if find dist/ -type f \( -iname '*abcrom*' -o -iname '*ppformula*' \) \
6464
\( -name '*.woff' -o -name '*.woff2' -o -name '*.ttf' -o -name '*.otf' \) \
6565
-print -quit | grep -q .; then
6666
echo ''
67-
echo '❌ ERROR: Found proprietary ABCROM font files in dist!'
67+
echo '❌ ERROR: Found proprietary font files in dist!'
6868
echo ''
69-
find dist/ -type f -iname '*abcrom*' \
69+
find dist/ -type f \( -iname '*abcrom*' -o -iname '*ppformula*' \) \
7070
\( -name '*.woff' -o -name '*.woff2' -o -name '*.ttf' -o -name '*.otf' \)
7171
echo ''
72-
echo 'ABCROM fonts are proprietary and should not ship to OSS builds.'
72+
echo 'ABCROM and PP Formula fonts are proprietary and should not ship to OSS builds.'
7373
echo ''
7474
echo 'To fix this:'
7575
echo '1. Use conditional font loading based on isCloud'
@@ -88,7 +88,7 @@ jobs:
8888
- uses: actions/checkout@v6
8989

9090
- name: Install pnpm
91-
uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4.4.0
91+
uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
9292

9393
- name: Use Node.js
9494
uses: actions/setup-node@v6

0 commit comments

Comments
 (0)