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

Commit 5e6e75b

Browse files
committed
Replace yamlfmt with pretty_yaml
1 parent 33ebaa2 commit 5e6e75b

File tree

7 files changed

+5
-31
lines changed

7 files changed

+5
-31
lines changed

.github/workflows/lint.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ on:
33
push:
44
branches: [main]
55
pull_request:
6-
76
jobs:
87
dprint:
98
timeout-minutes: 15
@@ -13,7 +12,6 @@ jobs:
1312
- uses: dprint/check@v2.2
1413
with:
1514
dprint-version: '0.45.1' # selfup { "extract": "\\d[^']+", "replacer": ["dprint", "--version"], "nth": 2 }
16-
1715
typos:
1816
timeout-minutes: 15
1917
runs-on: ubuntu-24.04
@@ -26,14 +24,3 @@ jobs:
2624
.
2725
.github
2826
.vscode
29-
30-
yamlfmt:
31-
timeout-minutes: 15
32-
runs-on: ubuntu-24.04
33-
steps:
34-
- uses: actions/checkout@v4
35-
- name: Set up Go
36-
uses: actions/setup-go@v5
37-
- name: Install yamlfmt
38-
run: go install github.com/google/yamlfmt/cmd/yamlfmt@v0.12.1 # TODO: Apply selfup after https://github.com/google/yamlfmt/pull/180
39-
- run: yamlfmt -lint .

.vscode/extensions.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"editorconfig.editorconfig",
55
"tekumara.typos-vscode",
66
"dprint.dprint",
7-
"kachick.vscode-yamlfmt",
87
"stylelint.vscode-stylelint",
98
"jnoortheen.nix-ide"
109
]

.vscode/settings.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
{
22
"editor.defaultFormatter": "dprint.dprint",
33
"editor.formatOnSave": true,
4-
"[yaml]": {
5-
"editor.defaultFormatter": "kachick.vscode-yamlfmt"
6-
},
7-
"[github-actions-workflow]": {
8-
"editor.defaultFormatter": "kachick.vscode-yamlfmt"
9-
},
104
"[elm]": {
115
"editor.defaultFormatter": "elmTooling.elm-ls-vscode"
126
},

dprint.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
},
1010
"json": {},
1111
"markdown": {},
12+
"yaml": { "quotes": "preferSingle" },
1213
"malva": {
1314
"quotes": "preferSingle"
1415
},
@@ -20,6 +21,7 @@
2021
"https://plugins.dprint.dev/json-0.19.3.wasm",
2122
"https://plugins.dprint.dev/markdown-0.17.1.wasm",
2223
"https://plugins.dprint.dev/g-plane/malva-v0.5.1.wasm",
23-
"https://plugins.dprint.dev/g-plane/markup_fmt-v0.10.0.wasm"
24+
"https://plugins.dprint.dev/g-plane/markup_fmt-v0.10.0.wasm",
25+
"https://plugins.dprint.dev/g-plane/pretty_yaml-v0.2.0.wasm"
2426
]
2527
}

flake.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
nil
2525
nixpkgs-fmt
2626
dprint
27-
yamlfmt
2827
nodejs_20
2928
elmPackages.elm-json
3029
deno

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"lint": "deno lint && elm-review && npm run stylelint:check",
1414
"check": "typos && npm run format:check && npm run typecheck && npm test && npm run lint",
1515
"preview": "vite preview",
16-
"format:check": "dprint check && yamlfmt -lint . && npx elm-format --validate src",
17-
"format:fix": "dprint fmt && yamlfmt . && npx elm-format src",
16+
"format:check": "dprint check && npx elm-format --validate src",
17+
"format:fix": "dprint fmt && npx elm-format src",
1818
"stylelint:check": "npx stylelint '{src,public}/**/*.css'",
1919
"stylelint:fix": "npx stylelint '{src,public}/**/*.css' --fix",
2020
"typecheck": "tsc",

yamlfmt.yml

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

0 commit comments

Comments
 (0)