From e398d8bf1efe730d695216773fec8a00320f1506 Mon Sep 17 00:00:00 2001 From: pompydev Date: Sat, 7 Jun 2025 12:47:48 +0900 Subject: [PATCH] modernize prettier config --- .prettierrc | 1 - apps/blog/{.prettierrc.cjs => prettier.config.js} | 6 ++++-- apps/list/.prettierrc.js | 7 ------- apps/list/prettier.config.js | 7 +++++++ apps/www/{.prettierrc.mjs => prettier.config.js} | 6 +++--- package.json | 1 + packages/prettier-config/index.json | 13 ------------- packages/prettier-config/package.json | 2 +- packages/prettier-config/prettier.config.d.ts | 5 +++++ packages/prettier-config/prettier.config.js | 13 +++++++++++++ pnpm-lock.yaml | 3 +++ prettier.config.js | 6 ++++++ 12 files changed, 43 insertions(+), 27 deletions(-) delete mode 100644 .prettierrc rename apps/blog/{.prettierrc.cjs => prettier.config.js} (52%) delete mode 100644 apps/list/.prettierrc.js create mode 100644 apps/list/prettier.config.js rename apps/www/{.prettierrc.mjs => prettier.config.js} (57%) delete mode 100644 packages/prettier-config/index.json create mode 100644 packages/prettier-config/prettier.config.d.ts create mode 100644 packages/prettier-config/prettier.config.js create mode 100644 prettier.config.js diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index a94d495..0000000 --- a/.prettierrc +++ /dev/null @@ -1 +0,0 @@ -"@pompydev/prettier-config" diff --git a/apps/blog/.prettierrc.cjs b/apps/blog/prettier.config.js similarity index 52% rename from apps/blog/.prettierrc.cjs rename to apps/blog/prettier.config.js index 27db538..dc77063 100644 --- a/apps/blog/.prettierrc.cjs +++ b/apps/blog/prettier.config.js @@ -1,5 +1,7 @@ +import config from "@pompydev/prettier-config" + /** @type {import("prettier").Options} */ -module.exports = { - ...import("@pompydev/prettier-config"), +export default { + ...config, plugins: ["prettier-plugin-tailwindcss"], } diff --git a/apps/list/.prettierrc.js b/apps/list/.prettierrc.js deleted file mode 100644 index ec0caa8..0000000 --- a/apps/list/.prettierrc.js +++ /dev/null @@ -1,7 +0,0 @@ -import pompydevPrettierConfig from "@pompydev/prettier-config" with { type: "json" } - -/** @type {import("prettier").Options} */ -export default { - ...pompydevPrettierConfig, - plugins: ["prettier-plugin-tailwindcss"], -} diff --git a/apps/list/prettier.config.js b/apps/list/prettier.config.js new file mode 100644 index 0000000..dc77063 --- /dev/null +++ b/apps/list/prettier.config.js @@ -0,0 +1,7 @@ +import config from "@pompydev/prettier-config" + +/** @type {import("prettier").Options} */ +export default { + ...config, + plugins: ["prettier-plugin-tailwindcss"], +} diff --git a/apps/www/.prettierrc.mjs b/apps/www/prettier.config.js similarity index 57% rename from apps/www/.prettierrc.mjs rename to apps/www/prettier.config.js index 4b7c8bd..7c498ec 100644 --- a/apps/www/.prettierrc.mjs +++ b/apps/www/prettier.config.js @@ -1,11 +1,11 @@ -import pompydevPrettierConfig from "@pompydev/prettier-config" with { type: "json" } +import config from "@pompydev/prettier-config" /** @type {import("prettier").Options} */ export default { - ...pompydevPrettierConfig, + ...config, plugins: ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"], overrides: [ - ...pompydevPrettierConfig.overrides, + ...config.overrides, { files: "*.svelte", options: { parser: "svelte" } }, ], } diff --git a/package.json b/package.json index c8eebd0..a5acc88 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ }, "devDependencies": { "@pompydev/eslint-config": "workspace:*", + "@pompydev/prettier-config": "workspace:*", "turbo": "2.4.4" }, "//": "see devenv.nix, required for turborepo to work", diff --git a/packages/prettier-config/index.json b/packages/prettier-config/index.json deleted file mode 100644 index 61cb797..0000000 --- a/packages/prettier-config/index.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "$schema": "http://json.schemastore.org/prettierrc", - "tabWidth": 4, - "semi": false, - "overrides": [ - { - "files": ["*.md", "*.yml"], - "options": { - "tabWidth": 2 - } - } - ] -} diff --git a/packages/prettier-config/package.json b/packages/prettier-config/package.json index 6bc28fd..61931b2 100644 --- a/packages/prettier-config/package.json +++ b/packages/prettier-config/package.json @@ -1,7 +1,7 @@ { "name": "@pompydev/prettier-config", "version": "0.0.0", - "main": "index.json", + "main": "./prettier.config.js", "devDependencies": { "prettier": "3.5.3" } diff --git a/packages/prettier-config/prettier.config.d.ts b/packages/prettier-config/prettier.config.d.ts new file mode 100644 index 0000000..ca28cfe --- /dev/null +++ b/packages/prettier-config/prettier.config.d.ts @@ -0,0 +1,5 @@ +import { config } from "prettier" + +declare module "@pompydev/prettier-config" + +export default config diff --git a/packages/prettier-config/prettier.config.js b/packages/prettier-config/prettier.config.js new file mode 100644 index 0000000..6988c4f --- /dev/null +++ b/packages/prettier-config/prettier.config.js @@ -0,0 +1,13 @@ +/** @type {import("prettier").Options} */ +export default { + tabWidth: 4, + semi: false, + overrides: [ + { + files: ["*.md", "*.yml"], + options: { + tabWidth: 2, + }, + }, + ], +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 24389d3..0a16ec1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,6 +11,9 @@ importers: '@pompydev/eslint-config': specifier: workspace:* version: link:packages/eslint-config + '@pompydev/prettier-config': + specifier: workspace:* + version: link:packages/prettier-config turbo: specifier: 2.4.4 version: 2.4.4 diff --git a/prettier.config.js b/prettier.config.js new file mode 100644 index 0000000..2007202 --- /dev/null +++ b/prettier.config.js @@ -0,0 +1,6 @@ +import config from "@pompydev/prettier-config" + +/** @type {import("prettier").Options} */ +export default { + ...config, +}