Skip to content

Commit b824a63

Browse files
committed
chore: migrate from biome to dprint
Signed-off-by: Eric Hegnes <[email protected]>
1 parent 1115d96 commit b824a63

13 files changed

+216
-1796
lines changed

.helix/languages.toml

+16-16
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ name = "solidity"
4242

4343
[[language]]
4444
auto-format = true
45-
formatter = { command = "biome", args = ["format", "**/*.astro", "--write"] }
45+
formatter = { command = "treefmt", args = ["--stdin", ".astro"] }
4646
indent = { tab-width = 2, unit = " " }
4747
injection-regex = "astro"
48-
language-servers = [{ name = "astro-ls", except-features = ["format"] }, "biome", "tailwindcss-ls"]
48+
language-servers = [{ name = "astro-ls", except-features = ["format"] }, "tailwindcss-ls"]
4949
name = "astro"
5050
roots = ["package.json", "astro.config.ts", "tsconfig.json", "tailwind.config.ts"]
5151
scope = "source.astro"
@@ -74,43 +74,43 @@ scope = "source.html"
7474

7575
[[language]]
7676
auto-format = true
77-
language-servers = [{ name = "typescript-language-server", except-features = ["format"] }, "biome"]
77+
formatter = { command = "treefmt", args = ["--stdin", ".js"] }
78+
language-servers = [{ name = "typescript-language-server", except-features = ["format"] }]
7879
name = "javascript"
7980

8081
[[language]]
8182
auto-format = true
82-
language-servers = [{ name = "typescript-language-server", except-features = ["format"] }, "biome"]
83+
formatter = { command = "treefmt", args = ["--stdin", ".ts"] }
84+
language-servers = [{ name = "typescript-language-server", except-features = ["format"] }]
8385
name = "typescript"
8486

8587
[[language]]
8688
auto-format = true
89+
formatter = { command = "treefmt", args = ["--stdin", ".tsx"] }
8790
language-servers = [
8891
{ name = "typescript-language-server", except-features = ["format"] },
89-
"biome",
9092
"tailwindcss-ls",
9193
]
9294
name = "tsx"
9395

9496
[[language]]
9597
auto-format = true
96-
language-servers = [{ name = "typescript-language-server", except-features = ["format"] }, "biome"]
98+
formatter = { command = "treefmt", args = ["--stdin", ".jsx"] }
99+
language-servers = [{ name = "typescript-language-server", except-features = ["format"] }]
97100
name = "jsx"
98101

99102
[[language]]
100103
language-servers = [{ name = "vscode-json-language-server", except-features = ["format"] }, "biome"]
101104
name = "json"
102105

103106
[[language]]
104-
auto-format = true
105-
file-types = ["svelte"]
106-
language-servers = [
107-
{ name = "svelteserver", except-features = ["format"] },
108-
"biome",
109-
"tailwindcss-ls",
110-
]
111-
name = "svelte"
112-
roots = ["svelte.config.js"]
113-
scope = "source.svelte"
107+
auto-format = true
108+
file-types = ["svelte"]
109+
formatter = { command = "treefmt", args = ["--stdin", ".svelte"] }
110+
language-servers = ["svelteserver", "tailwindcss-ls"]
111+
name = "svelte"
112+
roots = ["svelte.config.js"]
113+
scope = "source.svelte"
114114

115115
[[language]]
116116
comment-token = "#"

