diff --git a/.prettierrc.mjs b/.prettierrc.mjs index 4b48e391..ae53b38b 100644 --- a/.prettierrc.mjs +++ b/.prettierrc.mjs @@ -1,16 +1,9 @@ -/** @type {import("prettier").Config} */ +import prettierConfig from "./prettierrc.precommit.mjs"; + export default { - plugins: [ - "prettier-plugin-astro", - "prettier-plugin-tailwindcss", - "prettier-plugin-organize-imports", - ], + ...prettierConfig, overrides: [ - { - files: "*.astro", - options: { - parser: "astro", - }, - }, + ...prettierConfig.overrides, + { organizeImportsSkipDestructiveCodeActions: true }, ], }; diff --git a/.prettierrc.precommit.mjs b/.prettierrc.precommit.mjs new file mode 100644 index 00000000..4b48e391 --- /dev/null +++ b/.prettierrc.precommit.mjs @@ -0,0 +1,16 @@ +/** @type {import("prettier").Config} */ +export default { + plugins: [ + "prettier-plugin-astro", + "prettier-plugin-tailwindcss", + "prettier-plugin-organize-imports", + ], + overrides: [ + { + files: "*.astro", + options: { + parser: "astro", + }, + }, + ], +}; diff --git a/lint-staged.config.js b/lint-staged.config.js index 940cbeed..4a274bce 100644 --- a/lint-staged.config.js +++ b/lint-staged.config.js @@ -2,6 +2,7 @@ module.exports = { "{apps,packages,tools}/**/*.{cjs,mjs,js,ts,jsx,tsx,json,yaml,yml,astro,css}": [ (files) => `pnpm exec eslint ${files.join(" ")}`, - (files) => `pnpm exec prettier --write ${files.join(" ")}`, + (files) => + `pnpm exec prettier -c .prettierrc.precommit.mjs --write ${files.join(" ")}`, ], };