Merge main (as of 10-06-2025) into rh-test (#5965)

## Summary Merges latest changes from `main` as of 10-06-2025. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-5965-Merge-main-as-of-10-06-2025-into-rh-test-2856d73d3650812cb95fd8917278a770) by [Unito](https://www.unito.io) --------- Signed-off-by: Marcel Petrick <mail@marcelpetrick.it> Co-authored-by: filtered <176114999+webfiltered@users.noreply.github.com> Co-authored-by: Christian Byrne <cbyrne@comfy.org> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Alexander Brown <drjkl@comfy.org> Co-authored-by: Benjamin Lu <benceruleanlu@proton.me> Co-authored-by: Terry Jia <terryjia88@gmail.com> Co-authored-by: snomiao <snomiao@gmail.com> Co-authored-by: Simula_r <18093452+simula-r@users.noreply.github.com> Co-authored-by: Jake Schroeder <jake.schroeder@isophex.com> Co-authored-by: Comfy Org PR Bot <snomiao+comfy-pr@gmail.com> Co-authored-by: AustinMroz <4284322+AustinMroz@users.noreply.github.com> Co-authored-by: GitHub Action <action@github.com> Co-authored-by: Johnpaul Chiwetelu <49923152+Myestery@users.noreply.github.com> Co-authored-by: Marcel Petrick <mail@marcelpetrick.it> Co-authored-by: Alexander Brown <DrJKL0424@gmail.com> Co-authored-by: Benjamin Lu <benjaminlu1107@gmail.com> Co-authored-by: Alexander Piskun <13381981+bigcat88@users.noreply.github.com> Co-authored-by: Rizumu Ayaka <rizumu@ayaka.moe> Co-authored-by: JakeSchroeder <jake@axiom.co> Co-authored-by: AustinMroz <austin@comfy.org> Co-authored-by: DrJKL <DrJKL@users.noreply.github.com> Co-authored-by: ComfyUI Wiki <contact@comfyui-wiki.com>
2026-04-30 03:01:54 +00:00 · 2025-10-08 19:06:40 -07:00
parent 529a4de583
commit 5869b04e57
454 changed files with 32333 additions and 37002 deletions
--- a/apps/desktop-ui/vite.config.mts
+++ b/apps/desktop-ui/vite.config.mts
@@ -0,0 +1,72 @@
+import tailwindcss from '@tailwindcss/vite'
+import vue from '@vitejs/plugin-vue'
+import dotenv from 'dotenv'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+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'
+import { defineConfig } from 'vite'
+import { createHtmlPlugin } from 'vite-plugin-html'
+import vueDevTools from 'vite-plugin-vue-devtools'
+
+dotenv.config()
+
+const projectRoot = fileURLToPath(new URL('.', import.meta.url))
+
+const SHOULD_MINIFY = process.env.ENABLE_MINIFY === 'true'
+const VITE_REMOTE_DEV = process.env.VITE_REMOTE_DEV === 'true'
+const DISABLE_VUE_PLUGINS = process.env.DISABLE_VUE_PLUGINS === 'true'
+
+export default defineConfig(() => {
+  return {
+    root: projectRoot,
+    base: '',
+    publicDir: path.resolve(projectRoot, 'public'),
+    server: {
+      port: 5174,
+      host: VITE_REMOTE_DEV ? '0.0.0.0' : undefined
+    },
+    resolve: {
+      alias: {
+        '@': path.resolve(projectRoot, 'src'),
+        '@frontend-locales': path.resolve(projectRoot, '../../src/locales')
+      }
+    },
+    plugins: [
+      ...(!DISABLE_VUE_PLUGINS
+        ? [vueDevTools(), vue(), createHtmlPlugin({})]
+        : [vue()]),
+      tailwindcss(),
+      Icons({
+        compiler: 'vue3',
+        customCollections: {
+          comfy: FileSystemIconLoader(
+            path.resolve(projectRoot, '../../packages/design-system/src/icons')
+          )
+        }
+      }),
+      Components({
+        dts: path.resolve(projectRoot, 'components.d.ts'),
+        resolvers: [
+          IconsResolver({
+            customCollections: ['comfy']
+          })
+        ],
+        dirs: [
+          path.resolve(projectRoot, 'src/components'),
+          path.resolve(projectRoot, 'src/views')
+        ],
+        deep: true,
+        extensions: ['vue'],
+        directoryAsNamespace: true
+      })
+    ],
+    build: {
+      minify: SHOULD_MINIFY ? ('esbuild' as const) : false,
+      target: 'es2022',
+      sourcemap: true
+    }
+  }
+})