From e3e869faee532cdf8d86e1c18220a17dea4e01cc Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Sat, 14 Mar 2026 19:31:01 +0800
Subject: [PATCH] fix: align oxfmt json commas with lint

---
 .vscode/settings.json                           | 7 ++-----
 internal/lint-configs/oxfmt-config/src/index.ts | 8 ++++++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 967221a96..bc8fb2641 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -63,16 +63,13 @@
     "editor.defaultFormatter": "oxc.oxc-vscode"
   },
   "[json]": {
-    "editor.defaultFormatter": "vscode.json-language-features"
+    "editor.defaultFormatter": "oxc.oxc-vscode"
   },
   "[markdown]": {
     "editor.defaultFormatter": "oxc.oxc-vscode"
   },
   "[jsonc]": {
-    "editor.defaultFormatter": "vscode.json-language-features"
-  },
-  "[json5]": {
-    "editor.defaultFormatter": "vscode.json-language-features"
+    "editor.defaultFormatter": "oxc.oxc-vscode"
   },
   "[vue]": {
     "editor.defaultFormatter": "oxc.oxc-vscode"
diff --git a/internal/lint-configs/oxfmt-config/src/index.ts b/internal/lint-configs/oxfmt-config/src/index.ts
index 748d470bb..dc4bd1dbb 100644
--- a/internal/lint-configs/oxfmt-config/src/index.ts
+++ b/internal/lint-configs/oxfmt-config/src/index.ts
@@ -9,6 +9,14 @@ const oxfmtConfig = defineOxfmtConfig({
   singleQuote: true,
   sortPackageJson: false,
   trailingComma: 'all',
+  overrides: [
+    {
+      files: ['**/*.json', '**/*.json5', '**/*.jsonc', '*.code-workspace'],
+      options: {
+        trailingComma: 'none',
+      },
+    },
+  ],
 });
 
 function defineConfig(config: OxfmtConfig = {}) {