From a64a9cac9528044d99812bde63446e5ee9592380 Mon Sep 17 00:00:00 2001
From: Alexander Brown <448862+DrJKL@users.noreply.github.com>
Date: Mon, 19 Jan 2026 16:11:41 -0800
Subject: [PATCH] chore: remove eslint-config-prettier, update lint-staged to
 use oxfmt

---
 .prettierignore        |  2 --
 .prettierrc            | 11 -----------
 eslint.config.ts       |  8 ++------
 lint-staged.config.mjs |  7 +++----
 4 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100644 .prettierignore
 delete mode 100644 .prettierrc

diff --git a/.prettierignore b/.prettierignore
deleted file mode 100644
index 4403edd8ec..0000000000
--- a/.prettierignore
+++ /dev/null
@@ -1,2 +0,0 @@
-packages/registry-types/src/comfyRegistryTypes.ts
-src/types/generatedManagerTypes.ts
diff --git a/.prettierrc b/.prettierrc
deleted file mode 100644
index aa43a43ac0..0000000000
--- a/.prettierrc
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "singleQuote": true,
-  "tabWidth": 2,
-  "semi": false,
-  "trailingComma": "none",
-  "printWidth": 80,
-  "importOrder": ["^@core/(.*)$", "<THIRD_PARTY_MODULES>", "^@/(.*)$", "^[./]"],
-  "importOrderSeparation": true,
-  "importOrderSortSpecifiers": true,
-  "plugins": ["@prettier/plugin-oxc", "@trivago/prettier-plugin-sort-imports"]
-}
diff --git a/eslint.config.ts b/eslint.config.ts
index 1e3dbf644e..6535f50bbe 100644
--- a/eslint.config.ts
+++ b/eslint.config.ts
@@ -4,10 +4,7 @@ import pluginI18n from '@intlify/eslint-plugin-vue-i18n'
 import { createTypeScriptImportResolver } from 'eslint-import-resolver-typescript'
 import { importX } from 'eslint-plugin-import-x'
 import oxlint from 'eslint-plugin-oxlint'
-// WORKAROUND: eslint-plugin-prettier causes segfault on Node.js 24 + Windows
-// See: https://github.com/nodejs/node/issues/58690
-// Prettier is still run separately in lint-staged, so this is safe to disable
-import eslintConfigPrettier from 'eslint-config-prettier'
+
 import { configs as storybookConfigs } from 'eslint-plugin-storybook'
 import unusedImports from 'eslint-plugin-unused-imports'
 import pluginVue from 'eslint-plugin-vue'
@@ -111,8 +108,7 @@ export default defineConfig([
   tseslintConfigs.recommended,
   // Difference in typecheck on CI vs Local
   pluginVue.configs['flat/recommended'],
-  // Use eslint-config-prettier instead of eslint-plugin-prettier to avoid Node 24 segfault
-  eslintConfigPrettier,
+
   // @ts-expect-error Type incompatibility between storybook plugin and ESLint config types
   storybookConfigs['flat/recommended'],
   // @ts-expect-error Type incompatibility between import-x plugin and ESLint config types
diff --git a/lint-staged.config.mjs b/lint-staged.config.mjs
index d158a355da..6f74d66160 100644
--- a/lint-staged.config.mjs
+++ b/lint-staged.config.mjs
@@ -1,7 +1,8 @@
 import path from 'node:path'
 
 export default {
-  'tests-ui/**': () => 'echo "Files in tests-ui/ are deprecated. Colocate tests with source files." && exit 1',
+  'tests-ui/**': () =>
+    'echo "Files in tests-ui/ are deprecated. Colocate tests with source files." && exit 1',
 
   './**/*.js': (stagedFiles) => formatAndEslint(stagedFiles),
 
@@ -16,10 +17,8 @@ function formatAndEslint(fileNames) {
   const relativePaths = fileNames.map((f) => path.relative(process.cwd(), f))
   const joinedPaths = relativePaths.map((p) => `"${p}"`).join(' ')
   return [
-    `pnpm exec prettier --cache --write ${joinedPaths}`,
+    `pnpm exec oxfmt ${joinedPaths}`,
     `pnpm exec oxlint --fix ${joinedPaths}`,
     `pnpm exec eslint --cache --fix --no-warn-ignored ${joinedPaths}`
   ]
 }
-
-