Skip to content

Commit

Permalink
Fix prettier importOrderSeparation not working (#1796)
Browse files Browse the repository at this point in the history
* Fix prettier importOrderSeparation not working

* Solves prettier plugin conflict

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
  • Loading branch information
4 people committed Feb 11, 2022
1 parent 28d668f commit 04314f5
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ module.exports = {
arrowParens: "always",
importOrder: ["^@ee/(.*)$", "^@lib/(.*)$", "^@components/(.*)$", "^@(server|trpc)/(.*)$", "^[./]"],
importOrderSeparation: true,
plugins: [require("prettier-plugin-tailwindcss")],
plugins: [require("./merged-prettier-plugin")],
};
21 changes: 21 additions & 0 deletions merged-prettier-plugin.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/* @see https://github.com/tailwindlabs/prettier-plugin-tailwindcss/issues/31#issuecomment-1024722576 */
const tailwind = require("prettier-plugin-tailwindcss");
const sortImports = require("@trivago/prettier-plugin-sort-imports");

const combinedFormatter = {
...tailwind,
parsers: {
...tailwind.parsers,
...Object.keys(sortImports.parsers).reduce((acc, key) => {
acc[key] = {
...tailwind.parsers[key],
preprocess(code, options) {
return sortImports.parsers[key].preprocess(code, options);
},
};
return acc;
}, {}),
},
};

module.exports = combinedFormatter;

0 comments on commit 04314f5

Please sign in to comment.