[1.24.x] Cherry-pick post-1.24.2 fixes including subgraph improvements (#4672)

Co-authored-by: filtered <176114999+webfiltered@users.noreply.github.com>
Co-authored-by: Terry Jia <terryjia88@gmail.com>
Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Jin Yi <jin12cc@gmail.com>
Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: Comfy Org PR Bot <snomiao+comfy-pr@gmail.com>

vite.config.mts

@@ -1,5 +1,6 @@
 import vue from '@vitejs/plugin-vue'
 import dotenv from 'dotenv'
+import { FileSystemIconLoader } from 'unplugin-icons/loaders'
 import IconsResolver from 'unplugin-icons/resolver'
 import Icons from 'unplugin-icons/vite'
 import Components from 'unplugin-vue-components/vite'
@@ -120,12 +121,19 @@ export default defineConfig({
     ]),
 
     Icons({
-      compiler: 'vue3'
+      compiler: 'vue3',
+      customCollections: {
+        comfy: FileSystemIconLoader('src/assets/icons/custom')
+      }
     }),
 
     Components({
       dts: true,
-      resolvers: [IconsResolver()],
+      resolvers: [
+        IconsResolver({
+          customCollections: ['comfy']
+        })
+      ],
       dirs: ['src/components', 'src/layout', 'src/views'],
       deep: true,
       extensions: ['vue']