Skip to content

Commit 024ef3d

Browse files
committed
fix(prettier): prettier-plugin-tailwindcss plugin is now last in the list
1 parent 9a374d2 commit 024ef3d

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

.changeset/tired-onions-fail.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'sv': patch
3+
---
4+
5+
fix(prettier): `prettier-plugin-tailwindcss` plugin is now last in the list

packages/sv/lib/addons/prettier/index.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ export default defineAddon({
4949

5050
data.plugins ??= [];
5151
const plugins: string[] = data.plugins;
52+
{
53+
const PLUGIN_NAME = 'prettier-plugin-svelte';
54+
if (!plugins.includes(PLUGIN_NAME)) plugins.push(PLUGIN_NAME);
55+
}
5256
if (tailwindcssInstalled) {
53-
if (!plugins.includes('prettier-plugin-tailwindcss')) {
54-
data.plugins.unshift('prettier-plugin-tailwindcss');
55-
}
57+
const PLUGIN_NAME = 'prettier-plugin-tailwindcss';
58+
if (!plugins.includes(PLUGIN_NAME)) plugins.push(PLUGIN_NAME);
5659
data.tailwindStylesheet ??= files.getRelative({ to: files.stylesheet });
5760
}
58-
if (!plugins.includes('prettier-plugin-svelte')) {
59-
data.plugins.push('prettier-plugin-svelte');
60-
}
6161

6262
data.overrides ??= [];
6363
const overrides: Array<{ files: string | string[]; options?: { parser?: string } }> =

packages/sv/lib/addons/tailwindcss/index.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,11 @@ export default defineAddon({
125125
if (prettierInstalled) {
126126
sv.file(files.prettierrc, (content) => {
127127
const { data, generateCode } = parseJson(content);
128-
const PLUGIN_NAME = 'prettier-plugin-tailwindcss';
129128

130129
data.plugins ??= [];
131130
const plugins: string[] = data.plugins;
132-
133-
if (!plugins.includes(PLUGIN_NAME)) plugins.unshift(PLUGIN_NAME);
134-
131+
const PLUGIN_NAME = 'prettier-plugin-tailwindcss';
132+
if (!plugins.includes(PLUGIN_NAME)) plugins.push(PLUGIN_NAME);
135133
data.tailwindStylesheet ??= files.getRelative({ to: files.stylesheet });
136134

137135
return generateCode();

packages/sv/lib/cli/tests/snapshots/create-with-all-addons/.prettierrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"trailingComma": "none",
55
"printWidth": 100,
66
"plugins": [
7-
"prettier-plugin-tailwindcss",
8-
"prettier-plugin-svelte"
7+
"prettier-plugin-svelte",
8+
"prettier-plugin-tailwindcss"
99
],
1010
"overrides": [
1111
{

0 commit comments

Comments
 (0)