Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/tired-onions-fail.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'sv': patch
---

fix(prettier): `prettier-plugin-tailwindcss` plugin is now last in the list
12 changes: 6 additions & 6 deletions packages/sv/lib/addons/prettier/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ export default defineAddon({

data.plugins ??= [];
const plugins: string[] = data.plugins;
{
const PLUGIN_NAME = 'prettier-plugin-svelte';
if (!plugins.includes(PLUGIN_NAME)) plugins.push(PLUGIN_NAME);
}
if (tailwindcssInstalled) {
if (!plugins.includes('prettier-plugin-tailwindcss')) {
data.plugins.unshift('prettier-plugin-tailwindcss');
}
const PLUGIN_NAME = 'prettier-plugin-tailwindcss';
if (!plugins.includes(PLUGIN_NAME)) plugins.push(PLUGIN_NAME);
data.tailwindStylesheet ??= files.getRelative({ to: files.stylesheet });
}
if (!plugins.includes('prettier-plugin-svelte')) {
data.plugins.push('prettier-plugin-svelte');
}

data.overrides ??= [];
const overrides: Array<{ files: string | string[]; options?: { parser?: string } }> =
Expand Down
6 changes: 2 additions & 4 deletions packages/sv/lib/addons/tailwindcss/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,11 @@ export default defineAddon({
if (prettierInstalled) {
sv.file(files.prettierrc, (content) => {
const { data, generateCode } = parseJson(content);
const PLUGIN_NAME = 'prettier-plugin-tailwindcss';

data.plugins ??= [];
const plugins: string[] = data.plugins;

if (!plugins.includes(PLUGIN_NAME)) plugins.unshift(PLUGIN_NAME);

const PLUGIN_NAME = 'prettier-plugin-tailwindcss';
if (!plugins.includes(PLUGIN_NAME)) plugins.push(PLUGIN_NAME);
data.tailwindStylesheet ??= files.getRelative({ to: files.stylesheet });

return generateCode();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"trailingComma": "none",
"printWidth": 100,
"plugins": [
"prettier-plugin-tailwindcss",
"prettier-plugin-svelte"
"prettier-plugin-svelte",
"prettier-plugin-tailwindcss"
],
"overrides": [
{
Expand Down
Loading