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 = {}) {