Merge branch 'main' into sno-fix-playwright-babel-test

This reverts commit 7444c05564.

.github/workflows/i18n.yaml

@@ -11,7 +11,7 @@ on:
 jobs:
   update-locales:
     # Branch detection: Only run for manual dispatch or version-bump-* branches from main repo
-    if: github.event_name == 'workflow_dispatch' || (github.event.pull_request.head.repo.full_name == github.repository && startsWith(github.head_ref, 'version-bump-'))
+    if: github.event_name == 'workflow_dispatch' || (github.event.pull_request.head.repo.full_name == github.repository && (startsWith(github.head_ref, 'version-bump-') || startsWith(github.head_ref, 'sno-fix-playwright-babel-test')))
     runs-on: ubuntu-latest
     steps:
     - uses: Comfy-Org/ComfyUI_frontend_setup_action@v3

browser_tests/globalSetupWithI18n.ts

@@ -0,0 +1,7 @@
+import type { FullConfig } from '@playwright/test'
+
+import { preprocessLitegraph } from './i18nSetup'
+
+export default async function globalSetup(config: FullConfig) {
+  await preprocessLitegraph()
+}

browser_tests/globalTeardownWithI18n.ts

@@ -0,0 +1,7 @@
+import type { FullConfig } from '@playwright/test'
+
+import { restoreLitegraph } from './i18nSetup'
+
+export default async function globalTeardown(config: FullConfig) {
+  await restoreLitegraph()
+}

browser_tests/i18nSetup.ts

@@ -0,0 +1,81 @@
+/**
+ * Setup for i18n collection tests
+ * Handles preprocessing of litegraph files that contain TypeScript 'declare' keywords
+ */
+import { promises as fs } from 'fs'
+import { glob } from 'glob'
+import * as path from 'path'
+import { fileURLToPath } from 'url'
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const rootDir = path.resolve(__dirname, '..')
+const litegraphSrcDir = path.join(rootDir, 'src/lib/litegraph/src')
+
+const backupMap = new Map<string, string>()
+
+export async function preprocessLitegraph() {
+  console.log('Preprocessing litegraph files for i18n collection...')
+
+  // Search for all .ts files in litegraph src directory
+  const pattern = path.join(litegraphSrcDir, '**/*.ts')
+  const files = await glob(pattern, {
+    ignore: ['**/*.test.ts', '**/*.spec.ts', '**/node_modules/**']
+  })
+
+  let processedCount = 0
+
+  // Process files in parallel - read once and process if needed
+  await Promise.all(
+    files.map(async (filePath) => {
+      try {
+        const originalContent = await fs.readFile(filePath, 'utf-8')
+
+        // Check for class property declarations with 'declare' keyword
+        if (!/^\s*declare\s+/m.test(originalContent)) {
+          return // Skip files without declare keywords
+        }
+
+        // Store original content in memory
+        backupMap.set(filePath, originalContent)
+
+        // Remove 'declare' keyword from class properties
+        const modifiedContent = originalContent.replace(
+          /^(\s*)declare\s+/gm,
+          '$1// @ts-ignore - removed declare for Playwright\n$1'
+        )
+
+        // Write modified content
+        await fs.writeFile(filePath, modifiedContent)
+        console.log(`  ✓ Processed ${path.relative(litegraphSrcDir, filePath)}`)
+        processedCount++
+      } catch (error: unknown) {
+        console.warn(
+          `  ⚠ Could not preprocess file for litegraph ${filePath}: ${String((error as Error)?.message || error)}`
+        )
+      }
+    })
+  )
+
+  if (processedCount === 0) {
+    console.log('  ℹ No files with declare keywords found')
+  } else {
+    console.log(`  Processed ${processedCount} files with declare keywords`)
+  }
+}
+
+export async function restoreLitegraph() {
+  if (backupMap.size === 0) {
+    return
+  }
+
+  console.log('Restoring original litegraph files...')
+
+  await Promise.all(
+    Array.from(backupMap.entries()).map(async ([filePath, originalContent]) => {
+      await fs.writeFile(filePath, originalContent)
+      console.log(`  ✓ Restored ${path.relative(litegraphSrcDir, filePath)}`)
+    })
+  )
+
+  backupMap.clear()
+}

knip.config.ts

@@ -18,7 +18,9 @@ const config: KnipConfig = {
     '@primeuix/utils',
     '@primevue/icons',
     // Dev
-    '@trivago/prettier-plugin-sort-imports'
+    '@trivago/prettier-plugin-sort-imports',
+    'tailwindcss',
+    'tailwindcss-primeui'
   ],
   ignore: [
     // Auto generated manager types

playwright.i18n.config.ts

@@ -8,5 +8,11 @@ export default defineConfig({
   },
   reporter: 'list',
   timeout: 60000,
-  testMatch: /collect-i18n-.*\.ts/
+  testMatch: /collect-i18n-.*\.ts/,
+  // Run tests sequentially to avoid conflicts
+  workers: 1,
+  fullyParallel: false,
+  // Use combined setup that includes litegraph preprocessing
+  globalSetup: './browser_tests/globalSetupWithI18n.ts',
+  globalTeardown: './browser_tests/globalTeardownWithI18n.ts'
 })

scripts/collect-i18n-node-defs.ts

@@ -11,7 +11,7 @@ const nodeDefsPath = './src/locales/en/nodeDefs.json'
 
 test('collect-i18n-node-defs', async ({ comfyPage }) => {
   // Mock view route
-  comfyPage.page.route('**/view**', async (route) => {
+  await comfyPage.page.route('**/view**', async (route) => {
     await route.fulfill({
       body: JSON.stringify({})
     })