Skip to content

Conversation

snomiao
Copy link
Member

@snomiao snomiao commented Aug 22, 2025

Summary

Merges ComfyUI devtools components into the ComfyUI frontend monorepo to consolidate development tools.

Changes

  • Added devtools components from ComfyUI repository
  • Integrated development nodes and utilities
  • Consolidated fake model assets for testing

Related Issues

Fixes #4683

Testing

  • Devtools components are now available within the frontend monorepo
  • Development workflow remains consistent

Copy link

github-actions bot commented Aug 22, 2025

🎭 Playwright Test Results

⚠️ Tests passed with flaky tests

⏰ Completed at: 09/23/2025, 02:40:41 AM UTC

📈 Summary

  • Total Tests: 459
  • Passed: 429 ✅
  • Failed: 0
  • Flaky: 1 ⚠️
  • Skipped: 29 ⏭️

📊 Test Reports by Browser

  • chromium: View Report • ✅ 422 / ❌ 0 / ⚠️ 1 / ⏭️ 29
  • chromium-2x: View Report • ✅ 2 / ❌ 0 / ⚠️ 0 / ⏭️ 0
  • chromium-0.5x: View Report • ✅ 1 / ❌ 0 / ⚠️ 0 / ⏭️ 0
  • mobile-chrome: View Report • ✅ 4 / ❌ 0 / ⚠️ 0 / ⏭️ 0

🎉 Click on the links above to view detailed test results for each browser configuration.

Copy link

github-actions bot commented Aug 22, 2025

🎨 Storybook Build Status

Build completed successfully!

⏰ Completed at: 08/22/2025, 05:08:48 AM UTC

📊 Build Summary

  • Components: 13
  • Stories: 52
  • Visual changes: 0
  • Errors: 0

🔗 Links


🎉 Your Storybook is ready for review!

@DrJKL
Copy link
Contributor

DrJKL commented Aug 22, 2025

Instead of under /src, could you put them in /tools? I think if we do restructure as a monorepo it'll be better to have the python tools already in their own domain.

@christian-byrne
Copy link
Contributor

Yeah this shouldn't be in src as it is not build target.

@snomiao
Copy link
Member Author

snomiao commented Aug 26, 2025

let sno update this branch respects to last 2 comments

@snomiao
Copy link
Member Author

snomiao commented Aug 26, 2025

I've updated this branch to address the last 2 comments about moving devtools from /src to /tools.

Todo List:

  • Move devtools from src/devtools/ to tools/devtools/
  • Update CI workflows to reference tools/devtools instead of src/devtools
  • Update documentation references to use tools/devtools path
  • Test the changes to ensure functionality is preserved
  • Commit and push the changes
  • Update tracking comment with completion status

Summary of Changes

Successfully moved devtools from /src/devtools/ to /tools/devtools/

The changes include:

  • Moved all devtools files to the new location
  • Updated CI workflows (.github/workflows/test-ui.yaml and i18n-custom-nodes.yaml)
  • Updated documentation in browser_tests/README.md and tools/devtools/README.md
  • Verified no remaining references to src/devtools
  • Committed and pushed changes

The devtools functionality should remain exactly the same, just in a more appropriate directory structure as suggested by @DrJKL and @christian-byrne. 🎉

@snomiao snomiao mentioned this pull request Aug 27, 2025
@snomiao
Copy link
Member Author

snomiao commented Aug 27, 2025

Successfully rebased branch to "drjkl/migrate/pnpm"

📋 Rebase Todo List
  • Check if drjkl/migrate/pnpm branch exists and fetch latest
  • Create a backup of current branch state
  • Rebase current branch onto drjkl/migrate/pnpm
  • Resolve any merge conflicts that arise during rebase
  • Run tests to verify functionality after rebase
  • Force push the rebased branch
  • Update this comment with completion status

Summary of Completed Rebase

🎉 The branch has been successfully rebased onto drjkl/migrate/pnpm

Changes Applied:

  • ✅ Successfully rebased 2 commits from this branch onto the pnpm migration base
  • ✅ No merge conflicts encountered during rebase
  • ✅ CLAUDE.md automatically updated with pnpm commands (replacing npm commands)
  • ✅ Package dependencies reinstalled and verified working with pnpm
  • ✅ Force pushed rebased branch to origin
  • ✅ Backup branch created before rebase for safety

