Add support for bundling cherry-picked branches in Build Process (#911)

* Use ComfyUI cherry-picks.

* Add git identity in makeComfy.js.

* Use branch for cherry-picks.

* Remove git username.

* Remove comment.

* Checkout optional branch.

Author: robinjhuang

package.json

@@ -11,7 +11,10 @@
   "type": "module",
   "config": {
     "frontendVersion": "1.9.15",
-    "comfyVersion": "0.3.14",
+    "comfyUI": {
+      "version": "0.3.14",
+      "optionalBranch": "desktop-release-feb172025"
+    },
     "managerCommit": "1434b12c343b58a401f1c9f913965ceb0cfd089e",
     "uvVersion": "0.5.26"
   },
@@ -112,4 +115,4 @@
     "wait-on": "^8.0.1",
     "yaml": "^2.6.0"
   }
-}
+}

scripts/makeComfy.js

@@ -5,7 +5,13 @@ import pkg from './getPackage.js';
 const comfyRepo = 'https://github.com/comfyanonymous/ComfyUI';
 const managerRepo = 'https://github.com/Comfy-Org/ComfyUI-Manager';
 
-execSync(`git clone ${comfyRepo} --depth 1 --branch v${pkg.config.comfyVersion} assets/ComfyUI`);
+if (pkg.config.comfyUI.optionalBranch) {
+  // Checkout branch.
+  execSync(`git clone ${comfyRepo} --depth 1 --branch ${pkg.config.comfyUI.optionalBranch} assets/ComfyUI`);
+} else {
+  // Checkout tag as branch.
+  execSync(`git clone ${comfyRepo} --depth 1 --branch v${pkg.config.comfyUI.version} assets/ComfyUI`);
+}
 execSync(`git clone ${managerRepo} assets/ComfyUI/custom_nodes/ComfyUI-Manager`);
 execSync(`cd assets/ComfyUI/custom_nodes/ComfyUI-Manager && git checkout ${pkg.config.managerCommit} && cd ../../..`);
 execSync(`yarn run make:frontend`);

vite.base.config.ts

@@ -26,7 +26,7 @@ export function getBuildConfig(env: ConfigEnv): UserConfig {
     clearScreen: false,
 
     define: {
-      __COMFYUI_VERSION__: JSON.stringify(pkg.config.comfyVersion),
+      __COMFYUI_VERSION__: JSON.stringify(pkg.config.comfyUI.version),
       __COMFYUI_DESKTOP_VERSION__: JSON.stringify(process.env.npm_package_version),
     },