.vscode/settings.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
"editor.defaultFormatter": "biomejs.biome"
3535
},
3636
"[typescript]": {
37-
"editor.defaultFormatter": "biomejs.biome"
37+
"editor.defaultFormatter": "dprint.dprint"
3838
},
3939
"[javascript]": {
40-
"editor.defaultFormatter": "biomejs.biome"
40+
"editor.defaultFormatter": "dprint.dprint"
4141
},
4242
"[css]": {
4343
"editor.defaultFormatter": "biomejs.biome"
@@ -46,10 +46,10 @@
4646
"editor.defaultFormatter": "biomejs.biome"
4747
},
4848
"[svelte]": {
49-
"editor.defaultFormatter": "svelte.svelte-vscode"
49+
"editor.defaultFormatter": "dprint.dprint"
5050
},
5151
"[astro]": {
52-
"editor.defaultFormatter": "astro-build.astro-vscode"
52+
"editor.defaultFormatter": "dprint.dprint"
5353
},
5454
// https://github.com/tailwindlabs/tailwindcss-intellisense#recommended-vs-code-settings
5555
"editor.quickSuggestions": {

biome.json

+3-78
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,12 @@
88
"organizeImports": {
99
"enabled": false,
1010
"include": [
11-
"*.ts",
12-
"*.mts",
13-
"*.cts",
14-
"*.js",
15-
"*.cjs",
16-
"*.mjs",
17-
"*.jsx",
18-
"*.tsx",
19-
"*.d.ts",
20-
"*.d.mts",
21-
"*.d.cts",
2211
"*.vue",
2312
"*.html",
2413
"*.css",
2514
"*.json",
2615
"*.jsonc",
2716
"*.astro",
28-
"*.svelte",
2917
"*.graphql",
3018
"*.webmanifest"
3119
],
@@ -83,28 +71,7 @@
8371
},
8472
"files": {
8573
"maxSize": 3048576,
86-
"include": [
87-
"*.ts",
88-
"*.mts",
89-
"*.cts",
90-
"*.js",
91-
"*.cjs",
92-
"*.mjs",
93-
"*.jsx",
94-
"*.tsx",
95-
"*.d.ts",
96-
"*.d.mts",
97-
"*.d.cts",
98-
"*.vue",
99-
"*.html",
100-
"*.css",
101-
"*.json",
102-
"*.jsonc",
103-
"*.astro",
104-
"*.svelte",
105-
"*.graphql",
106-
"*.webmanifest"
107-
],
74+
"include": ["*.css", "*.json", "*.jsonc", "*.graphql", "*.webmanifest"],
10875
"ignoreUnknown": true,
10976
"ignore": [
11077
"_",
@@ -148,28 +115,7 @@
148115
"indentStyle": "space",
149116
"formatWithErrors": true,
150117
"attributePosition": "auto",
151-
"include": [
152-
"*.ts",
153-
"*.mts",
154-
"*.cts",
155-
"*.js",
156-
"*.cjs",
157-
"*.mjs",
158-
"*.jsx",
159-
"*.tsx",
160-
"*.d.ts",
161-
"*.d.mts",
162-
"*.d.cts",
163-
"*.vue",
164-
"*.html",
165-
"*.css",
166-
"*.json",
167-
"*.jsonc",
168-
"*.astro",
169-
"*.svelte",
170-
"*.graphql",
171-
"*.webmanifest"
172-
],
118+
"include": ["*.json", "*.jsonc", "*.graphql", "*.webmanifest"],
173119
"ignore": [
174120
"_",
175121
"out",
@@ -277,28 +223,7 @@
277223
}
278224
},
279225
"enabled": true,
280-
"include": [
281-
"*.ts",
282-
"*.mts",
283-
"*.cts",
284-
"*.js",
285-
"*.cjs",
286-
"*.mjs",
287-
"*.jsx",
288-
"*.tsx",
289-
"*.d.ts",
290-
"*.d.mts",
291-
"*.d.cts",
292-
"*.vue",
293-
"*.html",
294-
"*.css",
295-
"*.json",
296-
"*.jsonc",
297-
"*.astro",
298-
"*.svelte",
299-
"*.graphql",
300-
"*.webmanifest"
301-
],
226+
"include": ["*.css", "*.json", "*.jsonc", "*.graphql", "*.webmanifest"],
302227
"ignore": [
303228
"_",
304229
"out",

devShell.nix

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ _: {
1111
vips
1212
pkg-config
1313
nodePackages_latest.nodejs
14+
pkgsUnstable.dprint
1415
];
1516
in
1617
{

dprint.json

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"$schema": "https://dprint.dev/schemas/v0.json",
3+
"indentWidth": 2,
4+
"lineWidth": 100,
5+
"newLineKind": "auto",
6+
"useTabs": false,
7+
"typescript": {
8+
"useTabs": false,
9+
"semiColons": "asi",
10+
"quoteProps": "consistent",
11+
"singleBodyPosition": "nextLine"
12+
},
13+
"markup": {
14+
"svelte.scriptIndent": false,
15+
"astro.scriptIndent": false,
16+
"preferAttrsSingleLine": false,
17+
"maxAttrsPerLine": 1
18+
}
19+
}

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"devDependencies": {
55
"@effect/language-service": "~0.5.1",
66
"@effect/vitest": "~0.20.14",
7+
"dprint": "^0.49.1",
78
"typescript": "~5.8.2",
89
"viem": "^2.26.2",
910
"vite": "~6.3.1",

0 commit comments

Comments
 (0)