Key Updates from pnpm Migration:

  • All npm commands in CLAUDE.md now use pnpm (e.g., pnpm typecheck, pnpm lint, etc.)
  • Package scripts in package.json already properly configured for pnpm
  • Dependencies successfully installed with pnpm lockfile

The devtools integration functionality remains intact and the branch is now ready with the latest pnpm migration improvements! 🚀

@snomiao snomiao changed the base branch from main to drjkl/migrate/pnpm August 27, 2025 05:43
@snomiao snomiao force-pushed the issue-4683-merge-comfyui-devtools-and-comfyuifrontend branch from 4443cfd to 5e5f9d5 Compare August 27, 2025 05:47
Base automatically changed from drjkl/migrate/pnpm to main August 27, 2025 13:10
@snomiao
Copy link
Member Author

snomiao commented Aug 28, 2025

Let me rebase to origin and main

@snomiao
Copy link
Member Author

snomiao commented Aug 28, 2025

Successfully rebased branch to origin/main

📋 Rebase Todo List
  • Check current branch status and origin/main state
  • Create backup branch before rebase
  • Fetch latest changes from origin/main
  • Rebase current branch onto origin/main
  • Resolve any merge conflicts during rebase
  • Run tests to verify functionality after rebase
  • Force push the rebased branch to origin
  • Update tracking comment with completion status

Summary of Completed Rebase

🎉 The branch has been successfully rebased onto origin/main

Changes Applied:

  • ✅ Successfully rebased 2 commits from this branch onto the latest main (commit d0eee73)
  • ✅ Resolved multiple merge conflicts during rebase process:
    • package.json: Kept newer dependency versions and nx-based commands
    • pnpm-workspace.yaml: Merged nx dependency configuration
    • CONTRIBUTING.md: Updated to use pnpm instead of npm
    • CI workflows: Maintained pnpm lockfile references
  • ✅ Preserved all devtools integration functionality
  • ✅ Force pushed rebased branch to origin with --force-with-lease

Key Updates from Latest Main:

  • All npm/yarn commands now use pnpm across the codebase
  • Nx build system integration for improved monorepo support
  • Latest dependency versions and security updates
  • Enhanced CI/CD workflows with pnpm optimizations
  • Updated documentation reflecting pnpm migration

The devtools integration functionality remains intact and the branch is now fully up-to-date with the latest main branch improvements! 🚀

Latest commits on rebased branch:

  • b809f58 [refactor] Move devtools from src/ to tools/
  • 9f94c9f [feat] Merge ComfyUI_devtools into ComfyUI_frontend

@snomiao snomiao force-pushed the issue-4683-merge-comfyui-devtools-and-comfyuifrontend branch from 5e5f9d5 to b809f58 Compare August 28, 2025 06:31
@christian-byrne
Copy link
Contributor

@snomiao Now that we are a monorepo, we can make this a package.

@christian-byrne
Copy link
Contributor

@snomiao can we revive this 😄 ?

@snomiao
Copy link
Member Author

snomiao commented Sep 23, 2025

@snomiao can we revive this 😄 ?

sure! let me rebase all my prs

@snomiao snomiao force-pushed the issue-4683-merge-comfyui-devtools-and-comfyuifrontend branch 3 times, most recently from 0cd2e7d to dee4d5f Compare September 23, 2025 02:08
Added devtools components from ComfyUI repository to consolidate development tools
in the frontend monorepo.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>
@snomiao snomiao force-pushed the issue-4683-merge-comfyui-devtools-and-comfyuifrontend branch from dee4d5f to 4195340 Compare September 23, 2025 02:29
@snomiao snomiao requested a review from DrJKL September 23, 2025 02:44
@snomiao snomiao marked this pull request as ready for review September 23, 2025 02:45
@dosubot dosubot bot added the size:XL This PR changes 500-999 lines, ignoring generated files. label Sep 23, 2025
@snomiao snomiao self-assigned this Sep 23, 2025
@christian-byrne christian-byrne assigned DrJKL and unassigned snomiao Sep 23, 2025
@DrJKL
Copy link
Contributor

DrJKL commented Sep 23, 2025

Once this is in, can we archive the other Repo?

@christian-byrne christian-byrne merged commit d0aee03 into main Sep 23, 2025
25 checks passed
@christian-byrne christian-byrne deleted the issue-4683-merge-comfyui-devtools-and-comfyuifrontend branch September 23, 2025 06:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size:XL This PR changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merge ComfyUI-devtools and ComfyUI_frontend
3 participants