Skip to content

Commit 8167e03

Browse files
authored
Add jsonc parser, remove support for .prettierrc.jsonc (#60)
1 parent f0b5e13 commit 8167e03

8 files changed

Lines changed: 5 additions & 24 deletions

File tree

package-lock.json

Lines changed: 0 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
"smol-toml": "^1.3.3",
5252
"specialist": "^1.4.5",
5353
"tiny-editorconfig": "^1.0.0",
54-
"tiny-jsonc": "^1.0.2",
5554
"tiny-readdir": "^2.7.4",
5655
"tiny-readdir-glob": "^1.23.2",
5756
"tiny-spinner": "^2.0.5",

src/config_prettier.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import fs from "node:fs";
22
import path from "node:path";
33
import url from "node:url";
4-
import JSONC from "tiny-jsonc";
54
import zeptomatch from "zeptomatch";
65
import Known from "./known.js";
76
import { fastJoinedPath, fastRelativeChildPath, getModulePath } from "./utils.js";
@@ -24,11 +23,6 @@ const Loaders = {
2423
const config = JSON.parse(fileContent);
2524
return config;
2625
},
27-
jsonc: async (filePath: string): Promise<unknown> => {
28-
const fileContent = fs.readFileSync(filePath, "utf8");
29-
const config = JSONC.parse(fileContent);
30-
return config;
31-
},
3226
json5: async (filePath: string): Promise<unknown> => {
3327
const fileContent = fs.readFileSync(filePath, "utf8");
3428
const JSON5 = (await import("json5")).default;
@@ -71,7 +65,6 @@ const File2Loader: Record<string, (filePath: string) => Promise<unknown>> = {
7165
".prettierrc.yml": Loaders.yaml,
7266
".prettierrc.yaml": Loaders.yaml,
7367
".prettierrc.json": Loaders.json,
74-
".prettierrc.jsonc": Loaders.jsonc,
7568
".prettierrc.json5": Loaders.json5,
7669
".prettierrc.toml": Loaders.toml,
7770
".prettierrc.js": Loaders.js,
@@ -87,7 +80,6 @@ const Ext2Loader: Record<string, (filePath: string) => Promise<unknown>> = {
8780
yml: Loaders.yaml,
8881
yaml: Loaders.yaml,
8982
json: Loaders.json,
90-
jsonc: Loaders.jsonc,
9183
json5: Loaders.json5,
9284
toml: Loaders.toml,
9385
js: Loaders.js,

src/constants.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ const DEFAULT_PARSERS = [
2121
"scss",
2222
"json",
2323
"json5",
24+
"jsonc",
2425
"json-stringify",
2526
"graphql",
2627
"markdown",

src/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ type FormatOptions = {
2020
insertPragma?: boolean;
2121
jsxSingleQuote?: boolean;
2222
objectWrap?: "preserve" | "collapse";
23-
parser?: "flow" | "babel" | "babel-flow" | "babel-ts" | "typescript" | "acorn" | "espree" | "meriyah" | "css" | "less" | "scss" | "json" | "json5" | "json-stringify" | "graphql" | "markdown" | "mdx" | "vue" | "yaml" | "glimmer" | "html" | "angular" | "lwc"; // prettier-ignore
23+
parser?: "flow" | "babel" | "babel-flow" | "babel-ts" | "typescript" | "acorn" | "espree" | "meriyah" | "css" | "less" | "scss" | "json" | "jsonc" | "json5" | "json-stringify" | "graphql" | "markdown" | "mdx" | "vue" | "yaml" | "glimmer" | "html" | "angular" | "lwc"; // prettier-ignore
2424
plugins?: string[];
2525
printWidth?: number;
2626
proseWrap?: "always" | "never" | "preserve";

test/__tests__/__snapshots__/early-exit.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ exports[`show usage with --help (stdout) 1`] = `
5353
--object-wrap <preserve|collapse>
5454
How to wrap object literals
5555
Defaults to "preserve"
56-
--parser <flow|babel|babel-flow|babel-ts|typescript|acorn|espree|meriyah|css|less|scss|json|json5|json-stringify|graphql|markdown|mdx|vue|yaml|glimmer|html|angular|lwc>
56+
--parser <flow|babel|babel-flow|babel-ts|typescript|acorn|espree|meriyah|css|less|scss|json|json5|jsonc|json-stringify|graphql|markdown|mdx|vue|yaml|glimmer|html|angular|lwc>
5757
Which parser to use
5858
--print-width <int> The line length where Prettier will try wrap
5959
Defaults to "80"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`show external options with \`--help\` 1`] = `
4-
" --parser <flow,babel,babel-flow,babel-ts,typescript,acorn,espree,meriyah,css,less,scss,json,json5,json-stringify,graphql,markdown,mdx,vue,yaml,glimmer,html,angular,lwc,foo-parser>
4+
" --parser <flow,babel,babel-flow,babel-ts,typescript,acorn,espree,meriyah,css,less,scss,json,json5,jsonc,json-stringify,graphql,markdown,mdx,vue,yaml,glimmer,html,angular,lwc,foo-parser>
55
--foo-string <value> foo description
66
Defaults to "bar""
77
`;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`show external options with \`--help\` 1`] = `
4-
" --parser <flow,babel,babel-flow,babel-ts,typescript,acorn,espree,meriyah,css,less,scss,json,json5,json-stringify,graphql,markdown,mdx,vue,yaml,glimmer,html,angular,lwc,foo-parser>
4+
" --parser <flow,babel,babel-flow,babel-ts,typescript,acorn,espree,meriyah,css,less,scss,json,json5,jsonc,json-stringify,graphql,markdown,mdx,vue,yaml,glimmer,html,angular,lwc,foo-parser>
55
--foo-option <bar|baz> foo description
66
Defaults to "bar""
77
`;

0 commit comments

Comments
 (0)