Skip to content
This repository was archived by the owner on Jun 24, 2025. It is now read-only.

Commit 1a312bf

Browse files
authored
Merge pull request #1322 from TriliumNext/chore_dprint
chore: replace prettier with dprint
2 parents 6336699 + e95172e commit 1a312bf

File tree

5 files changed

+196
-62
lines changed

5 files changed

+196
-62
lines changed

.dprint.json

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"typescript": {
3+
"indentWidth": 4,
4+
"quoteStyle": "preferDouble",
5+
"semiColons": "prefer",
6+
"quoteProps": "asNeeded",
7+
"newLineKind": "lf",
8+
"lineWidth": 200,
9+
"trailingCommas": "never",
10+
"arrayPattern.spaceAround": true,
11+
"arrayExpression.spaceAround": true
12+
},
13+
"json": {
14+
},
15+
"markdown": {
16+
},
17+
"dockerfile": {
18+
},
19+
"malva": {
20+
},
21+
"markup": {
22+
},
23+
"yaml": {
24+
},
25+
"excludes": [
26+
"**/node_modules",
27+
"**/*-lock.json",
28+
"*.html",
29+
"*.md",
30+
"*.yml",
31+
"libraries/*",
32+
"docs/*",
33+
"src/public/app/doc_notes"
34+
],
35+
"plugins": [
36+
"https://plugins.dprint.dev/typescript-0.94.0.wasm",
37+
"https://plugins.dprint.dev/json-0.20.0.wasm",
38+
"https://plugins.dprint.dev/markdown-0.18.0.wasm",
39+
"https://plugins.dprint.dev/dockerfile-0.3.2.wasm",
40+
"https://plugins.dprint.dev/g-plane/malva-v0.11.1.wasm",
41+
"https://plugins.dprint.dev/g-plane/markup_fmt-v0.19.0.wasm",
42+
"https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.0.wasm"
43+
]
44+
}

.prettierignore

Lines changed: 0 additions & 6 deletions
This file was deleted.

.prettierrc

Lines changed: 0 additions & 22 deletions
This file was deleted.

package-lock.json

Lines changed: 149 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
"test:integration-mem-db": "cross-env TRILIUM_INTEGRATION_TEST=memory TRILIUM_PORT=8082 TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts",
5959
"test:integration-mem-db-dev": "cross-env TRILIUM_INTEGRATION_TEST=memory TRILIUM_PORT=8082 TRILIUM_ENV=dev TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts",
6060
"dev:watch-dist": "tsx ./bin/watch-dist.ts",
61-
"dev:prettier-check": "prettier . --check",
62-
"dev:prettier-fix": "prettier . --write",
61+
"dev:format-check": "dprint check",
62+
"dev:format-fix": "dprint fmt",
6363
"dev:linter-check": "eslint .",
6464
"dev:linter-fix": "eslint . --fix",
6565
"chore:update-build-info": "tsx bin/update-build-info.ts",
@@ -220,6 +220,7 @@
220220
"bootstrap": "5.3.3",
221221
"cross-env": "7.0.3",
222222
"css-loader": "7.1.2",
223+
"dprint": "0.49.1",
223224
"electron": "35.0.3",
224225
"eslint": "9.23.0",
225226
"esm": "3.2.25",
@@ -233,7 +234,6 @@
233234
"mini-css-extract-plugin": "2.9.2",
234235
"nodemon": "3.1.9",
235236
"postcss-loader": "8.1.1",
236-
"prettier": "3.5.3",
237237
"rcedit": "4.0.1",
238238
"rimraf": "6.0.1",
239239
"sass": "1.86.0",

0 commit comments

Comments
 (0)