From 11d086ef7400046f9d93822ab1d22e32071c0a70 Mon Sep 17 00:00:00 2001 From: Eric Liu Date: Sun, 10 Nov 2024 15:11:52 -0800 Subject: [PATCH] feat(deps)!: upgrade `prettier` to v3 (#133) --- bun.lockb | Bin 50158 -> 49457 bytes package.json | 6 ++--- playground/bun.lockb | Bin 55348 -> 52803 bytes playground/index.html | 25 ++++++++---------- playground/package.json | 2 +- playground/src/TabMarkdown.svelte | 21 ++++++++++----- playground/src/TabTypeScript.svelte | 23 +++++++++------- playground/src/index.ts | 2 +- playground/tsconfig.json | 2 +- src/ComponentParser.ts | 2 +- src/writer/Writer.ts | 7 ++--- src/writer/WriterMarkdown.ts | 2 +- src/writer/writer-markdown.ts | 12 ++++----- tests/Writer.test.ts | 18 ++++++------- tests/__snapshots__/fixtures.test.ts.snap | 2 +- .../types/DataTable/DataTable.svelte.d.ts | 2 +- .../e2e/glob/types/button/Button.svelte.d.ts | 2 +- tests/fixtures.test.ts | 2 +- tests/fixtures/generics-multiple/output.d.ts | 2 +- tests/writer-ts-definitions.test.ts | 2 +- 20 files changed, 72 insertions(+), 62 deletions(-) diff --git a/bun.lockb b/bun.lockb index 36801dc756be4baccceb3c6780769e845fb14ddb..81f5421c1d5e5b2192eeffd1bac46527f5edc218 100755 GIT binary patch delta 4588 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 diff --git a/package.json b/package.json index b312af42..ce23a3d4 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "@rollup/plugin-node-resolve": "^13.3.0", "acorn": "^8.12.1", "comment-parser": "^1.4.1", - "prettier": "^2.8.8", + "prettier": "^3.3.3", "rollup": "^2.79.1", "rollup-plugin-svelte": "^7.2.2", "svelte": "^4.2.19", @@ -27,8 +27,8 @@ "devDependencies": { "@types/bun": "^1.1.12", "@types/jest": "^29.5.13", - "@types/prettier": "^2.7.3", - "prettier-plugin-svelte": "^2.10.1" + "@types/prettier": "^3.0.0", + "prettier-plugin-svelte": "^3.2.7" }, "bin": { "sveld": "cli.js" diff --git a/playground/bun.lockb b/playground/bun.lockb index 6e53cb23773d88fac95ba64401b0e8983404e423..200e4c74585c81da0c4f494d8e2a474eac51a0e3 100755 GIT binary patch delta 8771 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 + + + + + + + - - - - - - - - - - - - \ No newline at end of file + + + + diff --git a/playground/package.json b/playground/package.json index 63acb170..1dcf3919 100644 --- a/playground/package.json +++ b/playground/package.json @@ -12,7 +12,7 @@ "carbon-components-svelte": "^0.85.4", "carbon-preprocess-svelte": "^0.11.7", "codemirror": "^5.65.18", - "prettier": "^2.8.8", + "prettier": "^3.3.3", "svelte-highlight": "^7.7.0", "typescript": "^5.6.3", "vite": "^5.4.10" diff --git a/playground/src/TabMarkdown.svelte b/playground/src/TabMarkdown.svelte index 795bfae6..0b0b149a 100644 --- a/playground/src/TabMarkdown.svelte +++ b/playground/src/TabMarkdown.svelte @@ -2,12 +2,13 @@ export let parsed_component = {}; export let moduleName = ""; - import plugin from "prettier/parser-markdown"; - import prettier from "prettier/standalone"; + import pluginMarkdown from "prettier/plugins/markdown"; + import { format } from "prettier/standalone"; import writeMarkdown from "../../src/writer/writer-markdown"; import CodeHighlighter from "./CodeHighlighter.svelte"; let markdown = ""; + let code = ""; $: components = new Map([[moduleName, { ...parsed_component, moduleName }]]); $: writeMarkdown(components, { write: false }) @@ -17,10 +18,18 @@ .catch((error) => { console.log(error); }); - $: code = prettier.format(markdown, { - parser: "markdown", - plugins: [plugin], - }); + $: { + format(markdown, { + parser: "markdown", + plugins: [pluginMarkdown], + }) + .then((formatted) => { + code = formatted; + }) + .catch((error) => { + console.log(error); + }); + } diff --git a/playground/src/TabTypeScript.svelte b/playground/src/TabTypeScript.svelte index 246e9cf9..848bc3f1 100644 --- a/playground/src/TabTypeScript.svelte +++ b/playground/src/TabTypeScript.svelte @@ -2,8 +2,9 @@ export let parsed_component = {}; export let moduleName = ""; - import plugin from "prettier/parser-typescript"; - import prettier from "prettier/standalone"; + import pluginTypeScript from "prettier/plugins/typescript"; + import pluginEstree from "prettier/plugins/estree"; + import { format } from "prettier/standalone"; import { writeTsDefinition } from "../../src/writer/writer-ts-definitions"; import CodeHighlighter from "./CodeHighlighter.svelte"; import TabContentOverlay from "./TabContentOverlay.svelte"; @@ -15,15 +16,17 @@ moduleName, }); $: { - try { - prettier_error = null; - code = prettier.format(code, { - parser: "typescript", - plugins: [plugin], + prettier_error = null; + format(code, { + parser: "typescript", + plugins: [pluginTypeScript, pluginEstree], + }) + .then((formatted) => { + code = formatted; + }) + .catch((error) => { + prettier_error = error; }); - } catch (error) { - prettier_error = error; - } } diff --git a/playground/src/index.ts b/playground/src/index.ts index 538f0c9e..b390d621 100644 --- a/playground/src/index.ts +++ b/playground/src/index.ts @@ -1,4 +1,4 @@ import "carbon-components-svelte/css/all.css"; import App from "./App.svelte"; -new App({ target: document.body }); \ No newline at end of file +new App({ target: document.body }); diff --git a/playground/tsconfig.json b/playground/tsconfig.json index 9722ce00..cec4a67e 100644 --- a/playground/tsconfig.json +++ b/playground/tsconfig.json @@ -11,7 +11,7 @@ "skipLibCheck": true, "strict": true, "target": "ESNext", - "verbatimModuleSyntax": true, + "verbatimModuleSyntax": true }, "include": ["src"] } diff --git a/src/ComponentParser.ts b/src/ComponentParser.ts index ab310636..09168363 100644 --- a/src/ComponentParser.ts +++ b/src/ComponentParser.ts @@ -554,7 +554,7 @@ export default class ComponentParser { const additional_tags = comment[0]?.tags.filter( - (tag) => !["type", "extends", "restProps", "slot", "event", "typedef"].includes(tag.tag) + (tag) => !["type", "extends", "restProps", "slot", "event", "typedef"].includes(tag.tag), ) ?? []; if (additional_tags.length > 0 && description === undefined) { diff --git a/src/writer/Writer.ts b/src/writer/Writer.ts index a9317312..118e90cc 100644 --- a/src/writer/Writer.ts +++ b/src/writer/Writer.ts @@ -11,9 +11,10 @@ export default class Writer { this.options = options; } - public format(raw: any) { + public async format(raw: any) { try { - return prettier.format(raw, this.options); + const result = await prettier.format(raw, this.options); + return result; } catch (error) { console.error(error); return raw; @@ -22,6 +23,6 @@ export default class Writer { public async write(filePath: string, raw: any) { await fsp.mkdir(path.parse(filePath).dir, { recursive: true }); - await fsp.writeFile(filePath, this.format(raw)); + await fsp.writeFile(filePath, await this.format(raw)); } } diff --git a/src/writer/WriterMarkdown.ts b/src/writer/WriterMarkdown.ts index 33ca3c5d..201e35eb 100644 --- a/src/writer/WriterMarkdown.ts +++ b/src/writer/WriterMarkdown.ts @@ -83,7 +83,7 @@ export default class WriterMarkdown extends Writer { .map(({ array, raw }) => { return `${array.join(" ")} - [${raw}](#${raw.toLowerCase().replace(/\`/g, "").replace(/\s+/g, "-")})`; }) - .join("\n") + .join("\n"), ); return this.source; diff --git a/src/writer/writer-markdown.ts b/src/writer/writer-markdown.ts index 1138f9bb..46f54b28 100644 --- a/src/writer/writer-markdown.ts +++ b/src/writer/writer-markdown.ts @@ -72,7 +72,7 @@ export default async function writeMarkdown(components: ComponentDocs, options: "raw", `\`\`\`ts\n${getTypeDefs({ typedefs: component.typedefs, - })}\n\`\`\`\n\n` + })}\n\`\`\`\n\n`, ); } @@ -91,8 +91,8 @@ export default async function writeMarkdown(components: ComponentDocs, options: `| ${prop.name} | ${prop.isRequired ? "Yes" : "No"} | ${`${prop.kind}`} | ${ prop.reactive ? "Yes" : "No" } | ${formatPropType(prop.type)} | ${formatPropValue(prop.value)} | ${formatPropDescription( - prop.description - )} |\n` + prop.description, + )} |\n`, ); }); } else { @@ -106,8 +106,8 @@ export default async function writeMarkdown(components: ComponentDocs, options: document.append( "raw", `| ${slot.default ? MD_TYPE_UNDEFINED : slot.name} | ${slot.default ? "Yes" : "No"} | ${formatSlotProps( - slot.slot_props - )} | ${formatSlotFallback(slot.fallback)} |\n` + slot.slot_props, + )} | ${formatSlotFallback(slot.fallback)} |\n`, ); }); } else { @@ -123,7 +123,7 @@ export default async function writeMarkdown(components: ComponentDocs, options: "raw", `| ${event.name} | ${event.type} | ${ event.type === "dispatched" ? formatEventDetail(event.detail) : MD_TYPE_UNDEFINED - } |\n` + } |\n`, ); }); } else { diff --git a/tests/Writer.test.ts b/tests/Writer.test.ts index da8b039f..a2f5fc9b 100644 --- a/tests/Writer.test.ts +++ b/tests/Writer.test.ts @@ -6,33 +6,33 @@ describe("Writer", () => { global.console.error = jest.fn(); }); - test("TypeScript", () => { + test("TypeScript", async () => { const consoleError = jest.spyOn(console, "error"); const writer = new Writer({ parser: "typescript", printWidth: 120 }); - expect(writer.format("interface I {a:boolean}")).toEqual("interface I {\n a: boolean;\n}\n"); + expect(await writer.format("interface I {a:boolean}")).toEqual("interface I {\n a: boolean;\n}\n"); expect(consoleError).toHaveBeenCalledTimes(0); // Invalid JSON should emit Prettier parsing error - expect(writer.format("a:boolean}")).toEqual("a:boolean}"); + expect(await writer.format("a:boolean}")).toEqual("a:boolean}"); expect(consoleError).toHaveBeenCalledTimes(1); }); - test("JSON", () => { + test("JSON", async () => { const consoleError = jest.spyOn(console, "error"); const writer = new Writer({ parser: "json", printWidth: 80 }); - expect(writer.format("{a:null}")).toEqual('{ "a": null }\n'); + expect(await writer.format("{a:null}")).toEqual('{ "a": null }\n'); expect(consoleError).toHaveBeenCalledTimes(0); // Invalid JSON should emit Prettier parsing error - expect(writer.format("a:null")).toEqual("a:null"); + expect(await writer.format("a:null")).toEqual("a:null"); expect(consoleError).toHaveBeenCalledTimes(1); }); - test("Markdown", () => { + test("Markdown", async () => { const writer = new Writer({ parser: "markdown", printWidth: 80 }); - expect(writer.format("## text")).toEqual("## text\n"); - expect(writer.format({ a: null })).toEqual({ a: null }); + expect(await writer.format("## text")).toEqual("## text\n"); + expect(await writer.format({ a: null })).toEqual({ a: null }); }); }); diff --git a/tests/__snapshots__/fixtures.test.ts.snap b/tests/__snapshots__/fixtures.test.ts.snap index 83a721d9..217ad939 100644 --- a/tests/__snapshots__/fixtures.test.ts.snap +++ b/tests/__snapshots__/fixtures.test.ts.snap @@ -1385,7 +1385,7 @@ export type GenericsMultipleProps = { export default class GenericsMultiple< Row extends DataTableRow = DataTableRow, - Header extends DataTableRow = DataTableRow + Header extends DataTableRow = DataTableRow, > extends SvelteComponentTyped< GenericsMultipleProps, Record, diff --git a/tests/e2e/carbon/types/DataTable/DataTable.svelte.d.ts b/tests/e2e/carbon/types/DataTable/DataTable.svelte.d.ts index f3c9331d..cbfcc4ab 100644 --- a/tests/e2e/carbon/types/DataTable/DataTable.svelte.d.ts +++ b/tests/e2e/carbon/types/DataTable/DataTable.svelte.d.ts @@ -187,7 +187,7 @@ export type DataTableProps = Omit<$RestProps, keyof $Props> & $Props; export default class DataTable< - Row extends DataTableRow = DataTableRow + Row extends DataTableRow = DataTableRow, > extends SvelteComponentTyped< DataTableProps, { diff --git a/tests/e2e/glob/types/button/Button.svelte.d.ts b/tests/e2e/glob/types/button/Button.svelte.d.ts index cdea96c7..1c0e76e7 100644 --- a/tests/e2e/glob/types/button/Button.svelte.d.ts +++ b/tests/e2e/glob/types/button/Button.svelte.d.ts @@ -9,7 +9,7 @@ export declare function computeTreeLeafDepth(): any; * Finds the nearest parent tree node */ export declare function findParentTreeNode( - node: HTMLElement + node: HTMLElement, ): null | HTMLElement; type $RestProps = SvelteHTMLElements["button"]; diff --git a/tests/fixtures.test.ts b/tests/fixtures.test.ts index 86c06fae..68548120 100644 --- a/tests/fixtures.test.ts +++ b/tests/fixtures.test.ts @@ -54,7 +54,7 @@ describe("fixtures (TypeScript)", async () => { filePath, source: fixtures_map.get(filePath)!, }); - const api_ts = writer.format(writeTsDefinition({ ...metadata, ...parsed_component })); + const api_ts = await writer.format(writeTsDefinition({ ...metadata, ...parsed_component })); // Snapshot the output; if the test fails, output has changed. expect(api_ts).toMatchSnapshot(); diff --git a/tests/fixtures/generics-multiple/output.d.ts b/tests/fixtures/generics-multiple/output.d.ts index 9f2e49b8..9a489bd0 100644 --- a/tests/fixtures/generics-multiple/output.d.ts +++ b/tests/fixtures/generics-multiple/output.d.ts @@ -26,7 +26,7 @@ export type GenericsMultipleProps = { export default class GenericsMultiple< Row extends DataTableRow = DataTableRow, - Header extends DataTableRow = DataTableRow + Header extends DataTableRow = DataTableRow, > extends SvelteComponentTyped< GenericsMultipleProps, Record, diff --git a/tests/writer-ts-definitions.test.ts b/tests/writer-ts-definitions.test.ts index 691608bd..37be0b24 100644 --- a/tests/writer-ts-definitions.test.ts +++ b/tests/writer-ts-definitions.test.ts @@ -16,7 +16,7 @@ describe("writerTsDefinition", () => { ts: "interface MyTypedef { [key: string]: boolean; }", }, ], - }) + }), ).toEqual("export interface MyTypedef { [key: string]: boolean; }"); const parsed_output: ParsedComponent = {