From ae215c6aa090f178289d98f03a014d006588e265 Mon Sep 17 00:00:00 2001 From: Georgios Valotasios Date: Wed, 26 Jun 2024 20:57:00 +0200 Subject: [PATCH] chore: bump prettier --- package-lock.json | 66 +++++++++++++++---- package.json | 4 +- packages/frontend/src/FetchTracker.tsx | 2 +- packages/frontend/src/History.ts | 2 +- packages/frontend/src/Icon.tsx | 12 ++-- packages/frontend/src/LoadingBar.tsx | 2 +- packages/frontend/src/PageRenderer.spec.tsx | 12 ++-- packages/frontend/src/PageRenderer.tsx | 2 +- packages/frontend/src/links.spec.tsx | 4 +- packages/frontend/src/links.tsx | 4 +- packages/frontend/src/marked/Html.spec.tsx | 6 +- .../src/marked/MarkedContent.spec.tsx | 14 ++-- packages/frontend/src/md.spec.ts | 6 +- packages/frontend/src/md.ts | 2 +- packages/frontend/src/twind.ts | 2 +- .../src/StaticSiteNamer.js | 4 +- .../src/AWSService.ts | 8 +-- .../src/StaticSiteReporter.ts | 2 +- .../src/utils.spec.ts | 2 +- .../src/key-factory.ts | 2 +- .../src/robots.spec.ts | 2 +- .../src/sitemap-transformer.ts | 6 +- .../src/sitemap.ts | 2 +- .../src/sitiemap.spec.ts | 10 +-- 24 files changed, 110 insertions(+), 68 deletions(-) diff --git a/package-lock.json b/package-lock.json index 057b9e24..99f0e817 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,12 +27,12 @@ "eslint": "^8.10.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-import": "^2.25.4", - "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-prettier": "^5.1.3", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", "jest-fetch-mock": "^3.0.3", "npm-run-all": "^4.1.5", - "prettier": "^2.5.1", + "prettier": "^3.3.2", "sharp": "^0.31.1", "ts-jest": "^29.1.5", "typescript": "5.5" @@ -5302,6 +5302,18 @@ "node": ">=14" } }, + "node_modules/@pkgr/core": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz", + "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts" + } + }, "node_modules/@sinclair/typebox": { "version": "0.27.8", "dev": true, @@ -21503,20 +21515,30 @@ } }, "node_modules/eslint-plugin-prettier": { - "version": "4.2.1", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.1.3.tgz", + "integrity": "sha512-C9GCVAs4Eq7ZC/XFQHITLiHJxQngdtraXaM+LoUFoFp/lHNl2Zn8f3WQbe9HvTBBQ9YnKFB0/2Ajdqwo5D1EAw==", "dev": true, - "license": "MIT", "dependencies": { - "prettier-linter-helpers": "^1.0.0" + "prettier-linter-helpers": "^1.0.0", + "synckit": "^0.8.6" }, "engines": { - "node": ">=12.0.0" + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint-plugin-prettier" }, "peerDependencies": { - "eslint": ">=7.28.0", - "prettier": ">=2.0.0" + "@types/eslint": ">=8.0.0", + "eslint": ">=8.0.0", + "eslint-config-prettier": "*", + "prettier": ">=3.0.0" }, "peerDependenciesMeta": { + "@types/eslint": { + "optional": true + }, "eslint-config-prettier": { "optional": true } @@ -28625,14 +28647,18 @@ } }, "node_modules/prettier": { - "version": "2.5.1", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz", + "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==", "dev": true, - "license": "MIT", "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" } }, "node_modules/prettier-linter-helpers": { @@ -31995,6 +32021,22 @@ "dev": true, "license": "BSD-3-Clause" }, + "node_modules/synckit": { + "version": "0.8.8", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.8.tgz", + "integrity": "sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==", + "dev": true, + "dependencies": { + "@pkgr/core": "^0.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts" + } + }, "node_modules/tapable": { "version": "1.1.3", "dev": true, diff --git a/package.json b/package.json index 7f05ab5e..d7bf373a 100644 --- a/package.json +++ b/package.json @@ -33,12 +33,12 @@ "eslint": "^8.10.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-import": "^2.25.4", - "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-prettier": "^5.1.3", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", "jest-fetch-mock": "^3.0.3", "npm-run-all": "^4.1.5", - "prettier": "^2.5.1", + "prettier": "^3.3.2", "sharp": "^0.31.1", "ts-jest": "^29.1.5", "typescript": "5.5" diff --git a/packages/frontend/src/FetchTracker.tsx b/packages/frontend/src/FetchTracker.tsx index 50c1df26..989e49e9 100644 --- a/packages/frontend/src/FetchTracker.tsx +++ b/packages/frontend/src/FetchTracker.tsx @@ -18,7 +18,7 @@ export function FetchTracker({ children }: PropsWithChildren) { return result; }); }, - [fetchContent] + [fetchContent], ); return ( diff --git a/packages/frontend/src/History.ts b/packages/frontend/src/History.ts index 6df84615..1614a7f9 100644 --- a/packages/frontend/src/History.ts +++ b/packages/frontend/src/History.ts @@ -26,7 +26,7 @@ class History { detail: { state: payload, }, - }) + }), ); } } diff --git a/packages/frontend/src/Icon.tsx b/packages/frontend/src/Icon.tsx index b09e0381..e553df41 100644 --- a/packages/frontend/src/Icon.tsx +++ b/packages/frontend/src/Icon.tsx @@ -43,12 +43,12 @@ export function Icon({ name, className, size = "8" }: IconProps) { name == "linkedin" ? LinkedInIcon : name === "github" - ? Github - : name === "twitter" - ? Twitter - : name === "ig" - ? Instagram - : undefined; + ? Github + : name === "twitter" + ? Twitter + : name === "ig" + ? Instagram + : undefined; if (!TheIcon) { return null; diff --git a/packages/frontend/src/LoadingBar.tsx b/packages/frontend/src/LoadingBar.tsx index 9cc1eb51..c909a1ac 100644 --- a/packages/frontend/src/LoadingBar.tsx +++ b/packages/frontend/src/LoadingBar.tsx @@ -17,7 +17,7 @@ function creatingAnimation() { margin-left: 100%; width: 0; } - ` + `, ); } diff --git a/packages/frontend/src/PageRenderer.spec.tsx b/packages/frontend/src/PageRenderer.spec.tsx index 3745240c..3485c23a 100644 --- a/packages/frontend/src/PageRenderer.spec.tsx +++ b/packages/frontend/src/PageRenderer.spec.tsx @@ -41,7 +41,7 @@ describe("PageRenderer", () => { it("renders a page when a payload is given", async () => { const props = { bodyMarkdown: "the body", title: "payload title" }; const { container } = await render( - + , ); const title = container.querySelector("h1"); @@ -71,7 +71,7 @@ describe("PageRenderer", () => { bodyMarkdown: "the body", title: "initial title", })} - /> + />, ); act(() => handler({ state: JSON.stringify(newProps) })); @@ -85,7 +85,7 @@ describe("PageRenderer", () => { const { container } = await render( + />, ); act(() => handler({ detail: { state: JSON.stringify(newProps) } })); @@ -102,7 +102,7 @@ describe("PageRenderer", () => { bodyMarkdown: "the body", title: "initial title", })} - /> + />, ); act(() => handler({ state: JSON.stringify(newProps) })); @@ -118,7 +118,7 @@ describe("PageRenderer", () => { bodyMarkdown: "the body", title: "initial title", })} - /> + />, ); act(() => handler({ detail: { state: JSON.stringify(newProps) } })); @@ -134,7 +134,7 @@ describe("PageRenderer", () => { bodyMarkdown: "the body", title: "initial title", })} - /> + />, ); act(() => handler({ state: JSON.stringify(newProps) })); diff --git a/packages/frontend/src/PageRenderer.tsx b/packages/frontend/src/PageRenderer.tsx index 0561eab9..7d622007 100644 --- a/packages/frontend/src/PageRenderer.tsx +++ b/packages/frontend/src/PageRenderer.tsx @@ -35,7 +35,7 @@ function usePageProps(initial: PageRendererProps) { updateProps({ payload: state }); updateScrollTop(e.detail ? true : false); }, - [0] + [0], ); useEffect(() => { diff --git a/packages/frontend/src/links.spec.tsx b/packages/frontend/src/links.spec.tsx index adb774fe..36e8a10a 100644 --- a/packages/frontend/src/links.spec.tsx +++ b/packages/frontend/src/links.spec.tsx @@ -77,7 +77,7 @@ describe("links", () => { expect(pushState).toHaveBeenCalledWith( payload, expect.any(String), - href + href, ); }); }); @@ -102,7 +102,7 @@ describe("links", () => { expect(pushState).toHaveBeenCalledWith( payload, expect.any(String), - `${href}/` + `${href}/`, ); }); }); diff --git a/packages/frontend/src/links.tsx b/packages/frontend/src/links.tsx index fefdb60d..9bc249b6 100644 --- a/packages/frontend/src/links.tsx +++ b/packages/frontend/src/links.tsx @@ -37,7 +37,7 @@ export function Anchor({ }); } }, - [href, title] + [href, title], ); return ( @@ -74,7 +74,7 @@ export function Link({ noUnderline ? "" : "border-b-1 border-gray-300 hover:border-gray-500 leading-tight inline-block", - className + className, )} > {children} diff --git a/packages/frontend/src/marked/Html.spec.tsx b/packages/frontend/src/marked/Html.spec.tsx index f799bae7..0d3e3a91 100644 --- a/packages/frontend/src/marked/Html.spec.tsx +++ b/packages/frontend/src/marked/Html.spec.tsx @@ -5,7 +5,7 @@ import { Html } from "./Html"; describe("Html", () => { it("should render html", async () => { const { container } = render( - + , ); expect(container.innerHTML).toContain(">aa"); @@ -26,7 +26,7 @@ describe("Html", () => { text="" type="html" children={[]} - /> + />, ); expect(container.innerHTML).toContain(`Some content`); @@ -50,7 +50,7 @@ describe("Html", () => { text="" type="html" children={[]} - /> + />, ); expect(container.innerHTML).not.toContain(`' + 'this is some\n', ); expect(container.innerHTML).not.toContain("script"); }); @@ -137,12 +137,12 @@ this is a _paragraph_! describe("gists", () => { it("should replace gist scripts with a component", async () => { const { container } = renderMarked( - '' + '', ); await waitFor(() => { expect(container.innerHTML).toContain( - "https://gist.github.com/valotas/09f8fabc1a1db4b108b3" + "https://gist.github.com/valotas/09f8fabc1a1db4b108b3", ); }); }); @@ -154,7 +154,7 @@ this is a _paragraph_! ].forEach(({ file, language }) => { it(`renders 'language-${language}' for file '${file}'`, async () => { const { container } = renderMarked( - `` + ``, ); await waitFor(() => { diff --git a/packages/frontend/src/md.spec.ts b/packages/frontend/src/md.spec.ts index b68de596..2cba5889 100644 --- a/packages/frontend/src/md.spec.ts +++ b/packages/frontend/src/md.spec.ts @@ -54,7 +54,7 @@ this is some paragraph # Content this is some paragraph - `.trim() + `.trim(), ); }); @@ -75,7 +75,7 @@ This is some paragraph of the second section const { description } = md.parse(initial); expect(description.trim()).toEqual( - `this is the description of the first section` + `this is the description of the first section`, ); }); @@ -102,7 +102,7 @@ Well, the idea in OO languages is very simple. You have a class and you have a p Recently I [had a look at the Dart programming language][thoughts-on-dart] and that reminded me of the getters and setters mechanism that someone has with [C#][csharp]. So let's have a look at them. [thoughts-on-dart]: http://valotas.com/dart-language/ -[csharp]: http://en.wikipedia.org/wiki/C_Sharp_(programming_language)`.trim() +[csharp]: http://en.wikipedia.org/wiki/C_Sharp_(programming_language)`.trim(), ); }); diff --git a/packages/frontend/src/md.ts b/packages/frontend/src/md.ts index de6fede8..652cacef 100644 --- a/packages/frontend/src/md.ts +++ b/packages/frontend/src/md.ts @@ -49,7 +49,7 @@ function parseHeader(raw: string): HeaderMeta { draft: false, skipIndex: false, tags: [], - } + }, ); } diff --git a/packages/frontend/src/twind.ts b/packages/frontend/src/twind.ts index 5bde7aff..b7602947 100644 --- a/packages/frontend/src/twind.ts +++ b/packages/frontend/src/twind.ts @@ -54,7 +54,7 @@ export const tw = Object.defineProperties( theme: { get: () => twInstance.tw.theme, }, - } + }, ) as twind.TW; export { apply } from "twind"; diff --git a/packages/parcel-namer-staticsite/src/StaticSiteNamer.js b/packages/parcel-namer-staticsite/src/StaticSiteNamer.js index 21ca97e4..6af9c99b 100644 --- a/packages/parcel-namer-staticsite/src/StaticSiteNamer.js +++ b/packages/parcel-namer-staticsite/src/StaticSiteNamer.js @@ -10,7 +10,7 @@ function getMainEntryAsset({ bundle, bundleGraph }) { includeInline: true, }); const mainBundle = bundleGroupBundles.find((b) => - b.getEntryAssets().some((a) => a.id === bundleGroup.entryAssetId) + b.getEntryAssets().some((a) => a.id === bundleGroup.entryAssetId), ); return mainBundle.getMainEntry(); @@ -34,7 +34,7 @@ function nameHtml(bundle) { if (!key) { throw new Error( - `Can not name html asset with templateSource but no meta.key` + `Can not name html asset with templateSource but no meta.key`, ); } diff --git a/packages/parcel-reporter-staticsite/src/AWSService.ts b/packages/parcel-reporter-staticsite/src/AWSService.ts index ebc563a6..1c27831e 100644 --- a/packages/parcel-reporter-staticsite/src/AWSService.ts +++ b/packages/parcel-reporter-staticsite/src/AWSService.ts @@ -36,7 +36,7 @@ class AWSService { Key: name, Body: fileStream, ContentType: contentType, - }) + }), ) .then((resp) => ({ etag: resp.ETag, @@ -56,7 +56,7 @@ class AWSService { Key: from, Body: "", WebsiteRedirectLocation: `/${to}`, - }) + }), ) .then((resp) => ({ from, @@ -88,7 +88,7 @@ class AWSService { Items: ["/*"], }, }, - }) + }), ) .then(({ Invalidation }) => ({ distributionId: this.distributionId, @@ -102,6 +102,6 @@ export async function createAWSService() { const branch = await getBranch(); return new AWSService( - branch === "master" ? "valotas.com" : "test.valotas.com" + branch === "master" ? "valotas.com" : "test.valotas.com", ); } diff --git a/packages/parcel-reporter-staticsite/src/StaticSiteReporter.ts b/packages/parcel-reporter-staticsite/src/StaticSiteReporter.ts index 90e2193a..41fd0faa 100644 --- a/packages/parcel-reporter-staticsite/src/StaticSiteReporter.ts +++ b/packages/parcel-reporter-staticsite/src/StaticSiteReporter.ts @@ -36,7 +36,7 @@ export default new Reporter({ log( `✨ Uploaded ${bundles.length} bundles in ${Date.now() - start}ms to`, - chalk.underline(aws.getPublicUrl()) + chalk.underline(aws.getPublicUrl()), ); const { invalidation } = await aws.invalidateDistribution(); diff --git a/packages/parcel-reporter-staticsite/src/utils.spec.ts b/packages/parcel-reporter-staticsite/src/utils.spec.ts index e40b4a6c..5e153576 100644 --- a/packages/parcel-reporter-staticsite/src/utils.spec.ts +++ b/packages/parcel-reporter-staticsite/src/utils.spec.ts @@ -10,7 +10,7 @@ describe("utils", () => { test("returns an alias based on the given date and key", () => { expect(createAlias({ key: "key", date: "2020-10-22" })).toEqual( - "2020/10/key.html" + "2020/10/key.html", ); }); }); diff --git a/packages/parcel-transformer-staticsite/src/key-factory.ts b/packages/parcel-transformer-staticsite/src/key-factory.ts index 5922567f..72a5bd1e 100644 --- a/packages/parcel-transformer-staticsite/src/key-factory.ts +++ b/packages/parcel-transformer-staticsite/src/key-factory.ts @@ -2,7 +2,7 @@ import * as path from "path"; export function computeKey( filePath: string, - ext?: string + ext?: string, ): { name: string; ext: string } { const parsed = path.parse(filePath); ext = ext || parsed.ext; diff --git a/packages/parcel-transformer-staticsite/src/robots.spec.ts b/packages/parcel-transformer-staticsite/src/robots.spec.ts index 31d470c4..43bb2826 100644 --- a/packages/parcel-transformer-staticsite/src/robots.spec.ts +++ b/packages/parcel-transformer-staticsite/src/robots.spec.ts @@ -32,7 +32,7 @@ Sitemap: value2 ` Rule1: value1 Sitemap: /path/to/sitemap.txt - `.trim() + `.trim(), ); }); diff --git a/packages/parcel-transformer-staticsite/src/sitemap-transformer.ts b/packages/parcel-transformer-staticsite/src/sitemap-transformer.ts index 4e5acd96..7edd52da 100644 --- a/packages/parcel-transformer-staticsite/src/sitemap-transformer.ts +++ b/packages/parcel-transformer-staticsite/src/sitemap-transformer.ts @@ -24,7 +24,7 @@ async function parseMD(fs: FileSystem, filePath: string) { async function readMDFiles( fs: FileSystem, - dependencies: Array<{ filePath: string; key: string; specifier: string }> + dependencies: Array<{ filePath: string; key: string; specifier: string }>, ): Promise { const mdFiles: MD[] = []; @@ -61,7 +61,7 @@ function groupByTag(files: MDMeta[]): Map { export function _getAllTags(groups: Map): string[] { return Array.from(groups.keys()).sort((a, b) => - a > b ? 1 : a == b ? 0 : -1 + a > b ? 1 : a == b ? 0 : -1, ); } @@ -131,7 +131,7 @@ export const transformSitemap: StaticSiteTransformerFn = async ({ const additionalAssets = [indexFile, ...groupDependencies, ...mdAssets]; additionalAssets.forEach((dep) => - asset.addDependency(createParallelDependency(dep.uniqueKey)) + asset.addDependency(createParallelDependency(dep.uniqueKey)), ); return [asset, ...additionalAssets]; diff --git a/packages/parcel-transformer-staticsite/src/sitemap.ts b/packages/parcel-transformer-staticsite/src/sitemap.ts index 6464cb3a..5794a328 100644 --- a/packages/parcel-transformer-staticsite/src/sitemap.ts +++ b/packages/parcel-transformer-staticsite/src/sitemap.ts @@ -45,7 +45,7 @@ class Sitemap { } return acc; }, - { md: [], other: [] } + { md: [], other: [] }, ); } diff --git a/packages/parcel-transformer-staticsite/src/sitiemap.spec.ts b/packages/parcel-transformer-staticsite/src/sitiemap.spec.ts index 8e7280e9..16b14ac5 100644 --- a/packages/parcel-transformer-staticsite/src/sitiemap.spec.ts +++ b/packages/parcel-transformer-staticsite/src/sitiemap.spec.ts @@ -12,7 +12,7 @@ const filePath = path.resolve( "..", "web", "src", - "sitemap.txt" + "sitemap.txt", ); describe("sitemap", () => { @@ -71,7 +71,7 @@ describe("sitemap", () => { }); expect(sitemap.getDependencies()[0].specifier).toBe( - "./articles/tomcat-initd-script.md" + "./articles/tomcat-initd-script.md", ); }); @@ -98,8 +98,8 @@ describe("sitemap", () => { expect(sitemap.getDependencies()[0].filePath).toBe( path.resolve( - path.join(filePath, "..", "./articles/tomcat-initd-script.md") - ) + path.join(filePath, "..", "./articles/tomcat-initd-script.md"), + ), ); }); @@ -144,7 +144,7 @@ describe("sitemap", () => { ` /tomcat-initd-script/ /some-other-page.html - `.trim() + `.trim(), ); }); });